Changeset 11289

Timestamp:

03/25/10 15:14:46 (3 years ago)

Author:

robert

Message:

From Stephan Huber, "attached you'll find a small enhancement for GraphicsWindowCocoa?. My
submision adds a getter for the pixel-format. I need this for some
custom software so I can integrate CoreVideo?-playback with osg.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgViewer/api/Cocoa/GraphicsWindowCocoa (modified) (4 diffs)
• src/osgViewer/GraphicsWindowCocoa.mm (modified) (2 diffs)

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

@@ -26 +26 @@
 @class GraphicsWindowCocoaGLView;
 @class NSOpenGLContext;
+@class NSOpenGLPixelFormat;
 @class NSWindow;
 @class NSView;
@@ -32 +33 @@
 class GraphicsWindowCocoaWindow;
 class NSOpenGLContext;
+class NSOpenGLPixelFormat;
 class NSWindow;
 class NSView;
@@ -159 +161 @@
         NSOpenGLContext* getContext() { return _context; }
         GraphicsWindowCocoaWindow* getWindow() { return _window; }
+        NSOpenGLPixelFormat* getPixelFormat() { return _pixelformat; }
                 
         void setVSync(bool f);
@@ -191 +194 @@
         GraphicsWindowCocoaGLView*      _view;
         NSOpenGLContext*                _context;
+        NSOpenGLPixelFormat*            _pixelformat;
         bool                            _updateContext;
 };

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -858 +858 @@
     _context = NULL;
     _window = NULL;
+    _pixelformat = NULL;
+    
     _updateContext = false;
     _valid = _initialized = true;
@@ -978 +980 @@
     }
     
-    NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
-    _context = [[NSOpenGLContext alloc] initWithFormat: pixelformat shareContext: sharedContext];
+    _pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
+    _context = [[NSOpenGLContext alloc] initWithFormat: _pixelformat shareContext: sharedContext];
     
     if (!_context) {