Restructed the osgPresentation and present3D directories back to the structure that was present in OSG-3.2

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14759 16af8721-9629-0410-8352-f15c8da7e697

applications/present3D/CMakeLists.txt

@@ -1,20 +1,20 @@
 SET(TARGET_SRC
-    deprecated/Cluster.cpp
+    Cluster.cpp
-    deprecated/ExportHTML.cpp
+    ExportHTML.cpp
-    deprecated/PointsEventHandler.cpp
+    PointsEventHandler.cpp
-    deprecated/present3D.cpp
+    present3D.cpp
-    deprecated/ReadShowFile.cpp
+    ReadShowFile.cpp
-    deprecated/ShowEventHandler.cpp
+    ShowEventHandler.cpp
-    deprecated/SpellChecker.cpp
+    SpellChecker.cpp
 )
 
 SET(TARGET_H
-    deprecated/Cluster.h
+    Cluster.h
-    deprecated/ExportHTML.h
+    ExportHTML.h
-    deprecated/PointsEventHandler.h
+    PointsEventHandler.h
-    deprecated/ReadShowFile.h
+    ReadShowFile.h
-    deprecated/ShowEventHandler.h
+    ShowEventHandler.h
-    deprecated/SpellChecker.h
+    SpellChecker.h
 )
 
 IF (SDL_FOUND)

applications/present3D/ExportHTML.h

@@ -13,7 +13,7 @@
 #ifndef EXPORTHTML_H
 #define EXPORTHTML_H 1
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 #include <osgViewer/Viewer>
 
 class ExportHTML

applications/present3D/ReadShowFile.cpp

@@ -13,7 +13,7 @@
 #include "ReadShowFile.h"
 #include "ShowEventHandler.h"
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 #include <osg/ImageStream>
 #include <osg/Shape>

applications/present3D/present3D.cpp

@@ -38,7 +38,7 @@
 #include <osgGA/StateSetManipulator>
 #include <osgGA/MultiTouchTrackballManipulator>
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 #include <osgPresentation/Cursor>
 
 #include "ReadShowFile.h"

include/osgPresentation/KeyEventHandler

