Changeset 11357 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

Timestamp:

04/21/10 19:16:13 (3 years ago)

Author:

robert

Message:

From Ulrich Hertlien with little bits from Robert Osfield and Chris Hanson, added provisionl support for controlling sync to vblank.

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp (modified) (24 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -346 +346 @@
 bool GraphicsWindowCarbon::realizeImplementation()
 {
-    
     if (!_initialized) init();
     if (!_initialized) return false;
     if (!_traits) return false;
-    
-    OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: realizeIMplementation" << std::endl;
+ 
+    osg::notify(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation" << std::endl;
     
     setWindowDecoration(_traits->windowDecoration);
@@ -358 +357 @@
     // move the window to the right screen
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
-    int screenLeft(0), screenTop(0);
+    int screenLeft = 0, screenTop = 0;
     if (wsi) 
     {
@@ -378 +377 @@
 
         if (err) {
-            OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation() failed creating a window: " << err << std::endl;
+            OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation: failed to create window: " << err << std::endl;
             return false;
         } else {
-            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation() - window created with bounds(" << bounds.top << ", " << bounds.left << ", " << bounds.bottom << ", " << bounds.right << ")" << std::endl;
+            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation: window created with bounds(" << bounds.top << ", " << bounds.left << ", " << bounds.bottom << ", " << bounds.right << ")" << std::endl;
         }
     }
@@ -408 +407 @@
 
     _context = aglCreateContext (_pixelFormat, sharedContextCarbon);
-
-
     if (!_context) {
-        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation failed creating a context: " << aglGetError() << std::endl;
+        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::realizeImplementation: failed to create context: " << aglGetError() << std::endl;
         return false;
     }
@@ -442 +439 @@
         if (cgerr != kCGLNoError )
         {
-            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon:: Multi-threaded OpenGL Execution not available" << std::endl;
+            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::realizeImplementation: multi-threaded OpenGL Execution not available" << std::endl;
         } 
     }
-    
+
     InitCursor();
-    
-    //enable vsync
+
+    // enable vsync
     if (_traits->vsync) {
         GLint swap = 1;
         aglSetInteger (_context, AGL_SWAP_INTERVAL, &swap);
     }
+    _currentVSync = _traits->vsync;
 
     _realized = true;
@@ -486 +484 @@
     _valid = false;
     _realized = false;
-    
+
     // there's a possibility that the MenubarController is destructed already, so prevent a crash:
     MenubarController* mbc = MenubarController::instance();
@@ -496 +494 @@
         _pixelFormat = NULL;
     }
-    
+ 
     if (_context) 
     {
@@ -504 +502 @@
         _context = NULL;
     }
-    
+ 
     if (_ownsWindow && _window) DisposeWindow(_window);
     _window = NULL;
@@ -513 +511 @@
 void GraphicsWindowCarbon::swapBuffersImplementation()
 {
+    // check for vsync change
+    if (_traits.valid() && _traits->vsync != _currentVSync)
+    {
+        const bool on = _traits->vsync;
+        GLint swap = (on ? 1 : 0);
+        aglSetInteger (_context, AGL_SWAP_INTERVAL, &swap);
+        osg::notify(osg::NOTICE) << "GraphicsWindowCarbon: VSync=" << (on ? "on" : "off") << std::endl;
+        _currentVSync = on;
+    }
+
     aglSwapBuffers(_context);
 }
@@ -567 +575 @@
         else if (mouseButton==2) mouseButton = 3;
         
-        // check tablet pointer device and map it to a musebutton
+        // check tablet pointer device and map it to a mouse button
         TabletProximityRec    theTabletRecord;    // The Tablet Proximity Record
         // Extract the Tablet Proximity reccord from the event.
@@ -586 +594 @@
                     break;
                     
-                case 3: //eraser
+                case 3: // eraser
                     pointerType = osgGA::GUIEventAdapter::ERASER;
                     break;
@@ -616 +624 @@
             case kEventMouseDown:
                 {
-                    float mx =wheresMyMouse.h;
-                    float my =wheresMyMouse.v;
+                    float mx = wheresMyMouse.h;
+                    float my = wheresMyMouse.v;
                     transformMouseXY(mx, my);
                     
@@ -642 +650 @@
             case kEventMouseUp:
                 {
-                    float mx =wheresMyMouse.h;
-                    float my =wheresMyMouse.v;
+                    float mx = wheresMyMouse.h;
+                    float my = wheresMyMouse.v;
                     transformMouseXY(mx, my);
                     if (lastEmulatedMouseButton > 0) {
@@ -663 +671 @@
                     
                         getEventQueue()->penPressure(theTabletRecord.pressure / 65535.0f);
-            
                     }
                     
-                    float mx =wheresMyMouse.h;
-                    float my =wheresMyMouse.v;
+                    float mx = wheresMyMouse.h;
+                    float my = wheresMyMouse.v;
                     transformMouseXY(mx, my);
                     getEventQueue()->mouseMotion(mx, my);
@@ -706 +713 @@
                 {
                     enum
-                        {
+                    {
                         kEventParamMouseWheelSmoothVerticalDelta       = 'saxy', // typeSInt32
                         kEventParamMouseWheelSmoothHorizontalDelta     = 'saxx' // typeSInt32
-                        };
+                    };
                     
                     SInt32 scroll_delta_x = 0;
@@ -716 +723 @@
                     err = GetEventParameter( theEvent, kEventParamMouseWheelSmoothVerticalDelta, typeLongInteger, NULL, sizeof(scroll_delta_y), NULL, &scroll_delta_y );
                     err = GetEventParameter( theEvent, kEventParamMouseWheelSmoothHorizontalDelta, typeLongInteger, NULL, sizeof(scroll_delta_x), NULL, &scroll_delta_x );
-                    
+
                     if ((scroll_delta_x != 0) || (scroll_delta_y != 0)) {
                         getEventQueue()->mouseScroll2D( scroll_delta_x, scroll_delta_y);
@@ -722 +729 @@
                 }
                 break;
-            
+ 
             default:
                 return false;
@@ -760 +767 @@
         case kEventRawKeyRepeat:
         {
+            //osg::notify(osg::INFO) << "GraphicsWindowCarbon::keyPress Up" << std::endl;
             //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
-            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl;
+            //OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl;
             getEventQueue()->keyPress(keychar);
             break;
@@ -768 +776 @@
         case kEventRawKeyUp:
         {                 
-            OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl;
+            //OSG_NOTIFY(osg::INFO) << "GraphicsWindowCarbon::keyPress" << std::endl;
             //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
             getEventQueue()->keyRelease(keychar);
@@ -941 +949 @@
 {
    // TODO: implement
-   OSG_NOTIFY(osg::ALWAYS) << "GraphicsWindowCarbon::grabFocusIfPointerInWindow" << std::endl;
+   OSG_NOTIFY(osg::ALWAYS) << "GraphicsWindowCarbon::grabFocusIfPointerInWindow: not implemented" << std::endl;
 }
 
@@ -947 +955 @@
 void GraphicsWindowCarbon::useCursor(bool cursorOn)
 {
-
     if (_traits.valid())
         _traits->useCursor = cursorOn;
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     if (wsi == NULL) {
-        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl;
+        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor: could not get OSXCarbonWindowingSystemInterface" << std::endl;
         return;
     }
     
     CGDirectDisplayID displayId = wsi->getDisplayID((*_traits));
-    CGDisplayErr err = kCGErrorSuccess;
-    switch (cursorOn)
-    {
-        case true:
-            err = CGDisplayShowCursor(displayId);
-            break;
-        case false:
-            err = CGDisplayHideCursor(displayId);
-            break;
-    }
+    CGDisplayErr err = (cursorOn ? CGDisplayShowCursor(displayId) : CGDisplayHideCursor(displayId));
     if (err != kCGErrorSuccess) {
-        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor failed with " << err << std::endl;
+        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor: failed with " << err << std::endl;
     }
 }
@@ -976 +974 @@
 void GraphicsWindowCarbon::setCursor(MouseCursor mouseCursor)
 {
-    UInt32 cursor;
     if (_currentCursor == mouseCursor)
       return;
+
+    UInt32 cursor;
     switch (mouseCursor) 
     {
@@ -1010 +1009 @@
 }
 
+void GraphicsWindowCarbon::setSyncToVBlank(bool on)
+{
+    if (_traits.valid()) {
+        _traits->vsync = on;
+    }
+}
 
 void GraphicsWindowCarbon::setWindowName (const std::string& name) 
@@ -1027 +1032 @@
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     if (wsi == NULL) {
-        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl;
+        OSG_NOTIFY(osg::WARN) << "GraphicsWindowCarbon::useCursor: could not get OSXCarbonWindowingSystemInterface" << std::endl;
         return;
     }