Changeset 10208 for OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.h

Timestamp:

05/14/09 17:34:15 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "attached you'll find some bugfixes and enhancements for the Cocoa
implementation of GraoicsWindowCocoa?:

Enhancements/Bugfixes:

+ now it's possible to integrate osgViewer better into existing
cocoa-applications:
* create one or more NSOpenGLView(s) and add these to your window(s)
* create one or more NSWindows
* disable the integrated event-polling of osgViewer, and let the work be
done by Cocoa / NSApplicationRun. You'll have to run the osgViewer's
runloop in a separate thread

+ missing menu-event-handling implemented

+ added NSAutoReleasePools where necessary, this fixes some memory-leaks
+ fixed some crashes and thread-issues"

Files:

• OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.h (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.h

@@ -79 +79 @@
 
         virtual void enumerateScreenSettings(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, osg::GraphicsContext::ScreenSettingsList & resolutionList);
+        
+        virtual bool setScreenSettings (const osg::GraphicsContext::ScreenIdentifier & si, const osg::GraphicsContext::ScreenSettings & settings);
 
         /** return the top left coord of a specific screen in global screen space */
         void getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y);
 
-        /** implementation of setScreenResolution */
-        virtual bool setScreenResolution(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height) ;
-
-        /** implementation of setScreenRefreshRate */
-        virtual bool setScreenRefreshRate(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate);
-
+        
 
         /** returns screen-ndx containing rect x,y,w,h */
@@ -94 +91 @@
     
     protected:
+    
+        /** implementation of setScreenResolution */
+        bool setScreenResolutionImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height) ;
+
+        /** implementation of setScreenRefreshRate */
+        bool setScreenRefreshRateImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate);
+
     
         template<class PixelBufferImplementation, class GraphicsWindowImplementation>