[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38030] branches/soc-2011-pepper/source/ blender/collada: Light Sid addressing edited.
Sukhitha Jayathilake
pr.jayathilake at gmail.com
Sat Jul 2 07:05:06 CEST 2011
Revision: 38030
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38030
Author: phabtar
Date: 2011-07-02 05:05:03 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
Light Sid addressing edited.
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-pepper/source/blender/collada/LightExporter.cpp
Modified: branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp 2011-07-02 03:17:09 UTC (rev 38029)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp 2011-07-02 05:05:03 UTC (rev 38030)
@@ -244,8 +244,15 @@
addSampler(sampler);
- std::string target = translate_id(ob_name)
+ std::string target ;
+
+ if ( !strcmp( transformName, "color" ) )
+ target = get_light_id(ob)
+ "/" + get_transform_sid(fcu->rna_path, -1, axis_name, true);
+ else
+ target = translate_id(ob_name)
+ + "/" + get_transform_sid(fcu->rna_path, -1, axis_name, true);
+
addChannel(COLLADABU::URI(empty, sampler_id), target);
closeAnimation();
@@ -758,6 +765,8 @@
tm_type = 2;
else if (!strcmp(name, "location"))
tm_type = 3;
+ else if (!strcmp(name, "color"))
+ tm_type = 4;
else
tm_type = -1;
}
@@ -774,6 +783,9 @@
case 3:
tm_name = "location";
break;
+ case 4:
+ tm_name = "color";
+ break;
default:
tm_name = "";
break;
Modified: branches/soc-2011-pepper/source/blender/collada/LightExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/LightExporter.cpp 2011-07-02 03:17:09 UTC (rev 38029)
+++ branches/soc-2011-pepper/source/blender/collada/LightExporter.cpp 2011-07-02 05:05:03 UTC (rev 38030)
@@ -61,6 +61,7 @@
closeLibrary();
}
+
void LightsExporter::operator()(Object *ob)
{
Lamp *la = (Lamp*)ob->data;
@@ -85,7 +86,7 @@
// sun
if (la->type == LA_SUN) {
COLLADASW::DirectionalLight cla(mSW, la_id, la_name);
- cla.setColor(col);
+ cla.setColor(col,false,"color");
cla.setConstantAttenuation(constatt);
exportBlenderProfile(cla, la);
addLight(cla);
@@ -93,7 +94,7 @@
// hemi
else if (la->type == LA_HEMI) {
COLLADASW::AmbientLight cla(mSW, la_id, la_name);
- cla.setColor(col);
+ cla.setColor(col,false,"color");
cla.setConstantAttenuation(constatt);
exportBlenderProfile(cla, la);
addLight(cla);
@@ -101,7 +102,7 @@
// spot
else if (la->type == LA_SPOT) {
COLLADASW::SpotLight cla(mSW, la_id, la_name);
- cla.setColor(col,false,"Color");
+ cla.setColor(col,false,"color");
cla.setFallOffAngle(la->spotsize);
cla.setFallOffExponent(la->spotblend);
cla.setConstantAttenuation(constatt);
@@ -113,7 +114,7 @@
// lamp
else if (la->type == LA_LOCAL) {
COLLADASW::PointLight cla(mSW, la_id, la_name);
- cla.setColor(col);
+ cla.setColor(col,false,"color");
cla.setConstantAttenuation(constatt);
cla.setLinearAttenuation(linatt);
cla.setQuadraticAttenuation(quadatt);
@@ -124,7 +125,7 @@
// it will be exported as a local lamp
else {
COLLADASW::PointLight cla(mSW, la_id, la_name);
- cla.setColor(col);
+ cla.setColor(col,false,"color");
cla.setConstantAttenuation(constatt);
cla.setLinearAttenuation(linatt);
cla.setQuadraticAttenuation(quadatt);
More information about the Bf-blender-cvs
mailing list