Changeset 13172

Timestamp:

05/23/13 14:29:55 (62 minutes ago)

Author:

robert

Message:

Refactored the idle mechanism to fix problems with the vnc thread going idle when it shouldn't have.

Location:

OpenSceneGraph/trunk

Files:

• include/osgDB/ReadFile (modified) (1 diff)
• include/osgGA/Device (added)
• include/osgViewer/View (modified) (3 diffs)
• include/osgViewer/ViewerBase (modified) (1 diff)
• src/osgGA/CMakeLists.txt (modified) (2 diffs)
• src/osgGA/Device.cpp (added)
• src/osgPlugins/CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/sdl (added)
• src/osgPlugins/sdl/CMakeLists.txt (added)
• src/osgPlugins/sdl/JoystickDevice.cpp (added)
• src/osgPlugins/sdl/JoystickDevice.h (added)
• src/osgPlugins/sdl/ReaderWriterSDL.cpp (added)
• src/osgViewer/CompositeViewer.cpp (modified) (2 diffs)
• src/osgViewer/View.cpp (modified) (1 diff)
• src/osgViewer/Viewer.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgDB/ReadFile

@@ -44 +44 @@
 inline osg::Object* readObjectFile(const std::string& filename)
 {
-    return readObjectFile(filename,Registry::instance()->getOptions());
-}
+    return readObjectFile(filename, Registry::instance()->getOptions());
+}
+
+template<typename T>
+inline T* readFile(const std::string& filename, const Options* options)
+{
+    osg::ref_ptr<osg::Object> object = readObjectFile(filename, options);
+    osg::ref_ptr<T> t = dynamic_cast<T*>(object.get());
+    object = 0;    
+    return t.release();
+}
+
+template<typename T>
+inline T* readFile(const std::string& filename)
+{
+    return readFile<T>(filename, Registry::instance()->getOptions());
+}
+
 
 /** Read an osg::Image from file.

OpenSceneGraph/trunk/include/osgViewer/View

@@ -25 +25 @@
 #include <osgGA/EventVisitor>
 #include <osgGA/EventQueue>
+#include <osgGA/Device>
 
 #include <osgViewer/Scene>
@@ -109 +110 @@
         const osgDB::ImagePager* getImagePager() const;
 
+       
+        /** Add a Device.
+         * The Device is polled on each new frame via it's Device::checkEvents() method and any events generated then collected via Device::getEventQueue()*/
+        void addDevice(osgGA::Device* eventSource);
+
+        /** Remove a Device. /*/
+        void removeDevice(osgGA::Device* eventSource);
+
+        typedef std::vector< osg::ref_ptr<osgGA::Device> > Devices;
+
+        Devices& getDevices() { return _eventSources; }
+        const Devices& getDevices() const { return _eventSources; }
+
 
         /* Set the EventQueue that the View uses to integrate external non window related events.*/
@@ -251 +265 @@
         osg::Timer_t                            _startTick;
 
+        Devices                            _eventSources;
+
         osg::ref_ptr<osgViewer::Scene>          _scene;
         osg::ref_ptr<osgGA::EventQueue>         _eventQueue;

OpenSceneGraph/trunk/include/osgViewer/ViewerBase

@@ -118 +118 @@
 
 
-
         /** Set the done flag to signal the viewer's work is done and should exit the frame loop.*/
         void setDone(bool done) { _done = done; }

OpenSceneGraph/trunk/src/osgGA/CMakeLists.txt

@@ -11 +11 @@
     ${HEADER_PATH}/AnimationPathManipulator
     ${HEADER_PATH}/DriveManipulator
+    ${HEADER_PATH}/Device
     ${HEADER_PATH}/EventQueue
     ${HEADER_PATH}/EventVisitor
@@ -37 +38 @@
     AnimationPathManipulator.cpp
     DriveManipulator.cpp
+    Device.cpp
     EventQueue.cpp
     EventVisitor.cpp

OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

@@ -257 +257 @@
 ADD_SUBDIRECTORY(pvr)
 
+####################################################
+#
+# Device integration plugins
+#
+IF   (SDL_FOUND)
+    ADD_SUBDIRECTORY(sdl)
+ENDIF(SDL_FOUND)
+
+
 ##########to get all the variables of Cmake
 #GET_CMAKE_PROPERTY(MYVARS VARIABLES)

OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

@@ -736 +736 @@
     }
 
+    // get events from all windows attached to Viewer.
     for(Contexts::iterator citr = contexts.begin();
         citr != contexts.end();
@@ -926 +927 @@
     {
         View* view = vitr->get();
+
+        // get events from user Devices attached to Viewer.
+        for(osgViewer::View::Devices::iterator eitr = view->getDevices().begin();
+            eitr != view->getDevices().end();
+            ++eitr)
+        {
+            osgGA::Device* es = eitr->get();
+            es->checkEvents();
+
+            // open question, will we need to reproject mouse coordinates into current view's coordinate frame as is down for GraphicsWindow provided events?
+            // for now assume now and just get the events directly without any reprojection.
+            es->getEventQueue()->takeEvents(viewEventsMap[view], cutOffTime);
+        }
+
         view->getEventQueue()->takeEvents(viewEventsMap[view], cutOffTime);
     }

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -2218 +2218 @@
 
 
+void View::addDevice(osgGA::Device* eventSource)
+{
+    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource );
+    if (itr==_eventSources.end())
+    {
+        _eventSources.push_back(eventSource);
+    }
+}
+
+void View::removeDevice(osgGA::Device* eventSource)
+{
+    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource );
+    if (itr!=_eventSources.end())
+    {
+        _eventSources.erase(itr);
+    }
+}

OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

@@ -646 +646 @@
 
 
+    // get events from user Devices attached to Viewer.
+    for(Devices::iterator eitr = _eventSources.begin();
+        eitr != _eventSources.end();
+        ++eitr)
+    {
+        osgGA::Device* es = eitr->get();
+        es->checkEvents();
+
+        // open question, will we need to reproject mouse coordinates into current view's coordinate frame as is down for GraphicsWindow provided events?
+        // for now assume now and just get the events directly without any reprojection.
+        es->getEventQueue()->takeEvents(events, cutOffTime);
+    }
+
+    // get events from all windows attached to Viewer.
     for(Contexts::iterator citr = contexts.begin();
         citr != contexts.end();