FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved old osgPresentation source files to osgPresentation/deprecated subdirectory.

Browse Source
This commit is contained in:
Robert Osfield 2013-08-18 18:10:39 +00:00
parent 28ce02915a
commit 4e3715d4bb
24 changed files with 250 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/present3D/deprecated/ExportHTML.h
View File

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

2
applications/present3D/deprecated/ReadShowFile.cpp
View File

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

2
applications/present3D/deprecated/present3D.cpp
View File

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

0
include/osgPresentation/AnimationMaterial → include/osgPresentation/deprecated/AnimationMaterial
View File

0
include/osgPresentation/CompileSlideCallback → include/osgPresentation/deprecated/CompileSlideCallback
View File

2
include/osgPresentation/KeyEventHandler → include/osgPresentation/deprecated/KeyEventHandler
View File

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

2
include/osgPresentation/PickEventHandler → include/osgPresentation/deprecated/PickEventHandler
View File

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

0
include/osgPresentation/PropertyManager → include/osgPresentation/deprecated/PropertyManager
View File

4
include/osgPresentation/SlideEventHandler → include/osgPresentation/deprecated/SlideEventHandler
View File

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

8
include/osgPresentation/SlideShowConstructor → include/osgPresentation/deprecated/SlideShowConstructor
View File

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

2
include/osgPresentation/Timeout → include/osgPresentation/deprecated/Timeout
View File

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

2
src/osgPlugins/osc/OscReceivingDevice.cpp
View File

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

2
src/osgPlugins/osc/ReaderWriterOscDevice.cpp
View File

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

2
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

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

4
src/osgPlugins/p3d/ReaderWriterPaths.cpp
View File

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

32
src/osgPresentation/CMakeLists.txt
View File

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

2
src/osgPresentation/AnimationMaterial.cpp → src/osgPresentation/deprecated/AnimationMaterial.cpp
View File

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

2
src/osgPresentation/CompileSlideCallback.cpp → src/osgPresentation/deprecated/CompileSlideCallback.cpp
View File

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

4
src/osgPresentation/KeyEventHandler.cpp → src/osgPresentation/deprecated/KeyEventHandler.cpp
View File

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

4
src/osgPresentation/PickEventHandler.cpp → src/osgPresentation/deprecated/PickEventHandler.cpp
View File

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

2
src/osgPresentation/PropertyManager.cpp → src/osgPresentation/deprecated/PropertyManager.cpp
View File

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

6
src/osgPresentation/SlideEventHandler.cpp → src/osgPresentation/deprecated/SlideEventHandler.cpp
View File

@ -10,8 +10,9 @@
* include LICENSE.txt for more details. * include LICENSE.txt for more details.
*/ */
#include <osgPresentation/SlideEventHandler> #include <osgPresentation/deprecated/SlideEventHandler>
#include <osgPresentation/SlideShowConstructor> #include <osgPresentation/deprecated/SlideShowConstructor>
#include <osgPresentation/deprecated/AnimationMaterial>
#include <osg/AnimationPath> #include <osg/AnimationPath>
#include <osg/Transform> #include <osg/Transform>
@ -27,7 +28,6 @@
#include <osgGA/AnimationPathManipulator> #include <osgGA/AnimationPathManipulator>
#include <osgPresentation/AnimationMaterial>
#include <iostream> #include <iostream>

10
src/osgPresentation/SlideShowConstructor.cpp → src/osgPresentation/deprecated/SlideShowConstructor.cpp
View File

@ -10,7 +10,11 @@
* include LICENSE.txt for more details. * include LICENSE.txt for more details.
*/ */
#include <osgPresentation/SlideShowConstructor> #include <osgPresentation/deprecated/SlideShowConstructor>
#include <osgPresentation/deprecated/AnimationMaterial>
#include <osgPresentation/deprecated/PickEventHandler>
#include <osgPresentation/deprecated/KeyEventHandler>
#include <osg/Geometry> #include <osg/Geometry>
#include <osg/PolygonOffset> #include <osg/PolygonOffset>
@ -51,10 +55,6 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <osgPresentation/AnimationMaterial>
#include <osgPresentation/PickEventHandler>
#include <osgPresentation/KeyEventHandler>
#include <osgManipulator/TabBoxDragger> #include <osgManipulator/TabBoxDragger>
#include <osgManipulator/TabBoxTrackballDragger> #include <osgManipulator/TabBoxTrackballDragger>
#include <osgManipulator/TrackballDragger> #include <osgManipulator/TrackballDragger>

2
src/osgPresentation/Timeout.cpp → src/osgPresentation/deprecated/Timeout.cpp
View File

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