Moved old osgPresentation source files to osgPresentation/deprecated subdirectory.

include/osgPresentation/deprecated/KeyEventHandler

@@ -18,7 +18,7 @@
 
 #include <osgGA/GUIEventHandler>
 
-#include <osgPresentation/SlideEventHandler>
+#include <osgPresentation/deprecated/SlideEventHandler>
 
 namespace osgPresentation
 {
@@ -33,7 +33,7 @@ class OSGPRESENTATION_EXPORT KeyEventHandler : public osgGA::GUIEventHandler
 
         void setKey(int key) { _key = key; }
         int getKey() const { return _key; }
-        
+
         void setOperation(osgPresentation::Operation operation) { _operation = operation; }
         osgPresentation::Operation getOperation() const { return _operation; }
 
@@ -55,7 +55,7 @@ class OSGPRESENTATION_EXPORT KeyEventHandler : public osgGA::GUIEventHandler
         void doOperation();
 
         int                                 _key;
-        
+
         std::string                         _command;
         osgPresentation::KeyPosition        _keyPos;
         osgPresentation::Operation          _operation;

include/osgPresentation/deprecated/PickEventHandler

@@ -18,7 +18,7 @@
 
 #include <osgGA/GUIEventHandler>
 
-#include <osgPresentation/SlideEventHandler>
+#include <osgPresentation/deprecated/SlideEventHandler>
 
 namespace osgPresentation
 {
@@ -42,7 +42,7 @@ class OSGPRESENTATION_EXPORT PickEventHandler : public osgGA::GUIEventHandler
 
         void setJumpData(const JumpData& jumpData) { _jumpData = jumpData; }
         const JumpData& getJumpData() const { return _jumpData; }
-        
+
         virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object* object, osg::NodeVisitor* nv);
 
         virtual void accept(osgGA::GUIEventHandlerVisitor& v);

include/osgPresentation/deprecated/SlideEventHandler

@@ -21,15 +21,15 @@
 #include <osgGA/GUIEventHandler>
 #include <osgViewer/Viewer>
 
-#include <osgPresentation/CompileSlideCallback>
-#include <osgPresentation/PropertyManager>
+#include <osgPresentation/deprecated/CompileSlideCallback>
+#include <osgPresentation/deprecated/PropertyManager>
 
 namespace osgPresentation
 {
 
 // forward declare
 class SlideEventHandler;
-    
+
 /// Operations related to click to run/load/key events.
 enum Operation
 {
@@ -46,7 +46,7 @@ struct JumpData
         relativeJump(true),
         slideNum(0),
         layerNum(0) {}
-        
+
     JumpData(bool in_relativeJump, int in_slideNum, int in_layerNum):
         relativeJump(in_relativeJump),
         slideNum(in_slideNum),
@@ -230,7 +230,7 @@ protected:
     void processOutgoing(SlideEventHandler* seh);
     void processIncomming(SlideEventHandler* seh);
     void processMaintained(SlideEventHandler* seh);
-    
+
     bool            _pause;
 
     OperatorList    _previous;

include/osgPresentation/deprecated/SlideShowConstructor

@@ -31,10 +31,10 @@
 #include <osgVolume/VolumeTile>
 #include <osgVolume/Property>
 
-#include <osgPresentation/AnimationMaterial>
-#include <osgPresentation/SlideEventHandler>
-#include <osgPresentation/PropertyManager>
-#include <osgPresentation/Timeout>
+#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/deprecated/Timeout>
 
 namespace osgPresentation
 {
@@ -67,7 +67,7 @@ public:
     enum CoordinateFrame { SLIDE, MODEL };
 
 
-    
+
     LayerAttributes* getOrCreateLayerAttributes(osg::Node* node);
 
     void setDuration(osg::Node* node,double duration)
@@ -253,7 +253,7 @@ public:
         osg::Vec4                       backgroundColor;
         double                          fps;
         double                          duration;
-        
+
         bool                            imageSequence;
         osg::ImageSequence::Mode        imageSequencePagingMode;
 
@@ -271,7 +271,7 @@ public:
             OFF,
             ON
         };
-        
+
         BlendingHint    blendingHint;
 
         double          delayTime;
@@ -420,7 +420,7 @@ public:
         CURRENT_SLIDE,
         CURRENT_LAYER
     };
-    
+
     void addEventHandler(PresentationContext presentationContext, osg::ref_ptr<osgGA::GUIEventHandler> handler);
 
     void keyToDoOperation(PresentationContext presentationContext, int key, Operation operation, const JumpData& jumpData=JumpData());
@@ -456,7 +456,7 @@ public:
     void addModel(const std::string& filename, const PositionData& positionData, const ModelData& modelData);
 
     void setUpVolumeScalarProperty(osgVolume::VolumeTile* tile, osgVolume::ScalarProperty* property, const std::string& source);
-    
+
     void addVolume(const std::string& filename, const PositionData& positionData, const VolumeData& volumeData);
 
     osg::Group* takePresentation() { return _root.release(); }
@@ -469,7 +469,7 @@ public:
 
     void pushCurrentLayer();
     void popCurrentLayer();
-    
+
     osg::Group* getCurrentLayer() { return _currentLayer.get(); }
 
     void setLoopPresentation(bool loop) { _loopPresentation = loop; }
@@ -555,7 +555,7 @@ protected:
 
     osg::ref_ptr<osgPresentation::PropertyManager> _propertyManager;
     osg::ref_ptr<osgPresentation::PropertyEventCallback> _propertyEventCallback;
-    
+
     osg::ref_ptr<osg::Group>        _root;
     osg::ref_ptr<osg::Switch>       _presentationSwitch;
 

include/osgPresentation/deprecated/Timeout

@@ -16,7 +16,7 @@
 
 #include <osg/Transform>
 
-#include <osgPresentation/SlideEventHandler>
+#include <osgPresentation/deprecated/SlideEventHandler>
 
 namespace osgPresentation {
 
@@ -38,7 +38,7 @@ protected:
 
         virtual ~HUDSettings();
 };
-    
+
 class OSGPRESENTATION_EXPORT Timeout : public osg::Transform
 {
     public:
@@ -50,14 +50,14 @@ class OSGPRESENTATION_EXPORT Timeout : public osg::Transform
 
         META_Node(osgPresentation, Timeout);
 
-        
+
         void setIdleDurationBeforeTimeoutDisplay(double t) { _idleDurationBeforeTimeoutDisplay = t; }
         double getIdleDurationBeforeTimeoutDisplay() const { return _idleDurationBeforeTimeoutDisplay; }
 
         void setIdleDurationBeforeTimeoutAction(double t) { _idleDurationBeforeTimeoutAction = t; }
         double getIdleDurationBeforeTimeoutAction() const { return _idleDurationBeforeTimeoutAction; }
 
-        
+
         void setKeyStartsTimoutDisplay(int key) { _keyStartsTimoutDisplay = key; }
         int getKeyStartsTimoutDisplay() const { return _keyStartsTimoutDisplay; }
 
@@ -67,7 +67,7 @@ class OSGPRESENTATION_EXPORT Timeout : public osg::Transform
         void setKeyRunTimoutAction(int key) { _keyRunTimeoutAction = key; }
         int getKeyRunTimoutAction() const { return _keyRunTimeoutAction; }
 
-        
+
         void setDisplayBroadcastKeyPosition(const osgPresentation::KeyPosition& keyPos) { _displayBroadcastKeyPos = keyPos; }
         const osgPresentation::KeyPosition&  getDisplayBroadcastKeyPosition() const { return _displayBroadcastKeyPos; }