@@ -18,7 +18,7 @@
 
 #include <osgGA/GUIEventHandler>
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 namespace osgPresentation
 {

include/osgPresentation/PickEventHandler

@@ -18,7 +18,7 @@
 
 #include <osgGA/GUIEventHandler>
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 namespace osgPresentation
 {

include/osgPresentation/SlideEventHandler

@@ -21,8 +21,8 @@
 #include <osgGA/GUIEventHandler>
 #include <osgViewer/Viewer>
 
-#include <osgPresentation/deprecated/CompileSlideCallback>
+#include <osgPresentation/CompileSlideCallback>
-#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/PropertyManager>
 
 namespace osgPresentation
 {

include/osgPresentation/SlideShowConstructor

@@ -32,10 +32,10 @@
 #include <osgVolume/VolumeTile>
 #include <osgVolume/VolumeSettings>
 
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/AnimationMaterial>
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
-#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/PropertyManager>
-#include <osgPresentation/deprecated/Timeout>
+#include <osgPresentation/Timeout>
 
 namespace osgPresentation
 {

include/osgPresentation/Timeout

@@ -16,7 +16,7 @@
 
 #include <osg/Transform>
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 namespace osgPresentation {
 

src/osgPlugins/osc/OscReceivingDevice.cpp

@@ -17,7 +17,7 @@
 #include <osg/ValueObject>
 #include <osgDB/FileUtils>
 #include <osgDB/FileNameUtils>
-#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/PropertyManager>
 #include "osc/OscPrintReceivedElements.h"
 #include "osc/OscHostEndianness.h"
 

src/osgPlugins/osc/ReaderWriterOscDevice.cpp

@@ -52,7 +52,7 @@
 #include <osgDB/FileUtils>
 #include "OscSendingDevice.hpp"
 #include "OscReceivingDevice.hpp"
-#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/PropertyManager>
 
 
 

src/osgPlugins/p3d/ReaderWriterP3D.cpp

@@ -22,7 +22,7 @@
 
 #include <osgWidget/PdfReader>
 
-#include <osgPresentation/deprecated/SlideShowConstructor>
+#include <osgPresentation/SlideShowConstructor>
 
 #include <stdio.h>
 #include <string.h>

src/osgPlugins/p3d/ReaderWriterPaths.cpp

@@ -20,8 +20,8 @@
 
 #include <osgWidget/PdfReader>
 
-#include <osgPresentation/deprecated/SlideShowConstructor>
+#include <osgPresentation/SlideShowConstructor>
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/AnimationMaterial>
 
 #include <stdio.h>
 #include <string.h>

src/osgPresentation/AnimationMaterial.cpp

@@ -10,7 +10,7 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/AnimationMaterial>
 
 #include <osg/MatrixTransform>
 #include <osg/PositionAttitudeTransform>

src/osgPresentation/CMakeLists.txt

@@ -10,30 +10,27 @@ SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H
     ${HEADER_PATH}/Export
     ${HEADER_PATH}/Cursor
-
+    ${HEADER_PATH}/AnimationMaterial
-    ${HEADER_PATH}/deprecated/AnimationMaterial
+    ${HEADER_PATH}/CompileSlideCallback
-    ${HEADER_PATH}/deprecated/CompileSlideCallback
+    ${HEADER_PATH}/PickEventHandler
-    ${HEADER_PATH}/deprecated/PickEventHandler
+    ${HEADER_PATH}/PropertyManager
-    ${HEADER_PATH}/deprecated/PropertyManager
+    ${HEADER_PATH}/KeyEventHandler
-    ${HEADER_PATH}/deprecated/KeyEventHandler
+    ${HEADER_PATH}/SlideEventHandler
-    ${HEADER_PATH}/deprecated/SlideEventHandler
+    ${HEADER_PATH}/SlideShowConstructor
-    ${HEADER_PATH}/deprecated/SlideShowConstructor
+    ${HEADER_PATH}/Timeout
-    ${HEADER_PATH}/deprecated/Timeout
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 SET(TARGET_SRC
-
     Cursor.cpp
-
+    AnimationMaterial.cpp
-    deprecated/AnimationMaterial.cpp
+    CompileSlideCallback.cpp
-    deprecated/CompileSlideCallback.cpp
+    PickEventHandler.cpp
-    deprecated/PickEventHandler.cpp
+    PropertyManager.cpp
-    deprecated/PropertyManager.cpp
+    KeyEventHandler.cpp
-    deprecated/KeyEventHandler.cpp
+    SlideEventHandler.cpp
-    deprecated/SlideEventHandler.cpp
+    SlideShowConstructor.cpp
-    deprecated/SlideShowConstructor.cpp
+    Timeout.cpp
-    deprecated/Timeout.cpp
     ${OPENSCENEGRAPH_VERSIONINFO_RC}
 )
 

src/osgPresentation/CompileSlideCallback.cpp

@@ -10,7 +10,7 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/CompileSlideCallback>
+#include <osgPresentation/CompileSlideCallback>
 
 #include <osgUtil/GLObjectsVisitor>
 

src/osgPresentation/KeyEventHandler.cpp

@@ -10,8 +10,8 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/KeyEventHandler>
+#include <osgPresentation/KeyEventHandler>
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 #include <osgViewer/Viewer>
 #include <osg/Notify>

src/osgPresentation/PickEventHandler.cpp

@@ -10,8 +10,8 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/PickEventHandler>
+#include <osgPresentation/PickEventHandler>
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
 
 #include <osgViewer/Viewer>
 #include <osg/Notify>

src/osgPresentation/PropertyManager.cpp

@@ -10,7 +10,7 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/PropertyManager>
+#include <osgPresentation/PropertyManager>
 #include <osg/io_utils>
 
 using namespace osgPresentation;

src/osgPresentation/SlideEventHandler.cpp

@@ -10,9 +10,9 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/SlideEventHandler>
+#include <osgPresentation/SlideEventHandler>
-#include <osgPresentation/deprecated/SlideShowConstructor>
+#include <osgPresentation/SlideShowConstructor>
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/AnimationMaterial>
 
 #include <osg/AnimationPath>
 #include <osg/Transform>

src/osgPresentation/SlideShowConstructor.cpp

@@ -10,10 +10,10 @@
  * include LICENSE.txt for more details.
 */
 
-#include <osgPresentation/deprecated/SlideShowConstructor>
+#include <osgPresentation/SlideShowConstructor>
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/AnimationMaterial>
-#include <osgPresentation/deprecated/PickEventHandler>
+#include <osgPresentation/PickEventHandler>
-#include <osgPresentation/deprecated/KeyEventHandler>
+#include <osgPresentation/KeyEventHandler>
 
 
 #include <osg/Geometry>

src/osgPresentation/Timeout.cpp

@@ -11,7 +11,7 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include <osgPresentation/deprecated/Timeout>
+#include <osgPresentation/Timeout>
 #include <osgUtil/CullVisitor>
 #include <osgGA/EventVisitor>