Changeset 10208 for OpenSceneGraph/trunk/include/osgViewer/api/Cocoa/GraphicsWindowCocoa

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/include/osgViewer/api/Cocoa/GraphicsWindowCocoa (modified) (6 diffs)

OpenSceneGraph/trunk/include/osgViewer/api/Cocoa/GraphicsWindowCocoa

@@ -24 +24 @@
 #ifdef __OBJC__
 @class GraphicsWindowCocoaWindow;
+@class GraphicsWindowCocoaGLView;
 @class NSOpenGLContext;
 @class NSWindow;
+@class NSView;
 #else
+class GraphicsWindowCocoaGLView;
 class GraphicsWindowCocoaWindow;
 class NSOpenGLContext;
 class NSWindow;
+class NSView;
 #endif
 
@@ -42 +46 @@
 {
     public:
-        class Implementation;
+    class Implementation;
 
         GraphicsWindowCocoa(osg::GraphicsContext::Traits* traits):
@@ -48 +52 @@
             _initialized(false),
             _realized(false),
+            _closeRequested(false),
+            _checkForEvents(true),
             _ownsWindow(true),
-            _currentCursor(RightArrowCursor)
+            _currentCursor(RightArrowCursor),
+            _window(NULL),
+            _context(NULL)
         {
             _traits = traits;
@@ -122 +130 @@
         {
             public:
-                WindowData(NSWindow* window)
-                                :       _window(window) 
-                                {
-                                }
-                
-                inline NSWindow* getNativeWindowRef() { return _window; }
-                                
+                enum Options { CreateOnlyView = 1, CheckForEvents = 2, PoseAsStandaloneApp = 4};
+                WindowData(unsigned int options)
+                :    _createOnlyView(options & CreateOnlyView),
+                    _checkForEvents(options & CheckForEvents),
+                    _poseAsStandaloneApp(options & PoseAsStandaloneApp),
+                    _view(NULL)
+                {
+                }
+                            
+                inline NSView* getCreatedNSView() { return _view; }
+                bool createOnlyView() const { return _createOnlyView; }
+                bool checkForEvents() const { return _checkForEvents; }
+                bool poseAsStandaloneApp() const { return _poseAsStandaloneApp; }
+            
+            protected:
+                inline void setCreatedNSView(NSView* view) { _view = view; }
+            
             private:
-                NSWindow*    _window;
-                bool         _installEventHandler;
+                bool         _createOnlyView, _checkForEvents, _poseAsStandaloneApp;
+                NSView*         _view;
             
+            friend class GraphicsWindowCocoa;
+
         };
         
@@ -139 +159 @@
                 
         void setVSync(bool f);
-                
-                /** adapts a resize / move of the window, coords in global screen space */
-                void adaptResize(int x, int y, int w, int h);
+        
+        /** adapts a resize / move of the window, coords in global screen space */
+        void adaptResize(int x, int y, int w, int h);
         
     protected:
@@ -158 +178 @@
         bool            _realized;
         bool            _useWindowDecoration;
-        bool            _ownsWindow;
 
-        
+    
          
     private:        
        
         
-        bool                            _closeRequested;
-        MouseCursor                     _currentCursor;
-                GraphicsWindowCocoaWindow* _window;
-                NSOpenGLContext*        _context;
+        bool                _closeRequested, _checkForEvents,_ownsWindow;
+        MouseCursor            _currentCursor;
+        GraphicsWindowCocoaWindow* _window;
+        GraphicsWindowCocoaGLView*    _view;
+        NSOpenGLContext*    _context;
 };