Changeset 12911

Timestamp:

01/24/12 15:27:17 (16 months ago)

Author:

robert

Message:

Refactored the click_to_run implementation to avoid bug associated with running the first click_to_run entry in a layer when
subsequent click to run's are called.

Location:

OpenSceneGraph/trunk

Files:

• include/osgPresentation/SlideShowConstructor (modified) (2 diffs)
• src/osgPresentation/SlideShowConstructor.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor

@@ -388 +388 @@
     void layerClickEventOperation(const KeyPosition& keyPos, bool relativeJump=true, int slideNum=0, int layerNum=0);
 
+    void addToCurrentLayer(osg::Node* subgraph);
+    
     void addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData);
     
@@ -512 +514 @@
     osg::ref_ptr<FilePathData>      _filePathData;
     
+    osg::ref_ptr<osg::Group>                _layerToApplyEventCallbackTo;
+    osg::ref_ptr<osgGA::GUIEventHandler>    _currentEventCallbackToApply;
+
+
     std::string findFileAndRecordPath(const std::string& filename);
     

OpenSceneGraph/trunk/src/osgPresentation/SlideShowConstructor.cpp

@@ -191 +191 @@
 
     _slideBackgroundAsHUD = false;
+
+    _layerToApplyEventCallbackTo = 0;
+    _currentEventCallbackToApply = 0;
 }
 
@@ -437 +440 @@
                 HUDTransform* hudTransform = new HUDTransform(_hudSettings.get());
                 hudTransform->addChild(background);
-                _currentLayer->addChild(hudTransform);
+                addToCurrentLayer(hudTransform);
             }
             else
             {
-                _currentLayer->addChild(background);
+                addToCurrentLayer(background);
             }
         }
@@ -467 +470 @@
             geode->addDrawable(text);
 
-            _currentLayer->addChild(decorateSubgraphForPosition(geode, _titlePositionData));
+            addToCurrentLayer(decorateSubgraphForPosition(geode, _titlePositionData));
         }
         
@@ -476 +479 @@
         for(unsigned int i=0;i<_previousLayer->getNumChildren();++i)
         {
-            _currentLayer->addChild(_previousLayer->getChild(i));
+            addToCurrentLayer(_previousLayer->getChild(i));
         }
     }
@@ -518 +521 @@
 }
 
+void SlideShowConstructor::addToCurrentLayer(osg::Node* subgraph)
+{
+    if (!subgraph) return;
+    
+    if (!_currentLayer) addLayer();
+
+    if (_currentEventCallbackToApply.valid())
+    {
+        if (subgraph->getEventCallback()==0)
+        {
+            if (_layerToApplyEventCallbackTo==0 || _currentLayer==_layerToApplyEventCallbackTo)
+            {
+                OSG_INFO<<"Assigning event callback."<<std::endl;
+                subgraph->setEventCallback(_currentEventCallbackToApply.get());
+            }
+            else
+            {
+                OSG_INFO<<"Ignoring event callback from previous layer."<<std::endl;
+            }
+        }
+        else
+        {
+            OSG_NOTICE<<"Warning: subgraph already has event callback assigned, cannot add second event callback."<<std::endl;
+        }
+        _currentEventCallbackToApply = 0;
+    }
+    _currentLayer->addChild(subgraph);
+}
+
 void SlideShowConstructor::layerClickToDoOperation(Operation operation, bool relativeJump, int slideNum, int layerNum)
 {
-    if (!_currentLayer) addLayer();
-    
-    if (_currentLayer.valid())
-    {
-        if (_previousLayer==_currentLayer)
-        {
-            if (_currentLayer->getNumChildren()>0)
-            {
-                OSG_INFO<<"creating new group within layer"<<std::endl;
-                osg::Group* group = new osg::Group;
-                _currentLayer->addChild(group);
-                _currentLayer = group;
-            }
-        }
-        else
-        {
-            OSG_INFO<<"creating secondary group within layer"<<std::endl;
-            osg::Group* group = new osg::Group;
-            _previousLayer->addChild(group);
-            _currentLayer = group;
-        }                
-        _currentLayer->setEventCallback(new PickEventHandler(operation, relativeJump, slideNum, layerNum));
-    }
-    
+    _layerToApplyEventCallbackTo = _currentLayer;
+    _currentEventCallbackToApply = new PickEventHandler(operation, relativeJump, slideNum, layerNum);
 }
 
 
 void SlideShowConstructor::layerClickToDoOperation(const std::string& command, Operation operation, bool relativeJump, int slideNum, int layerNum)
