archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fixed Color animation import( support for Maya )

Browse Source
This commit is contained in:
Sukhitha Jayathilake
2011-07-13 16:53:36 +00:00
parent f12614234a
commit 49d01fb30d
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/collada/AnimationImporter.cpp
View File

@@ -103,6 +103,7 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
switch (dim) {
case 1: // X, Y, Z or angle
case 3: // XYZ
case 4:
case 16: // matrix
{
for (i = 0; i < dim; i++ ) {
@@ -684,8 +685,10 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::AnimationList:
modify_fcurve(curves, rna_path, 2 );
break;
case COLLADAFW::AnimationList::COLOR_RGB:
case COLLADAFW::AnimationList::COLOR_RGBA:
modify_fcurve(curves, rna_path, -1 );
break;
default:
fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
binding->animationClass, "COLOR" );
@@ -885,6 +888,21 @@ void AnimationImporter::translate_Animations_NEW ( COLLADAFW::Node * node ,
const COLLADAFW::UniqueId& listid = xmag->getAnimationList();
Assign_float_animations( listid ,AnimCurves, "ortho_scale");
}
if ((animType->camera & CAMERA_ZFAR) != 0 )
{
const COLLADAFW::AnimatableFloat *zfar = &(camera->getFarClippingPlane());
const COLLADAFW::UniqueId& listid = zfar->getAnimationList();
Assign_float_animations( listid ,AnimCurves, "clipend");
}
if ((animType->camera & CAMERA_ZNEAR) != 0 )
{
const COLLADAFW::AnimatableFloat *znear = &(camera->getNearClippingPlane());
const COLLADAFW::UniqueId& listid = znear->getAnimationList();
Assign_float_animations( listid ,AnimCurves, "clipsta");
}
}
}
}