Changeset 13041 for OpenSceneGraph/trunk/src/osgPresentation/SlideEventHandler.cpp

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPresentation/SlideEventHandler.cpp (modified) (57 diffs)

OpenSceneGraph/trunk/src/osgPresentation/SlideEventHandler.cpp

@@ -1 @@
-/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * include LICENSE.txt for more details.
 */
@@ -72 +72 @@
         reset();
     }
-    
+
     virtual void maintain()
     {
     }
-    
+
     virtual void leave()
     {
@@ -91 +91 @@
         else _imageStream->play();
     }
-    
+
     virtual void reset()
     {
@@ -100 +100 @@
 
         //_imageStream->setVolume(previousVolume);
-        
+
         if(previousStatus==osg::ImageStream::PLAYING)
         {
@@ -106 +106 @@
         }
 
-        // add a delay so that movie thread has a chance to do the rewind    
+        // add a delay so that movie thread has a chance to do the rewind
         float microSecondsToDelay = SlideEventHandler::instance()->getTimeDelayOnNewSlideWithMovies() * 1000000.0f;
         OpenThreads::Thread::microSleep(static_cast<unsigned int>(microSecondsToDelay));
@@ -126 +126 @@
         reset();
     }
-    
+
     virtual void maintain()
     {
     }
-    
+
     virtual void leave()
     {
@@ -208 +208 @@
 
             OSG_INFO<<"}"<<std::endl;
-        }   
+        }
         if (!_layerAttribute->_runStrings.empty())
         {
@@ -235 +235 @@
 
     }
-    
+
     virtual void maintain()
     {
     }
-    
+
     virtual void leave()
     {
@@ -286 +286 @@
     }
 
-    void apply(osg::Geode& node)    
+    void apply(osg::Geode& node)
     {
         apply((osg::Node&)node);
@@ -326 +326 @@
 {
     _previous.swap(_current);
-    
+
     _current.clear();
-    
+
     FindOperatorsVisitor fov(_current, tm);
     incommingNode->accept(fov);
-    
+
     OSG_INFO<<"ActiveOperators::collect("<<incommingNode<<")"<<std::endl;
     OSG_INFO<<"  _previous.size()="<<_previous.size()<<std::endl;
     OSG_INFO<<"  _current.size()="<<_current.size()<<std::endl;
-    
+
     _outgoing.clear();
     _incomming.clear();
     _maintained.clear();
-    
+
     for(OperatorList::iterator itr = _previous.begin();
         itr != _previous.end();
@@ -348 +348 @@
         else _maintained.insert(prev);
     }
-    
+
     for(OperatorList::iterator itr = _current.begin();
         itr != _current.end();
@@ -389 +389 @@
 void ActiveOperators::processOutgoing()
 {
-    OSG_INFO<<"  outgoing.size()="<<_outgoing.size()<<std::endl;    
+    OSG_INFO<<"  outgoing.size()="<<_outgoing.size()<<std::endl;
     for(OperatorList::iterator itr = _outgoing.begin();
         itr != _outgoing.end();
@@ -430 +430 @@
     FindHomePositionVisitor():
         osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN) {}
-        
+
     void apply(osg::Node& node)
     {
@@ -438 +438 @@
             _homePosition = homePosition;
         }
-        
+
         traverse(node);
     }
-        
+
     osg::ref_ptr<HomePosition> _homePosition;
-        
+
 };
 
@@ -454 +454 @@
         _name(name),
         _switch(0) {}
-        
+
     void apply(osg::Switch& sw)
     {
@@ -462 +462 @@
             return; // note, no need to do traverse now we've located the relevant switch
         }
-        
+
         traverse(sw);
     }
-        
+
     std::string     _name;
     osg::Switch*    _switch;
-        
+
 };
 
@@ -478 +478 @@
     FindFilePathDataVisitor():
         osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN) {}
-        
+
     void apply(osg::Node& node)
     {
         FilePathData* fdd = dynamic_cast<FilePathData*>(node.getUserData());
-        if (fdd) 
+        if (fdd)
         {
             OSG_INFO<<"Recorded FilePathData"<<std::endl;
             osgDB::setDataFilePathList(fdd->filePathList);
         }
-        
+
         traverse(node);
     }
-        
+
 };
 
@@ -501 +501 @@
         _viewMatrix(viewMatrix),
         _currentX(currentX), _currentY(currentY) {}
-        
+
     void apply(osg::Node& node)
     {
         traverse(node);
     }
-    
+
     void apply(osg::LightSource& lightsource)
     {
@@ -520 +520 @@
             }
         }
