From 8c8b8f3305ace09a17787698e929cfc972725006 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 4 Mar 2015 18:36:44 +0000 Subject: [PATCH] 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 | 26 +++--- .../present3D/{deprecated => }/Cluster.cpp | 0 .../present3D/{deprecated => }/Cluster.h | 0 .../present3D/{deprecated => }/ExportHTML.cpp | 24 ++--- .../present3D/{deprecated => }/ExportHTML.h | 2 +- .../{deprecated => }/PointsEventHandler.cpp | 0 .../{deprecated => }/PointsEventHandler.h | 0 .../{deprecated => }/ReadShowFile.cpp | 2 +- .../present3D/{deprecated => }/ReadShowFile.h | 0 .../{deprecated => }/SDLIntegration.cpp | 0 .../{deprecated => }/SDLIntegration.h | 0 .../{deprecated => }/ShowEventHandler.cpp | 0 .../{deprecated => }/ShowEventHandler.h | 0 .../{deprecated => }/SpellChecker.cpp | 0 .../present3D/{deprecated => }/SpellChecker.h | 0 .../present3D/{deprecated => }/present3D.cpp | 20 ++-- .../{deprecated => }/AnimationMaterial | 0 .../{deprecated => }/CompileSlideCallback | 0 .../{deprecated => }/KeyEventHandler | 2 +- .../{deprecated => }/PickEventHandler | 2 +- .../{deprecated => }/PropertyManager | 0 .../{deprecated => }/SlideEventHandler | 4 +- .../{deprecated => }/SlideShowConstructor | 8 +- .../osgPresentation/{deprecated => }/Timeout | 2 +- src/osgPlugins/osc/OscReceivingDevice.cpp | 92 +++++++++---------- src/osgPlugins/osc/ReaderWriterOscDevice.cpp | 2 +- src/osgPlugins/p3d/ReaderWriterP3D.cpp | 2 +- src/osgPlugins/p3d/ReaderWriterPaths.cpp | 4 +- .../{deprecated => }/AnimationMaterial.cpp | 2 +- src/osgPresentation/CMakeLists.txt | 35 ++++--- .../{deprecated => }/CompileSlideCallback.cpp | 2 +- .../{deprecated => }/KeyEventHandler.cpp | 4 +- .../{deprecated => }/PickEventHandler.cpp | 4 +- .../{deprecated => }/PropertyManager.cpp | 2 +- .../{deprecated => }/SlideEventHandler.cpp | 6 +- .../{deprecated => }/SlideShowConstructor.cpp | 8 +- .../{deprecated => }/Timeout.cpp | 2 +- 37 files changed, 127 insertions(+), 130 deletions(-) rename applications/present3D/{deprecated => }/Cluster.cpp (100%) rename applications/present3D/{deprecated => }/Cluster.h (100%) rename applications/present3D/{deprecated => }/ExportHTML.cpp (97%) rename applications/present3D/{deprecated => }/ExportHTML.h (94%) rename applications/present3D/{deprecated => }/PointsEventHandler.cpp (100%) rename applications/present3D/{deprecated => }/PointsEventHandler.h (100%) rename applications/present3D/{deprecated => }/ReadShowFile.cpp (99%) rename applications/present3D/{deprecated => }/ReadShowFile.h (100%) rename applications/present3D/{deprecated => }/SDLIntegration.cpp (100%) rename applications/present3D/{deprecated => }/SDLIntegration.h (100%) rename applications/present3D/{deprecated => }/ShowEventHandler.cpp (100%) rename applications/present3D/{deprecated => }/ShowEventHandler.h (100%) rename applications/present3D/{deprecated => }/SpellChecker.cpp (100%) rename applications/present3D/{deprecated => }/SpellChecker.h (100%) rename applications/present3D/{deprecated => }/present3D.cpp (99%) rename include/osgPresentation/{deprecated => }/AnimationMaterial (100%) rename include/osgPresentation/{deprecated => }/CompileSlideCallback (100%) rename include/osgPresentation/{deprecated => }/KeyEventHandler (97%) rename include/osgPresentation/{deprecated => }/PickEventHandler (97%) rename include/osgPresentation/{deprecated => }/PropertyManager (100%) rename include/osgPresentation/{deprecated => }/SlideEventHandler (99%) rename include/osgPresentation/{deprecated => }/SlideShowConstructor (99%) rename include/osgPresentation/{deprecated => }/Timeout (98%) rename src/osgPresentation/{deprecated => }/AnimationMaterial.cpp (99%) rename src/osgPresentation/{deprecated => }/CompileSlideCallback.cpp (96%) rename src/osgPresentation/{deprecated => }/KeyEventHandler.cpp (97%) rename src/osgPresentation/{deprecated => }/PickEventHandler.cpp (98%) rename src/osgPresentation/{deprecated => }/PropertyManager.cpp (99%) rename src/osgPresentation/{deprecated => }/SlideEventHandler.cpp (99%) rename src/osgPresentation/{deprecated => }/SlideShowConstructor.cpp (99%) rename src/osgPresentation/{deprecated => }/Timeout.cpp (99%) diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt index 494aaa1d5..df859d09e 100644 --- a/applications/present3D/CMakeLists.txt +++ b/applications/present3D/CMakeLists.txt @@ -1,20 +1,20 @@ SET(TARGET_SRC - deprecated/Cluster.cpp - deprecated/ExportHTML.cpp - deprecated/PointsEventHandler.cpp - deprecated/present3D.cpp - deprecated/ReadShowFile.cpp - deprecated/ShowEventHandler.cpp - deprecated/SpellChecker.cpp + Cluster.cpp + ExportHTML.cpp + PointsEventHandler.cpp + present3D.cpp + ReadShowFile.cpp + ShowEventHandler.cpp + SpellChecker.cpp ) SET(TARGET_H - deprecated/Cluster.h - deprecated/ExportHTML.h - deprecated/PointsEventHandler.h - deprecated/ReadShowFile.h - deprecated/ShowEventHandler.h - deprecated/SpellChecker.h + Cluster.h + ExportHTML.h + PointsEventHandler.h + ReadShowFile.h + ShowEventHandler.h + SpellChecker.h ) IF (SDL_FOUND) diff --git a/applications/present3D/deprecated/Cluster.cpp b/applications/present3D/Cluster.cpp similarity index 100% rename from applications/present3D/deprecated/Cluster.cpp rename to applications/present3D/Cluster.cpp diff --git a/applications/present3D/deprecated/Cluster.h b/applications/present3D/Cluster.h similarity index 100% rename from applications/present3D/deprecated/Cluster.h rename to applications/present3D/Cluster.h diff --git a/applications/present3D/deprecated/ExportHTML.cpp b/applications/present3D/ExportHTML.cpp similarity index 97% rename from applications/present3D/deprecated/ExportHTML.cpp rename to applications/present3D/ExportHTML.cpp index 6c17a246f..f573ce041 100644 --- a/applications/present3D/deprecated/ExportHTML.cpp +++ b/applications/present3D/ExportHTML.cpp @@ -1,12 +1,12 @@ -/* -*-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. */ @@ -46,16 +46,16 @@ public: void setSnapImageOnNextFrame(bool flag) { _snapImageOnNextFrame = flag; } bool getSnapImageOnNextFrame() const { return _snapImageOnNextFrame; } - + virtual void operator () (const osg::Camera& camera) const { if (!_snapImageOnNextFrame) return; - + int x = static_cast(camera.getViewport()->x()); int y = static_cast(camera.getViewport()->y()); unsigned int width = static_cast(camera.getViewport()->width()); unsigned int height = static_cast(camera.getViewport()->height()); - + osg::ref_ptr image = new osg::Image; image->readPixels(x,y,width,height, GL_RGB,GL_UNSIGNED_BYTE); @@ -64,16 +64,16 @@ public: { osg::notify(osg::NOTICE) << "Saved screen image to `"<<_filename<<"`"<< std::endl; } - + _snapImageOnNextFrame = false; } protected: - + std::string _filename; mutable bool _snapImageOnNextFrame; - + }; std::string ExportHTML::createFileName(const std::string& basename, unsigned int page, const std::string& ext) @@ -102,7 +102,7 @@ bool ExportHTML::write(osgPresentation::SlideEventHandler* seh, osgViewer::Viewe image_basename = osgDB::getNameLessExtension(filename); image_ext = ".jpg"; } - + std::cout<<"Writing slides to "< sidc = new SnapImageDrawCallback; @@ -169,7 +169,7 @@ bool ExportHTML::write(osgPresentation::SlideEventHandler* seh, osgViewer::Viewe } fout<<""<"<"<"<"< +#include #include class ExportHTML diff --git a/applications/present3D/deprecated/PointsEventHandler.cpp b/applications/present3D/PointsEventHandler.cpp similarity index 100% rename from applications/present3D/deprecated/PointsEventHandler.cpp rename to applications/present3D/PointsEventHandler.cpp diff --git a/applications/present3D/deprecated/PointsEventHandler.h b/applications/present3D/PointsEventHandler.h similarity index 100% rename from applications/present3D/deprecated/PointsEventHandler.h rename to applications/present3D/PointsEventHandler.h diff --git a/applications/present3D/deprecated/ReadShowFile.cpp b/applications/present3D/ReadShowFile.cpp similarity index 99% rename from applications/present3D/deprecated/ReadShowFile.cpp rename to applications/present3D/ReadShowFile.cpp index 15bd9e40c..09115f0e7 100644 --- a/applications/present3D/deprecated/ReadShowFile.cpp +++ b/applications/present3D/ReadShowFile.cpp @@ -13,7 +13,7 @@ #include "ReadShowFile.h" #include "ShowEventHandler.h" -#include +#include #include #include diff --git a/applications/present3D/deprecated/ReadShowFile.h b/applications/present3D/ReadShowFile.h similarity index 100% rename from applications/present3D/deprecated/ReadShowFile.h rename to applications/present3D/ReadShowFile.h diff --git a/applications/present3D/deprecated/SDLIntegration.cpp b/applications/present3D/SDLIntegration.cpp similarity index 100% rename from applications/present3D/deprecated/SDLIntegration.cpp rename to applications/present3D/SDLIntegration.cpp diff --git a/applications/present3D/deprecated/SDLIntegration.h b/applications/present3D/SDLIntegration.h similarity index 100% rename from applications/present3D/deprecated/SDLIntegration.h rename to applications/present3D/SDLIntegration.h diff --git a/applications/present3D/deprecated/ShowEventHandler.cpp b/applications/present3D/ShowEventHandler.cpp similarity index 100% rename from applications/present3D/deprecated/ShowEventHandler.cpp rename to applications/present3D/ShowEventHandler.cpp diff --git a/applications/present3D/deprecated/ShowEventHandler.h b/applications/present3D/ShowEventHandler.h similarity index 100% rename from applications/present3D/deprecated/ShowEventHandler.h rename to applications/present3D/ShowEventHandler.h diff --git a/applications/present3D/deprecated/SpellChecker.cpp b/applications/present3D/SpellChecker.cpp similarity index 100% rename from applications/present3D/deprecated/SpellChecker.cpp rename to applications/present3D/SpellChecker.cpp diff --git a/applications/present3D/deprecated/SpellChecker.h b/applications/present3D/SpellChecker.h similarity index 100% rename from applications/present3D/deprecated/SpellChecker.h rename to applications/present3D/SpellChecker.h diff --git a/applications/present3D/deprecated/present3D.cpp b/applications/present3D/present3D.cpp similarity index 99% rename from applications/present3D/deprecated/present3D.cpp rename to applications/present3D/present3D.cpp index 7e730d739..7315384b7 100644 --- a/applications/present3D/deprecated/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include "ReadShowFile.h" @@ -149,15 +149,15 @@ public: if (_forwardMouseEvents) _device->sendEvent(ea); break; - + default: _device->sendEvent(ea); break; } return false; } - - + + bool handle(osgGA::Event* event, osg::Object* object, osg::NodeVisitor* nv) { if (event->asGUIEventAdapter()) @@ -203,7 +203,7 @@ public: std::cout << "SCROLL: "; break; break; - + default: std::cout << ea.getEventType() << " "; break; @@ -211,8 +211,8 @@ public: std::cout << ea.getX() << "/" << ea.getY() << " " << ea.isMultiTouchEvent() << std::endl; return false; } - - + + bool handle(osgGA::Event* event, osg::Object* object, osg::NodeVisitor* nv) { if (event->asGUIEventAdapter()) @@ -414,7 +414,7 @@ int main( int argc, char **argv ) viewer.readConfiguration(configurationFile); doSetViewer = false; } - + bool forwardMouseEvents = false; if (arguments.read("--forwardMouseEvents")) forwardMouseEvents = true; @@ -498,7 +498,7 @@ int main( int argc, char **argv ) viewer.setCameraManipulator( keyswitchManipulator.get() ); } - + //viewer.getEventHandlers().push_front(new DumpEventHandler()); // add the state manipulator @@ -752,7 +752,7 @@ int main( int argc, char **argv ) osg::ref_ptr cacheAllOption = new osgDB::ReaderWriter::Options; if(suppress_env_tags) cacheAllOption->setPluginStringData("suppressEnvTags", "true"); - + cacheAllOption->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL); osgDB::Registry::instance()->setOptions(cacheAllOption.get()); diff --git a/include/osgPresentation/deprecated/AnimationMaterial b/include/osgPresentation/AnimationMaterial similarity index 100% rename from include/osgPresentation/deprecated/AnimationMaterial rename to include/osgPresentation/AnimationMaterial diff --git a/include/osgPresentation/deprecated/CompileSlideCallback b/include/osgPresentation/CompileSlideCallback similarity index 100% rename from include/osgPresentation/deprecated/CompileSlideCallback rename to include/osgPresentation/CompileSlideCallback diff --git a/include/osgPresentation/deprecated/KeyEventHandler b/include/osgPresentation/KeyEventHandler similarity index 97% rename from include/osgPresentation/deprecated/KeyEventHandler rename to include/osgPresentation/KeyEventHandler index dae5e247e..45618bbdc 100644 --- a/include/osgPresentation/deprecated/KeyEventHandler +++ b/include/osgPresentation/KeyEventHandler @@ -18,7 +18,7 @@ #include -#include +#include namespace osgPresentation { diff --git a/include/osgPresentation/deprecated/PickEventHandler b/include/osgPresentation/PickEventHandler similarity index 97% rename from include/osgPresentation/deprecated/PickEventHandler rename to include/osgPresentation/PickEventHandler index 6f6a31902..caaeb3911 100644 --- a/include/osgPresentation/deprecated/PickEventHandler +++ b/include/osgPresentation/PickEventHandler @@ -18,7 +18,7 @@ #include -#include +#include namespace osgPresentation { diff --git a/include/osgPresentation/deprecated/PropertyManager b/include/osgPresentation/PropertyManager similarity index 100% rename from include/osgPresentation/deprecated/PropertyManager rename to include/osgPresentation/PropertyManager diff --git a/include/osgPresentation/deprecated/SlideEventHandler b/include/osgPresentation/SlideEventHandler similarity index 99% rename from include/osgPresentation/deprecated/SlideEventHandler rename to include/osgPresentation/SlideEventHandler index 38e46226d..d090ccd36 100644 --- a/include/osgPresentation/deprecated/SlideEventHandler +++ b/include/osgPresentation/SlideEventHandler @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include namespace osgPresentation { diff --git a/include/osgPresentation/deprecated/SlideShowConstructor b/include/osgPresentation/SlideShowConstructor similarity index 99% rename from include/osgPresentation/deprecated/SlideShowConstructor rename to include/osgPresentation/SlideShowConstructor index f86df6953..d41911eaf 100644 --- a/include/osgPresentation/deprecated/SlideShowConstructor +++ b/include/osgPresentation/SlideShowConstructor @@ -32,10 +32,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace osgPresentation { diff --git a/include/osgPresentation/deprecated/Timeout b/include/osgPresentation/Timeout similarity index 98% rename from include/osgPresentation/deprecated/Timeout rename to include/osgPresentation/Timeout index d844c9121..3e69d5bd5 100644 --- a/include/osgPresentation/deprecated/Timeout +++ b/include/osgPresentation/Timeout @@ -16,7 +16,7 @@ #include -#include +#include namespace osgPresentation { diff --git a/src/osgPlugins/osc/OscReceivingDevice.cpp b/src/osgPlugins/osc/OscReceivingDevice.cpp index dea76c741..b9c8045e9 100644 --- a/src/osgPlugins/osc/OscReceivingDevice.cpp +++ b/src/osgPlugins/osc/OscReceivingDevice.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "osc/OscPrintReceivedElements.h" #include "osc/OscHostEndianness.h" @@ -720,9 +720,9 @@ public: osg::Vec2f pos, vel; float accel; osgGA::GUIEventAdapter::TouchPhase phase; - + Cursor() : end_point(), id(0), frameId(0), pos(), vel(), accel(), phase(osgGA::GUIEventAdapter::TOUCH_UNKNOWN) {} - + }; struct EndpointData { std::string source; @@ -730,7 +730,7 @@ public: bool mayClearUnhandledPointer; std::set unhandled; }; - + typedef std::map EndpointDataMap; typedef std::map CursorMap; typedef std::map ApplicationCursorMap; @@ -739,38 +739,38 @@ public: : OscReceivingDevice::RequestHandler("/tuio/2Dcur") { } - + virtual void setDevice(OscReceivingDevice* device) { OscReceivingDevice::RequestHandler::setDevice(device); device->addHandleOnCheckEvents(this); } - + virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m, const IpEndpointName& remoteEndPoint) { // std::cout << m << std::endl; - + OpenThreads::ScopedLock lock(_mutex); std::string end_point(' ', IpEndpointName::ADDRESS_AND_PORT_STRING_LENGTH); remoteEndPoint.AddressAndPortAsString(&end_point[0]); - + osc::ReceivedMessageArgumentStream args = m.ArgumentStream(); - - + + const char* str; args >> str; std::string what(str); - + if (what == "source") { args >> str; _endpointData[end_point].source = std::string(str); updateSourceIdMap(_endpointData[end_point].source); - + _endpointData[end_point].unhandled.clear(); _endpointData[end_point].mayClearUnhandledPointer = true; - + return true; } else if (what == "fseq") @@ -782,7 +782,7 @@ public: { std::string source = _endpointData[end_point].source; unsigned int frame_id = _endpointData[end_point].frameId; - + if (what == "alive") { while (!args.Eos()) @@ -801,33 +801,33 @@ public: { _alive[source][id] = Cursor(); } - + Cursor& c(_alive[source][id]); args >> c.pos.x() >> c.pos.y() >> c.vel.x() >> c.vel.y() >> c.accel >> osc::EndMessage; c.frameId = frame_id; c.end_point = end_point; _endpointData[end_point].unhandled.insert(id); - + return true; } } - + return false; } - + virtual void operator()(osgGA::EventQueue* queue) { // dispatch all touchpoints in one GUIEventAdapter - + OpenThreads::ScopedLock lock(_mutex); - + osg::ref_ptr event = NULL; - - + + for(ApplicationCursorMap::iterator i = _alive.begin(); i != _alive.end(); ++i) { const std::string& source(i->first); - + /* std::cout << source << ": "; for(std::set::iterator k = _endpointData[source].unhandled.begin(); @@ -838,13 +838,13 @@ public: } std::cout << std::endl; */ - + // remove all touchpoints which are not transmitted via alive-message, dispatching TOUCH_ENDED - + unsigned int source_id = getSourceId(source); - + std::vector to_delete; - + for(CursorMap::iterator k = i->second.begin(); k != i->second.end(); ++k) { EndpointData& endpoint_data(_endpointData[k->second.end_point]); @@ -852,19 +852,19 @@ public: { continue; }*/ - + //create a unique touchpoint-id unsigned int touch_id = (source_id << 16) + k->first; - + std::set& unhandled(endpoint_data.unhandled); if ((unhandled.find(k->first) == unhandled.end())) { // std::cout << "deleting: " << k->first << " from " << k->second.end_point << std::endl; to_delete.push_back(k->first); - + float win_x = k->second.pos.x(); float win_y = k->second.pos.y(); - + if (!event) event = queue->touchEnded(touch_id, osgGA::GUIEventAdapter::TOUCH_ENDED, win_x, win_y, 1); else @@ -876,30 +876,30 @@ public: { _alive[source].erase(i->second.find(*k)); } - + if (i->second.size() == 0) { // std::cout << "removing endpoint" << source << std::endl; // _alive.erase(_alive.find(source)); } } - - + + // send all alive touchpoints for(ApplicationCursorMap::iterator i = _alive.begin(); i != _alive.end(); ++i) { const std::string& source(i->first); unsigned int source_id = getSourceId(source); - + for(CursorMap::iterator k = i->second.begin(); k != i->second.end(); ++k) { unsigned int id = k->first; unsigned int touch_id = (source_id << 16) + id; - + Cursor& c(k->second); float win_x = c.pos.x(); float win_y = c.pos.y(); - + bool down = c.phase != osgGA::GUIEventAdapter::TOUCH_MOVED && c.phase != osgGA::GUIEventAdapter::TOUCH_STATIONERY; if(!event) { @@ -912,11 +912,11 @@ public: { event->addTouchPoint(touch_id, down ? osgGA::GUIEventAdapter::TOUCH_BEGAN : osgGA::GUIEventAdapter::TOUCH_MOVED, win_x, win_y); } - + c.phase = osgGA::GUIEventAdapter::TOUCH_MOVED; } } - + // adjust time + input range if (event) { @@ -925,19 +925,19 @@ public: event->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS); } } - - + + inline void updateSourceIdMap(const std::string& source) { if (_sourceIdMap.find(source) == _sourceIdMap.end()) _sourceIdMap[source] = _sourceIdMap.size(); } - + inline unsigned int getSourceId(const std::string& source) { return _sourceIdMap[source]; } - + private: EndpointDataMap _endpointData; ApplicationCursorMap _alive; @@ -993,15 +993,15 @@ OscReceivingDevice::OscReceivingDevice(const std::string& server_address, int li addRequestHandler(new OscDevice::PenOrientationRequestHandler()); addRequestHandler(new OscDevice::PenProximityRequestHandler(true)); addRequestHandler(new OscDevice::PenProximityRequestHandler(false)); - + addRequestHandler(new OscDevice::TUIO2DCursorRequestHandler()); addRequestHandler(new OscDevice::StandardRequestHandler("/osg/set_user_value", true)); addRequestHandler(new OscDevice::StandardRequestHandler("", false)); - + // getEventQueue()->setFirstTouchEmulatesMouse(false); - + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_LOW); start(); } diff --git a/src/osgPlugins/osc/ReaderWriterOscDevice.cpp b/src/osgPlugins/osc/ReaderWriterOscDevice.cpp index 6069f649f..cb312e39c 100644 --- a/src/osgPlugins/osc/ReaderWriterOscDevice.cpp +++ b/src/osgPlugins/osc/ReaderWriterOscDevice.cpp @@ -52,7 +52,7 @@ #include #include "OscSendingDevice.hpp" #include "OscReceivingDevice.hpp" -#include +#include diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp index ad6420deb..dd01e10b6 100644 --- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp +++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/src/osgPlugins/p3d/ReaderWriterPaths.cpp b/src/osgPlugins/p3d/ReaderWriterPaths.cpp index 95f265d9d..4a77a8b27 100644 --- a/src/osgPlugins/p3d/ReaderWriterPaths.cpp +++ b/src/osgPlugins/p3d/ReaderWriterPaths.cpp @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/osgPresentation/deprecated/AnimationMaterial.cpp b/src/osgPresentation/AnimationMaterial.cpp similarity index 99% rename from src/osgPresentation/deprecated/AnimationMaterial.cpp rename to src/osgPresentation/AnimationMaterial.cpp index d1de72787..b09dffd35 100644 --- a/src/osgPresentation/deprecated/AnimationMaterial.cpp +++ b/src/osgPresentation/AnimationMaterial.cpp @@ -10,7 +10,7 @@ * include LICENSE.txt for more details. */ -#include +#include #include #include diff --git a/src/osgPresentation/CMakeLists.txt b/src/osgPresentation/CMakeLists.txt index 8aa5529b6..f7a1936f4 100644 --- a/src/osgPresentation/CMakeLists.txt +++ b/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} ) diff --git a/src/osgPresentation/deprecated/CompileSlideCallback.cpp b/src/osgPresentation/CompileSlideCallback.cpp similarity index 96% rename from src/osgPresentation/deprecated/CompileSlideCallback.cpp rename to src/osgPresentation/CompileSlideCallback.cpp index 647e7245a..58db7f22a 100644 --- a/src/osgPresentation/deprecated/CompileSlideCallback.cpp +++ b/src/osgPresentation/CompileSlideCallback.cpp @@ -10,7 +10,7 @@ * include LICENSE.txt for more details. */ -#include +#include #include diff --git a/src/osgPresentation/deprecated/KeyEventHandler.cpp b/src/osgPresentation/KeyEventHandler.cpp similarity index 97% rename from src/osgPresentation/deprecated/KeyEventHandler.cpp rename to src/osgPresentation/KeyEventHandler.cpp index 904275c5b..52a97026c 100644 --- a/src/osgPresentation/deprecated/KeyEventHandler.cpp +++ b/src/osgPresentation/KeyEventHandler.cpp @@ -10,8 +10,8 @@ * include LICENSE.txt for more details. */ -#include -#include +#include +#include #include #include diff --git a/src/osgPresentation/deprecated/PickEventHandler.cpp b/src/osgPresentation/PickEventHandler.cpp similarity index 98% rename from src/osgPresentation/deprecated/PickEventHandler.cpp rename to src/osgPresentation/PickEventHandler.cpp index 05265347c..ddf24b17e 100644 --- a/src/osgPresentation/deprecated/PickEventHandler.cpp +++ b/src/osgPresentation/PickEventHandler.cpp @@ -10,8 +10,8 @@ * include LICENSE.txt for more details. */ -#include -#include +#include +#include #include #include diff --git a/src/osgPresentation/deprecated/PropertyManager.cpp b/src/osgPresentation/PropertyManager.cpp similarity index 99% rename from src/osgPresentation/deprecated/PropertyManager.cpp rename to src/osgPresentation/PropertyManager.cpp index 587fcddc4..cdf7bb5cf 100644 --- a/src/osgPresentation/deprecated/PropertyManager.cpp +++ b/src/osgPresentation/PropertyManager.cpp @@ -10,7 +10,7 @@ * include LICENSE.txt for more details. */ -#include +#include #include using namespace osgPresentation; diff --git a/src/osgPresentation/deprecated/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp similarity index 99% rename from src/osgPresentation/deprecated/SlideEventHandler.cpp rename to src/osgPresentation/SlideEventHandler.cpp index 843476c42..b7f47fbc7 100644 --- a/src/osgPresentation/deprecated/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -10,9 +10,9 @@ * include LICENSE.txt for more details. */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/osgPresentation/deprecated/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp similarity index 99% rename from src/osgPresentation/deprecated/SlideShowConstructor.cpp rename to src/osgPresentation/SlideShowConstructor.cpp index 391067721..ca7461d74 100644 --- a/src/osgPresentation/deprecated/SlideShowConstructor.cpp +++ b/src/osgPresentation/SlideShowConstructor.cpp @@ -10,10 +10,10 @@ * include LICENSE.txt for more details. */ -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/osgPresentation/deprecated/Timeout.cpp b/src/osgPresentation/Timeout.cpp similarity index 99% rename from src/osgPresentation/deprecated/Timeout.cpp rename to src/osgPresentation/Timeout.cpp index c9d50220f..1beaa8c21 100644 --- a/src/osgPresentation/deprecated/Timeout.cpp +++ b/src/osgPresentation/Timeout.cpp @@ -11,7 +11,7 @@ * OpenSceneGraph Public License for more details. */ -#include +#include #include #include