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

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}/deprecated/AnimationMaterial
-    ${HEADER_PATH}/deprecated/CompileSlideCallback
-    ${HEADER_PATH}/deprecated/PickEventHandler
-    ${HEADER_PATH}/deprecated/PropertyManager
-    ${HEADER_PATH}/deprecated/KeyEventHandler
-    ${HEADER_PATH}/deprecated/SlideEventHandler
-    ${HEADER_PATH}/deprecated/SlideShowConstructor
-    ${HEADER_PATH}/deprecated/Timeout
+    ${HEADER_PATH}/AnimationMaterial
+    ${HEADER_PATH}/CompileSlideCallback
+    ${HEADER_PATH}/PickEventHandler
+    ${HEADER_PATH}/PropertyManager
+    ${HEADER_PATH}/KeyEventHandler
+    ${HEADER_PATH}/SlideEventHandler
+    ${HEADER_PATH}/SlideShowConstructor
+    ${HEADER_PATH}/Timeout
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 SET(TARGET_SRC
-
     Cursor.cpp
-
-    deprecated/AnimationMaterial.cpp
-    deprecated/CompileSlideCallback.cpp
-    deprecated/PickEventHandler.cpp
-    deprecated/PropertyManager.cpp
-    deprecated/KeyEventHandler.cpp
-    deprecated/SlideEventHandler.cpp
-    deprecated/SlideShowConstructor.cpp
-    deprecated/Timeout.cpp
+    AnimationMaterial.cpp
+    CompileSlideCallback.cpp
+    PickEventHandler.cpp
+    PropertyManager.cpp
+    KeyEventHandler.cpp
+    SlideEventHandler.cpp
+    SlideShowConstructor.cpp
+    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/deprecated/SlideEventHandler>
+#include <osgPresentation/KeyEventHandler>
+#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/deprecated/SlideEventHandler>
+#include <osgPresentation/PickEventHandler>
+#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/deprecated/SlideShowConstructor>
-#include <osgPresentation/deprecated/AnimationMaterial>
+#include <osgPresentation/SlideEventHandler>
+#include <osgPresentation/SlideShowConstructor>
+#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/deprecated/AnimationMaterial>
-#include <osgPresentation/deprecated/PickEventHandler>
-#include <osgPresentation/deprecated/KeyEventHandler>
+#include <osgPresentation/SlideShowConstructor>
+#include <osgPresentation/AnimationMaterial>
+#include <osgPresentation/PickEventHandler>
+#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>