Revision: 38763
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38763
Author: phabtar
Date: 2011-07-27 18:38:44 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Material diffuse color animation COLLADA export.
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
Modified: branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
2011-07-27 18:33:00 UTC (rev 38762)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
2011-07-27 18:38:44 UTC (rev 38763)
@@ -111,7 +111,8 @@
while (fcu) {
transformName = extract_transform_name(
fcu->rna_path );
- if ((!strcmp(transformName,
"specular_hardness"))||(!strcmp(transformName, "specular_color")))
+ if ((!strcmp(transformName,
"specular_hardness"))||(!strcmp(transformName, "specular_color"))
+ ||(!strcmp(transformName,
"diffuse")))
dae_animation(ob ,fcu,
transformName, true, ma );
fcu = fcu->next;
}
@@ -204,7 +205,7 @@
axis_name = axis_names[fcu->array_index];*/
}
//maybe a list or a vector of float animations
- else if ( !strcmp(transformName,
"color")||!strcmp(transformName, "specular_color") )
+ else if ( !strcmp(transformName,
"color")||!strcmp(transformName, "specular_color")||!strcmp(transformName,
"diffuse_color"))
{
const char *axis_names[] = {"R", "G", "B"};
if (fcu->array_index < 3)
@@ -842,6 +843,8 @@
tm_type = 11;
else if (!strcmp(name, "specular_color"))
tm_type = 12;
+ else if (!strcmp(name, "diffuse_color"))
+ tm_type = 13;
else
tm_type = -1;
@@ -886,7 +889,9 @@
case 12:
tm_name = "specular";
break;
-
+ case 13:
+ tm_name = "diffuse";
+ break;
default:
tm_name = "";
break;
Modified: branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
2011-07-27 18:33:00 UTC (rev 38762)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
2011-07-27 18:38:44 UTC (rev 38763)
@@ -844,33 +844,21 @@
{
const COLLADAFW::Color *col =
&(light->getColor());
const COLLADAFW::UniqueId& listid =
col->getAnimationList();
- //transformation has animations
- //const COLLADAFW::AnimationList *animlist =
animlist_map[listid];
- //const
COLLADAFW::AnimationList::AnimationBindings& bindings =
animlist->getAnimationBindings();
- ////all the curves belonging to the current
binding
- //std::vector<FCurve*> animcurves;
- //for (unsigned int j = 0; j <
bindings.getCount(); j++) {
- // animcurves =
curve_map[bindings[j].animation];
- // //calculate rnapaths and array index of
fcurves according to transformation and animation class
+
Assign_color_animations(listid, AnimCurves,
"color");
-
- //std::vector<FCurve*>::iterator iter;
- ////Add the curves of the current
animation to the object
- //for (iter = animcurves.begin(); iter
!= animcurves.end(); iter++) {
- // FCurve * fcu = *iter;
- // BLI_addtail(AnimCurves, fcu);
- //}
}
if ((animType->light & LIGHT_FOA) != 0 )
{
const COLLADAFW::AnimatableFloat *foa =
&(light->getFallOffAngle());
const COLLADAFW::UniqueId& listid =
foa->getAnimationList();
+
Assign_float_animations( listid ,AnimCurves,
"spot_size");
}
if ( (animType->light & LIGHT_FOE) != 0 )
{
const COLLADAFW::AnimatableFloat *foe =
&(light->getFallOffExponent());
const COLLADAFW::UniqueId& listid =
foe->getAnimationList();
+
Assign_float_animations( listid ,AnimCurves,
"spot_blend");
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