-        
+
         traverse(lightsource);
     }
@@ -531 +531 @@
         if (sum_x2_y2<1.0) direction.set(_currentX, _currentY, sqrtf(1.0-sum_x2_y2));
         else direction.set(_currentX, _currentY, 0.0);
-        
+
         direction.normalize();
-        
+
         direction = osg::Matrixd::transform3x3(matrix, direction);
         direction.normalize();
@@ -542 +542 @@
     osg::Matrixd    _viewMatrix;
     float           _currentX, _currentY;
-        
+
 };
 
@@ -553 +553 @@
         _modAlphaFunc(modAlphaFunc), _modMaterial(modMaterial),
         _currentX(currentX), _currentY(currentY) {}
-        
+
     void apply(osg::Node& node)
     {
@@ -559 +559 @@
         traverse(node);
     }
-    
+
     void apply(osg::StateSet& stateset)
     {
@@ -575 +575 @@
             }
         }
-        
+
         if (_modMaterial)
-        {        
+        {
             osg::Material* material = dynamic_cast<osg::Material*>(stateset.getAttribute(osg::StateAttribute::MATERIAL));
             if (material)
@@ -590 +590 @@
     bool _modAlphaFunc, _modMaterial;
     float   _currentX, _currentY;
-        
+
 };
 
@@ -652 +652 @@
     FindNamedSwitchVisitor findPresentation("Presentation");
     model->accept(findPresentation);
-    
+
     if (findPresentation._switch)
     {
         OSG_INFO<<"Presentation '"<<model->getName()<<"'"<<std::endl;
         _presentationSwitch = findPresentation._switch;
-        
+
         double duration = getDuration(_presentationSwitch.get());
         if (duration>=0.0)
@@ -664 +664 @@
             _timePerSlide = duration;
         }
-        
+
         //selectSlide(0);
     }
@@ -673 +673 @@
         _presentationSwitch = 0;
         _activeSlide = 0;
-        
+
         FindNamedSwitchVisitor findSlide("Slide");
         model->accept(findSlide);
-        
+
         if (findSlide._switch)
         {
@@ -688 +688 @@
             OSG_INFO<<"No slides present in scene, unable to operate as a slideshow."<<std::endl;
         }
-    
+
     }
 }
@@ -710 +710 @@
         {
             return duration;
-        }        
-    }
-        
+        }
+    }
+
     return _timePerSlide;
 }
@@ -758 +758 @@
             {
                 double time = ea.time();
-                
+
                 if (_firstTraversal)
                 {
@@ -767 +767 @@
                 {
                     // _previousTime = time;
-                    
+
                     if (!_hold)
                     {
@@ -794 +794 @@
             {
                  break;
-            } 
-            
+            }
+
             _timeLastKeyPresses = time;
 
@@ -852 +852 @@
                 return true;
             }
-            else if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Page_Down || 
+            else if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Page_Down ||
                      ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Page_Down)
             {
@@ -866 +866 @@
                 return true;
             }
-            else if (ea.getKey()=='N' || 
-                     ea.getKey()==osgGA::GUIEventAdapter::KEY_Right || 
+            else if (ea.getKey()=='N' ||
+                     ea.getKey()==osgGA::GUIEventAdapter::KEY_Right ||
                      ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Right)
             {
@@ -875 +875 @@
                 return true;
             }
-            else if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Left || 
+            else if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Left ||
                      ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Left)
             {
@@ -888 +888 @@
                 {
                     _pause = true;
-#if 0                    
+#if 0
                     resetUpdateCallbackActivity(ALL_OBJECTS);
 #endif
                     _activeOperators.setPause(_pause);
                 }
-                
-                return true;
-                
+
+                return true;
+
             }
             else if (ea.getKey()=='o')
@@ -902 +902 @@
                 {
                     _pause = false;
-#if 0                    
+#if 0
                     resetUpdateCallbackActivity(ALL_OBJECTS);
 #endif
@@ -908 +908 @@
                 }
                 return true;
-                
+
             }
             else if (ea.getKey()=='h')
@@ -923 +923 @@
                 return true;
             }
