Changeset 10487 for OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp

Timestamp:

07/16/09 13:49:37 (4 years ago)

Author:

robert

Message:

From Cedric Pinson, fix crash without error messages if the example does find the nathan.osg file.

Files:

• OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -158 +158 @@
 int main (int argc, char* argv[])
 {
-    std::cerr << "This example works only with osgAnimation/nathan.osg" << std::endl;
+    std::cerr << "This example works only with nathan.osg" << std::endl;
 
     osg::ArgumentParser psr(&argc, argv);
@@ -164 +164 @@
     osgViewer::Viewer viewer(psr);
 
-    std::string file = "osgAnimation/nathan.osg";
+    std::string file = "nathan.osg";
     if(argc >= 2) 
         file = psr[1];
@@ -170 +170 @@
     // replace the manager
     osg::Group* root = dynamic_cast<osg::Group*>(osgDB::readNodeFile(file));
+    if (!root) {
+        osg::notify(osg::FATAL) << "can't read file " << file << std::endl;
+        return 1;
+    }
     osgAnimation::AnimationManagerBase* animationManager = dynamic_cast<osgAnimation::AnimationManagerBase*>(root->getUpdateCallback());
     if(!animationManager) 
     {
-        std::cerr << "Did not find AnimationManagerBase updateCallback needed to animate elements" << std::endl;
+        osg::notify(osg::FATAL) << "Did not find AnimationManagerBase updateCallback needed to animate elements" << std::endl;
         return 1;
     }