Changeset 10877 for OpenSceneGraph/trunk/src/osgAnimation/UpdateCallback.cpp

Timestamp:

12/09/09 19:45:46 (3 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson,
Add check in RigTransformSoftware? if bones are null
Indent TimelineAnimationManager?
Add check for NaN in UpdateCallback?.cpp
Fix TimelineAnimationManager? clear target (a refactore of Timeline is require for futur)
Fix Computation of bounding box for RigGeometry?

Files:

• OpenSceneGraph/trunk/src/osgAnimation/UpdateCallback.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgAnimation/UpdateCallback.cpp

@@ -20 +20 @@
 #include <osg/MatrixTransform>
 #include <osg/PositionAttitudeTransform>
+#include <osg/Math>
 
 using namespace osgAnimation;
@@ -70 +71 @@
         osg::Matrix::rotate(y,0.0,1.0,0.0) *
         osg::Matrix::rotate(z,0.0,0.0,1.0);
-    mat.setMatrix(osg::Matrix::scale(_scale->getValue()) * 
-                  m *
-                  osg::Matrix::translate(_position->getValue()));
-    mat.dirtyBound();
+    m = osg::Matrix::scale(_scale->getValue()) * m * osg::Matrix::translate(_position->getValue());
+    mat.setMatrix(m);
+
+    if (!m.valid())
+        osg::notify(osg::WARN) << this << " UpdateTransform::update detected NaN" << std::endl;
 }