-/*            
+/*
             else if (ea.getKey()=='c')
             {
                 _cursorOn = !_cursorOn;
-            
+
                 for( unsigned int i = 0; i < _viewer->getCameraConfig()->getNumberOfCameras(); i++ )
                 {
@@ -995 +995 @@
 
     OSG_INFO<<"selectSlide("<<slideNum<<","<<layerNum<<")"<<std::endl;
-    
+
     if (slideNum>=static_cast<int>(_presentationSwitch->getNumChildren()))
     {
@@ -1005 +1005 @@
         slideNum = _presentationSwitch->getNumChildren()-1;
     }
-    
+
     if (slideNum>=static_cast<int>(_presentationSwitch->getNumChildren())) return false;
 
@@ -1019 +1019 @@
 
     OSG_INFO<<"selectSlide("<<slideNum<<","<<layerNum<<") at time "<<osg::Timer::instance()->delta_s(_tickAtFirstSlideOrLayerChange, tick)<<" seconds, length ="<<osg::Timer::instance()->delta_s(_tickAtLastSlideOrLayerChange, tick)<<" seconds"<<std::endl;
-    
+
     _tickAtLastSlideOrLayerChange = tick;
-    
+
     // dectivate movies etc on current active slide.
     bool newSlide = _activeSlide!=slideNum;
@@ -1037 +1037 @@
     //OSG_INFO<<"Selected slide '"<<_presentationSwitch->getChild(_activeSlide)->getName()<<"'"<<std::endl;
 
-    
+
     FindNamedSwitchVisitor findSlide("Slide");
     _presentationSwitch->getChild(_activeSlide)->accept(findSlide);
@@ -1049 +1049 @@
         result = selectLayer(layerNum);
 
-        
+
     }
     else
@@ -1056 +1056 @@
         updateOperators();
     }
-    
+
 
     // refersh the viewer.
     //_viewer->getKeySwitchMatrixManipulator()->setMinimumDistance(0.001);
-    
+
     _viewer->getCameraManipulator()->setNode(_slideSwitch.get());
-    
+
     _viewer->computeActiveCoordinateSystemNodePath();
-    
+
     // resetUpdateCallbacks(ALL_OBJECTS);
-    
+
     bool _useSlideFilePaths = false;
     if (_useSlideFilePaths)
@@ -1074 +1074 @@
         _presentationSwitch->accept(ffpdv);
     }
-    
+
     if (newSlide && _releaseAndCompileOnEachNewSlide)
     {
@@ -1081 +1081 @@
 
     return result;
-    
+
 }
 
@@ -1102 +1102 @@
 
     if (layerNum>=static_cast<int>(_slideSwitch->getNumChildren())) return false;
-    
+
     _activeLayer = layerNum;
     _slideSwitch->setSingleChildOn(_activeLayer);
@@ -1144 +1144 @@
             int newSlide = previousSlide + la->getSlideNum();
             int newLayer = previousLayer + la->getLayerNum();
-            if (newLayer<0) 
+            if (newLayer<0)
             {
                 newLayer = 0;
@@ -1184 +1184 @@
     {
         la->callLeaveCallbacks(_slideSwitch->getChild(_activeLayer));
-    
+
         if (la->requiresJump())
         {
@@ -1193 +1193 @@
                 int newSlide = previousSlide + la->getSlideNum();
                 int newLayer = previousLayer + la->getLayerNum();
-                if (newLayer<0) 
+                if (newLayer<0)
                 {
                     newLayer = 0;
@@ -1268 +1268 @@
 {
     OSG_INFO<<"updateAlpha("<<x<<","<<y<<")"<<std::endl;
-    
+
     UpdateAlphaVisitor uav(modAlphaFunc, modMaterial, x,y);
     if (_presentationSwitch.valid()) _presentationSwitch->accept(uav);
@@ -1312 +1312 @@
         }
 
-    }            
-    
+    }
+
     _compileSlideCallback->needCompile(_presentationSwitch->getChild(slideNum));
-    
+
 }
 
@@ -1323 +1323 @@
                                            osgUtil::GLObjectsVisitor::RELEASE_STATE_ATTRIBUTES);
     globjVisitor.setNodeMaskOverride(0xffffffff);
-    
+
     _presentationSwitch->getChild(slideNum)->accept(globjVisitor);
 }
@@ -1333 +1333 @@
     // reset the time of the last key press to ensure that the event is disgarded as a key repeat.
     _timeLastKeyPresses = -1.0;
-    
+
     if (keyPosition._x!=FLT_MAX)
     {
@@ -1339 +1339 @@
         eq->getCurrentEventState()->setX(xRescaled);
     }
-    
+
     if (keyPosition._y!=FLT_MAX)
     {
         float y = (eq->getCurrentEventState()->getMouseYOrientation()==osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS) ?
                    keyPosition._y : -keyPosition._y;
-            
+
         float yRescaled = eq->getCurrentEventState()->getYmin() + (y+1.0f)*0.5f*(eq->getCurrentEventState()->getYmax()-eq->getCurrentEventState()->getYmin());
         eq->getCurrentEventState()->setY(yRescaled);