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

camera ortho_scale (COLLADA xmag ) animation export

Browse Source
This commit is contained in:
Sukhitha Jayathilake
2011-07-06 19:00:40 +00:00
parent a0d4a95ff7
commit 44220bba7a
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/collada/AnimationExporter.cpp
View File

@@ -90,7 +90,8 @@ void AnimationExporter::exportAnimations(Scene *sce)
while (fcu) {
transformName = extract_transform_name( fcu->rna_path );
if ((!strcmp(transformName, "lens")))
if ((!strcmp(transformName, "lens"))||
(!strcmp(transformName, "ortho_scale")))
dae_animation(ob ,fcu, transformName,true );
fcu = fcu->next;
}
@@ -184,9 +185,8 @@ void AnimationExporter::exportAnimations(Scene *sce)
if (fcu->array_index < 4)
axis_name = axis_names[fcu->array_index];*/
}
else if ( !strcmp(transformName, "spot_size")||
!strcmp(transformName, "spot_blend")||
!strcmp(transformName, "lens"))
else if ( !strcmp(transformName, "spot_size")||!strcmp(transformName, "spot_blend")||
!strcmp(transformName, "lens")||!strcmp(transformName, "ortho_scale"))
{
axis_name = "";
}
@@ -805,6 +805,8 @@ void AnimationExporter::exportAnimations(Scene *sce)
tm_type = 6;
else if (!strcmp(name, "lens"))
tm_type = 7;
else if (!strcmp(name, "ortho_scale"))
tm_type = 8;
else
tm_type = -1;
}
@@ -833,6 +835,9 @@ void AnimationExporter::exportAnimations(Scene *sce)
case 7:
tm_name = "xfov";
break;
case 8:
tm_name = "xmag";
break;
default:
tm_name = "";

4
source/blender/collada/CameraExporter.cpp
View File

@@ -73,7 +73,7 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
if (cam->type == CAM_PERSP) {
COLLADASW::PerspectiveOptic persp(mSW);
persp.setXFov(lens_to_angle(cam->lens)*(180.0f/M_PI),"XFov");
persp.setXFov(lens_to_angle(cam->lens)*(180.0f/M_PI),"xfov");
persp.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch),false,cam_name);
persp.setZFar(cam->clipend);
persp.setZNear(cam->clipsta);
@@ -82,7 +82,7 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
}
else {
COLLADASW::OrthographicOptic ortho(mSW);
ortho.setXMag(cam->ortho_scale,"XMag");
ortho.setXMag(cam->ortho_scale,"xmag");
ortho.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch));
ortho.setZFar(cam->clipend);
ortho.setZNear(cam->clipsta);