Revision: 39728
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39728
Author: campbellbarton
Date: 2011-08-27 03:13:54 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
fix for bug with all rotation modes being treated as euler by the BGE, this bug
is in trunk too but fixing here because this code will replace whats in trunk.
also make initializers less verbose for ipo transform assignment.
Modified Paths:
--------------
branches/soc-2011-pepper/source/gameengine/Converter/KX_IpoConvert.cpp
Modified: branches/soc-2011-pepper/source/gameengine/Converter/KX_IpoConvert.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Converter/KX_IpoConvert.cpp
2011-08-27 02:59:43 UTC (rev 39727)
+++ branches/soc-2011-pepper/source/gameengine/Converter/KX_IpoConvert.cpp
2011-08-27 03:13:54 UTC (rev 39728)
@@ -91,41 +91,25 @@
Object* blenderobject = gameobj->GetBlenderObject();
- ipocontr->GetIPOTransform().SetPosition(
- MT_Point3(
- blenderobject->loc[0]/*+blenderobject->dloc[0]*/,
- blenderobject->loc[1]/*+blenderobject->dloc[1]*/,
- blenderobject->loc[2]/*+blenderobject->dloc[2]*/
- )
- );
- ipocontr->GetIPOTransform().SetEulerAngles(
- MT_Vector3(
- blenderobject->rot[0],
- blenderobject->rot[1],
- blenderobject->rot[2]
- )
- );
- ipocontr->GetIPOTransform().SetScaling(
- MT_Vector3(
- blenderobject->size[0],
- blenderobject->size[1],
- blenderobject->size[2]
- )
- );
+ ipocontr->GetIPOTransform().SetPosition(MT_Point3(blenderobject->loc));
+
ipocontr->GetIPOTransform().SetEulerAngles(MT_Vector3(blenderobject->rot));
+ ipocontr->GetIPOTransform().SetScaling(MT_Vector3(blenderobject->size));
const char *rotmode, *drotmode;
- switch(blenderobject->rotmode)
- {
+ switch(blenderobject->rotmode) {
case ROT_MODE_AXISANGLE:
rotmode = "rotation_axis_angle";
drotmode = "delta_rotation_axis_angle";
+ break;
case ROT_MODE_QUAT:
rotmode = "rotation_quaternion";
drotmode = "delta_rotation_quaternion";
+ break;
default:
rotmode = "rotation_euler";
drotmode = "delta_rotation_euler";
+ break;
}
BL_InterpolatorList *adtList= GetAdtList(action, converter);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
