Fixed crash when no CameraManipulator is assigned to the viewer

openscenegraph · Nov 30, 2012 · ff40db5 · ff40db5
1 parent 079de03
commit ff40db5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp
@@ -402,19 +402,20 @@ bool ReaderWriterP3DXML::getKeyProperty(osgDB::XmlNode*cur, const char* token, i
     {
         std::istringstream iss(itr->second);
         iss>>std::hex>>value;
+        OSG_NOTICE<<"ReaderWriterP3DXML::getKeyProperty() hex result = "<<value<<std::endl;
         return true;
     }
     else if (itr->second.size()>1 && (itr->second[0]>='0' && itr->second[0]<='9'))
     {
         std::istringstream iss(itr->second);
         iss>>value;
-        OSG_NOTICE<<"   numeric result = "<<value<<std::endl;
+        OSG_NOTICE<<"ReaderWriterP3DXML::getKeyProperty() numeric result = "<<value<<std::endl;
         return true;
     }
     else
     {
         value = itr->second[0];
-        OSG_NOTICE<<"   alphanumeric result = "<<value<<std::endl;
+        OSG_NOTICE<<"ReaderWriterP3DXML::getKeyProperty() alphanumeric result = "<<value<<std::endl;
         return true;
     }
 }
@@ -1533,6 +1534,10 @@ void ReaderWriterP3DXML::parseLayer(osgPresentation::SlideShowConstructor& const
 
                 constructor.keyEventOperation(osgPresentation::SlideShowConstructor::CURRENT_LAYER, key, osgPresentation::JUMP, jumpData);
             }
+            else
+            {
+                OSG_NOTICE<<"key_to_jump failed."<<std::endl;
+            }
         }
 
         else if (cur->name == "newline")

diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp
@@ -1244,10 +1244,13 @@ bool SlideEventHandler::selectSlide(int slideNum,int layerNum)
     // refersh the viewer.
     //_viewer->getKeySwitchMatrixManipulator()->setMinimumDistance(0.001);
 
-    _viewer->getCameraManipulator()->setNode(_slideSwitch.get());
-
-    _viewer->computeActiveCoordinateSystemNodePath();
+    if (_viewer->getCameraManipulator())
+    {
+        _viewer->getCameraManipulator()->setNode(_slideSwitch.get());
 
+        _viewer->computeActiveCoordinateSystemNodePath();
+    }
+
     // resetUpdateCallbacks(ALL_OBJECTS);
 
     bool _useSlideFilePaths = false;
@@ -1387,22 +1390,25 @@ bool SlideEventHandler::home(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAd
     osg::Node* node = _viewer->getSceneData();
     if (node) node->accept(fhpv);
 
-    if (fhpv._homePosition.valid())
+    if (_viewer->getCameraManipulator())
     {
-        OSG_INFO<<"Doing home for stored home position."<<std::endl;
+        if (fhpv._homePosition.valid())
+        {
+            OSG_INFO<<"Doing home for stored home position."<<std::endl;
 
-        _viewer->getCameraManipulator()->setAutoComputeHomePosition(false);
-        _viewer->getCameraManipulator()->setHomePosition(
-                                             fhpv._homePosition->eye,
-                                             fhpv._homePosition->center,
-                                             fhpv._homePosition->up);
-    }
-    else
-    {
-        _viewer->getCameraManipulator()->setAutoComputeHomePosition(true);
+            _viewer->getCameraManipulator()->setAutoComputeHomePosition(false);
+            _viewer->getCameraManipulator()->setHomePosition(
+                                                fhpv._homePosition->eye,
+                                                fhpv._homePosition->center,
+                                                fhpv._homePosition->up);
+        }
+        else
+        {
+            _viewer->getCameraManipulator()->setAutoComputeHomePosition(true);
+        }
+        _viewer->getCameraManipulator()->home(ea,aa);
     }
-    _viewer->getCameraManipulator()->home(ea,aa);
-
+
     return true;
 }