-{
-    if (!_currentLayer) addLayer();
-    
-    if (_currentLayer.valid())
-    {
-        if (_previousLayer==_currentLayer)
-        {
-            if (_currentLayer->getNumChildren()>0)
-            {
-                OSG_INFO<<"creating new group within layer"<<std::endl;
-                osg::Group* group = new osg::Group;
-                _currentLayer->addChild(group);
-                _currentLayer = group;
-            }
-        }
-        else
-        {
-            OSG_INFO<<"creating secondary group within layer"<<std::endl;
-            osg::Group* group = new osg::Group;
-            _previousLayer->addChild(group);
-            _currentLayer = group;
-        }                
-        _currentLayer->setEventCallback(new PickEventHandler(command, operation, relativeJump, slideNum, layerNum));
-    }
-    
+{    
+    _layerToApplyEventCallbackTo = _currentLayer;
+    _currentEventCallbackToApply = new PickEventHandler(command, operation, relativeJump, slideNum, layerNum);
 }
 
@@ -578 +566 @@
 void SlideShowConstructor::layerClickEventOperation(const KeyPosition& keyPos, bool relativeJump, int slideNum, int layerNum)
 {
-    if (!_currentLayer) addLayer();
-    
-    if (_currentLayer.valid())
-    {
-        if (_previousLayer==_currentLayer)
-        {
-            if (_currentLayer->getNumChildren()>0)
-            {
-                OSG_INFO<<"creating new group within layer"<<std::endl;
-                osg::Group* group = new osg::Group;
-                _currentLayer->addChild(group);
-                _currentLayer = group;
-            }
-        }
-        else
-        {
-            OSG_INFO<<"creating secondary group within layer"<<std::endl;
-            osg::Group* group = new osg::Group;
-            _previousLayer->addChild(group);
-            _currentLayer = group;
-        }                
-        _currentLayer->setEventCallback(new PickEventHandler(keyPos, relativeJump, slideNum, layerNum));
-    }
-    
+    _layerToApplyEventCallbackTo = _currentLayer;
+    _currentEventCallbackToApply = new PickEventHandler(keyPos, relativeJump, slideNum, layerNum);
 }
 
@@ -639 +605 @@
 void SlideShowConstructor::addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData)
 {
-    if (!_currentLayer) addLayer();
-
     osg::Geode* geode = new osg::Geode;
 
@@ -678 +642 @@
     geode->addDrawable(text);
     
-    _currentLayer->addChild( decorateSubgraphForPosition(geode, positionData) );
+    addToCurrentLayer( decorateSubgraphForPosition(geode, positionData) );
 
     bool needToApplyPosition = (_textPositionData.position == positionData.position);
@@ -689 +653 @@
 void SlideShowConstructor::addParagraph(const std::string& paragraph, PositionData& positionData, FontData& fontData)
 {
-    if (!_currentLayer) addLayer();
-
     osg::Geode* geode = new osg::Geode;
 
@@ -727 +689 @@
     geode->addDrawable(text);
     
-    _currentLayer->addChild( decorateSubgraphForPosition(geode, positionData) );
+    addToCurrentLayer( decorateSubgraphForPosition(geode, positionData) );
 
     bool needToApplyPosition = (_textPositionData.position == positionData.position);
@@ -878 +840 @@
 void SlideShowConstructor::addImage(const std::string& filename, const PositionData& positionData, const ImageData& imageData)
 {
-    if (!_currentLayer) addLayer();
-
     osg::ref_ptr<osgDB::Options> options = _options;
     if (!imageData.options.empty())
@@ -1017 +977 @@
     }
 
-    _currentLayer->addChild(subgraph);
+    addToCurrentLayer(subgraph);
 }
 
 void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, const ImageData& imageDataLeft, const std::string& filenameRight, const ImageData& imageDataRight,const PositionData& positionData)
 {
-    if (!_currentLayer) addLayer();
-
     osg::ref_ptr<osgDB::Options> optionsLeft = _options;
     if (!imageDataLeft.options.empty())
@@ -1227 +1185 @@
     }
 
-    _currentLayer->addChild(subgraph);
+    addToCurrentLayer(subgraph);
 }
 
@@ -1346 +1304 @@
 osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filename, const PositionData& positionData, const ImageData& imageData)
 {
-    if (!_currentLayer) addLayer();
-
     osg::ref_ptr<osgDB::Options> options = _options;
     if (!imageData.options.empty())
@@ -1469 +1425 @@
     }
 
-    _currentLayer->addChild(subgraph);
+    addToCurrentLayer(subgraph);
 
     osgWidget::PdfImage* pdfImage = dynamic_cast<osgWidget::PdfImage*>(image);
@@ -1724 +1680 @@
     findImageStreamsAndAddCallbacks(subgraph);
 
-    _currentLayer->addChild(subgraph);
+    addToCurrentLayer(subgraph);
 }