Changeset 12191 for OpenSceneGraph/trunk/src/osgAnimation/Action.cpp

Timestamp:

02/23/11 23:52:01 (2 years ago)

Author:

cedricpinson

Message:

Cedric Pinson: Fix divide by zero when Action has 0 frames, and add a warning message because it means something wrong on input data

Files:

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

OpenSceneGraph/trunk/src/osgAnimation/Action.cpp

@@ -65 +65 @@
 bool osgAnimation::Action::evaluateFrame(unsigned int frame, unsigned int& resultframe, unsigned int& nbloop )
 {
-    nbloop = frame / getNumFrames();
+    unsigned int nbFrames = getNumFrames();
+    if (!nbFrames) {
+        nbFrames = 1;
+        osg::notify(osg::WARN) << "osgAnimation::Action::evaluateFrame your action " << getName() << " has 0 frames, it seems like an error in the data" << std::endl;
+    }
+
+    nbloop = frame / nbFrames;
     resultframe = frame;
 
-    if (frame > getNumFrames()-1)
+    if (frame > nbFrames-1)
     {
         if (!getLoop())
-            resultframe = frame % getNumFrames();
+            resultframe = frame % nbFrames;
         else
         {
@@ -77 +83 @@
                 return false;
             else
-                resultframe = frame % getNumFrames();
+                resultframe = frame % nbFrames;
         }
     }