Changeset 10887

Timestamp:

12/10/09 18:52:40 (4 years ago)

Author:

robert

Message:

From Stephan Huber, "attached you'll find the missing GraphicsHandleCocoa?-implementation."

Location:

OpenSceneGraph/trunk

Files:

• include/osgViewer/api/Cocoa/GraphicsHandleCocoa (added)
• include/osgViewer/api/Cocoa/GraphicsWindowCocoa (modified) (4 diffs)
• include/osgViewer/api/Cocoa/PixelBufferCocoa (modified) (2 diffs)
• src/osgViewer/CMakeLists.txt (modified) (1 diff)
• src/osgViewer/GraphicsWindowCocoa.mm (modified) (1 diff)
• src/osgViewer/PixelBufferCocoa.mm (modified) (9 diffs)

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

@@ -37 +37 @@
 
 #include <osgViewer/GraphicsWindow>
+#include <osgViewer/api/Cocoa/GraphicsHandleCocoa>
 
 // we may not include any cocoa-header here, because this will pollute the name-sapce and tend to compile-errors
@@ -43 +44 @@
 {
 
-class GraphicsWindowCocoa : public osgViewer::GraphicsWindow
+class GraphicsWindowCocoa : public osgViewer::GraphicsWindow, public osgViewer::GraphicsHandleCocoa
 {
     public:
@@ -49 +50 @@
 
         GraphicsWindowCocoa(osg::GraphicsContext::Traits* traits):
+            osgViewer::GraphicsWindow(),
+            osgViewer::GraphicsHandleCocoa(),
             _valid(false),
             _initialized(false),
@@ -56 +59 @@
             _ownsWindow(true),
             _currentCursor(RightArrowCursor),
-            _window(NULL),
-            _context(NULL)
+            _window(NULL)
         {
             _traits = traits;

OpenSceneGraph/trunk/include/osgViewer/api/Cocoa/PixelBufferCocoa

@@ -21 +21 @@
 #include <osg/GraphicsContext>
 #include <osgViewer/Export>
-
-
-#ifdef __OBJC__
-@class NSOpenGLContext;
-#else
-class NSOpenGLContext;
-#endif
+#include <osgViewer/api/Cocoa/GraphicsHandleCocoa>
 
 namespace osgViewer
 {
 
-class OSGVIEWER_EXPORT PixelBufferCocoa : public osg::GraphicsContext
+class OSGVIEWER_EXPORT PixelBufferCocoa : public osg::GraphicsContext, public osgViewer::GraphicsHandleCocoa
 {
     public:
@@ -38 +32 @@
 
         PixelBufferCocoa(osg::GraphicsContext::Traits* traits):
+            osg::GraphicsContext(),
+            osgViewer::GraphicsHandleCocoa(),
             _valid(false),
             _initialized(false),

OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

@@ -73 +73 @@
         ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)
         SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} 
+            ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa
             ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
             ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -972 +972 @@
     NSOpenGLContext* sharedContext = NULL;
     
-    GraphicsWindowCocoa* graphicsWindowCocoa = dynamic_cast<GraphicsWindowCocoa*>(_traits->sharedContext);
-    if (graphicsWindowCocoa) 
-    {
-        sharedContext = graphicsWindowCocoa->getContext();
-    }
-    else
-    {
-        PixelBufferCocoa* pixelbuffer = dynamic_cast<PixelBufferCocoa*>(_traits->sharedContext);
-        if (pixelbuffer) {
-            sharedContext = pixelbuffer->getContext();
-        }
+    GraphicsHandleCocoa* graphicsHandleCocoa = dynamic_cast<GraphicsHandleCocoa*>(_traits->sharedContext);
+    if (graphicsHandleCocoa) 
+    {
+        sharedContext = graphicsHandleCocoa->getNSOpenGLContext();
     }
     

OpenSceneGraph/trunk/src/osgViewer/PixelBufferCocoa.mm

@@ -18 +18 @@
 void PixelBufferCocoa::init()
 {
-        //std::cout << "PixelBufferCocoa :: init not implemented yet " << std::endl;
-        
-        _valid = _initialized = true;    
-        
+    //std::cout << "PixelBufferCocoa :: init not implemented yet " << std::endl;
+    
+    _valid = _initialized = true;    
+    
 
 }
@@ -27 +27 @@
 bool PixelBufferCocoa::realizeImplementation() 
 {
-        std::cout << "PixelBufferCocoa :: realizeImplementation not implemented yet " << std::endl;
-        
+    std::cout << "PixelBufferCocoa :: realizeImplementation not implemented yet " << std::endl;
+    
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-         
-        NSOpenGLPixelFormatAttribute attr[32];
+         
+    NSOpenGLPixelFormatAttribute attr[32];
     int i = 0;
     
@@ -66 +66 @@
     NSOpenGLContext* sharedContext = NULL;
     
-    GraphicsWindowCocoa* graphicsWindowCocoa = dynamic_cast<GraphicsWindowCocoa*>(_traits->sharedContext);
-    if (graphicsWindowCocoa) 
+    GraphicsHandleCocoa* graphicsHandleCocoa = dynamic_cast<GraphicsHandleCocoa*>(_traits->sharedContext);
+    if (graphicsHandleCocoa) 
     {
-        sharedContext = graphicsWindowCocoa->getContext();
+        sharedContext = graphicsHandleCocoa->getNSOpenGLContext();
     }
-    else
-    {
-        PixelBufferCocoa* pixelbuffer = dynamic_cast<PixelBufferCocoa*>(_traits->sharedContext);
-        if (pixelbuffer) {
-            sharedContext = pixelbuffer->getContext();
-        }
-    }
-        
-        NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
+    
+    
+    NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
     _context = [[NSOpenGLContext alloc] initWithFormat: pixelformat shareContext: sharedContext];
     NSOpenGLPixelBuffer* pbuffer = [[NSOpenGLPixelBuffer alloc] initWithTextureTarget: _traits->target textureInternalFormat: _traits->format textureMaxMipMapLevel: _traits->level pixelsWide: _traits->width pixelsHigh: _traits->height];
@@ -94 +88 @@
 void PixelBufferCocoa::closeImplementation()
 {
-        _realized = false;
+    _realized = false;
     
     
@@ -104 +98 @@
 bool PixelBufferCocoa::makeCurrentImplementation()
 {
-        // osg::notify(osg::INFO) << "PixelBufferCocoa::makeCurrentImplementation" << std::endl;
+    // osg::notify(osg::INFO) << "PixelBufferCocoa::makeCurrentImplementation" << std::endl;
     
     [_context makeCurrentContext];
-        return true;
+    return true;
 }
 
@@ -114 +108 @@
 bool PixelBufferCocoa::makeContextCurrentImplementation(osg::GraphicsContext* readContext)
 {
-        return makeCurrentImplementation();
+    return makeCurrentImplementation();
 }
 
@@ -120 +114 @@
 bool PixelBufferCocoa::releaseContextImplementation()
 {
-        // osg::notify(osg::INFO) << "PixelBufferCocoa::releaseContextImplementation" << std::endl;
+    // osg::notify(osg::INFO) << "PixelBufferCocoa::releaseContextImplementation" << std::endl;
     
     [NSOpenGLContext clearCurrentContext];
@@ -129 +123 @@
 void PixelBufferCocoa::bindPBufferToTextureImplementation( GLenum buffer )
 {
-        std::cout << "PixelBufferCocoa :: bindPBufferToTextureImplementation not implemented yet " << std::endl;
+    std::cout << "PixelBufferCocoa :: bindPBufferToTextureImplementation not implemented yet " << std::endl;
 }
 
@@ -135 +129 @@
 void PixelBufferCocoa::swapBuffersImplementation()
 {
-        osg::notify(osg::INFO) << "PixelBufferCocoa::swapBuffersImplementation" << std::endl;
+    osg::notify(osg::INFO) << "PixelBufferCocoa::swapBuffersImplementation" << std::endl;
     [_context flushBuffer];
 }
 
  PixelBufferCocoa::~PixelBufferCocoa()
- {      
+ {    
     [_context release];
  }