Changeset 20925

Show
Ignore:
Timestamp:
11/18/07 03:45:25 (11 months ago)
Author:
patrick
Message:

Cocoa OpenGL windows now update their input area size correctly. This uses
the Gadgeteer 1.3.15 API. Updated the VR Juggler version to 2.3.16.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/vrjuggler/ChangeLog

    r20872 r20925  
    11DATE        AUTHOR      CHANGE 
    22----------- ----------- ------------------------------------------------------- 
     3Nov-18-2007 patrick     Updated for Gadgeteer 1.3.15. Now, Cocoa OpenGL windows 
     4                        update their input area size correctly. 
     5                        NEW VERSION: 2.3.16 
    36Sep-26-2007 patrick     Fixed crash-on-exit problems with Sonix. 
    47                        NEW VERSION: 2.3.15 

  • juggler/trunk/modules/vrjuggler/VERSION

    r20872 r20925  
     12.3.16-0 @11/18/2007 09:45:00 UTC@ 
    122.3.15-0 @09/26/2007 19:55:00 UTC@ 
    232.3.14-0 @09/19/2007 19:10:00 UTC@ 

  • juggler/trunk/modules/vrjuggler/configure.ac

    r20872 r20925  
    176176JCCL_PATH_CXX([1.1.5], , 
    177177              [AC_MSG_ERROR(*** JCCL C++ API required for VR Juggler ***)]) 
    178 GADGETEER_PATH([1.3.7], , 
     178GADGETEER_PATH([1.3.15], , 
    179179               [AC_MSG_ERROR(*** Gadgeteer required for VR Juggler ***)]) 
    180180SNX_PATH([1.3.6], , [AC_MSG_ERROR(*** Sonix required for VR Juggler ***)]) 

  • juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/VRJOpenGLView.mm

    r20903 r20925  
    134134      [self clearTrackingRect]; 
    135135//      NSRect bounds = [self bounds]; 
    136 //      mVrjWindow->updateOriginSize(bounds.origin.x, bounds.origin.y, 
    137 //                                   bounds.size.width, bounds.size.height); 
    138 //      mVrjWindow->setDirtyViewport(true); 
     136//      mVrjWindow->updateBounds(bounds.origin.x, bounds.origin.y, 
     137//                               bounds.size.width, bounds.size.height); 
    139138   } 
    140139*/ 
    …… 
    505504 
    506505      NSRect bounds = [self bounds]; 
    507       mVrjWindow->updateOriginSize(bounds.origin.x, bounds.origin.y, 
    508                                    bounds.size.width, bounds.size.height); 
     506      mVrjWindow->updateBounds(bounds.origin.x, bounds.origin.y, 
     507                               bounds.size.width, bounds.size.height); 
    509508//      mVrjWindow->releaseRenderLock(); 
    510       mVrjWindow->setDirtyViewport(true); 
    511509   } 
    512510 

  • juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/WindowCocoa.h

    r20495 r20925  
    8888 
    8989   /** 
     90    * Updates the bounds of this window to be the given values. 
     91    * 
     92    * @see gadget::InputAreaCocoa::resize() 
     93    * @see vrj::opengl::Window::updateOriginSize() 
     94    * 
     95    * @since 2.3.16 
     96    */ 
     97   void updateBounds(const float x, const float y, const float width, 
     98                     const float height); 
     99 
     100   /** 
    90101    * Informs this object that the NSWindow object that we created previously 
    91102    * has been closed by an external entity and hence deallocated. By invoking 

  • juggler/trunk/modules/vrjuggler/vrj/Draw/OpenGL/WindowCocoa.mm

    r20920 r20925  
    105105      // Inform our input area of the change in our bounds. 
    106106      NSRect b = [[aNotification object] frame]; 
    107       mWindow->updateOriginSize(b.origin.x, b.origin.y, b.size.width, 
    108                                 b.size.height); 
     107      mWindow->updateBounds(b.origin.x, b.origin.y, b.size.width, 
     108                            b.size.height); 
    109109   } 
    110110@end 
    …… 
    406406} 
    407407 
     408void WindowCocoa::updateBounds(const float x, const float y, const float width, 
     409                               const float height) 
     410{ 
     411   resize(width, height);                       // Input area update 
     412   updateOriginSize(x, y, width, height);       // Graphics window update 
     413   setDirtyViewport(true);                      // OpenGL viewport state 
     414} 
     415 
    408416void WindowCocoa::setWindowOpen(const bool isOpen) 
    409417{