Changeset 20654

Show
Ignore:
Timestamp:
08/09/07 15:49:54 (1 year ago)
Author:
patrick
Message:

Don't hard code the use of VJHead. Instead, retrieve the position proxy from
the first configured vrj::User instance in the kernel.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h

    r20648 r20654  
    3333#include <vpr/Sync/Guard.h> 
    3434 
    35 #include <gadget/Type/PositionInterface.h> 
    36  
    3735#include <vrj/Draw/OGL/GlApp.h> 
    3836#include <vrj/Draw/OGL/GlContextData.h> 
    …… 
    4038 
    4139#include <vrj/Display/CameraProjection.h> 
     40 
     41#include <vrj/Kernel/Kernel.h> 
     42#include <vrj/Kernel/User.h> 
    4243 
    4344#include <osg/Version> 
    …… 
    251252      GlApp::init(); 
    252253 
    253       mHead.init("VJHead"); 
    254  
    255254      //Create the scene 
    256255      this->initScene(); 
    …… 
    352351      mFrameStamp->setFrameNumber(mFrameNumber); 
    353352 
    354       const double head_time(mHead->getTimeStamp().secd()); 
     353      const double head_time( 
     354         mKernel->getUsers()[0]->getHeadPosProxy()->getTimeStamp().secd() 
     355      ); 
    355356      mFrameStamp->setReferenceTime(head_time); 
    356357#if OSG_VERSION_MAJOR == 1 && OSG_VERSION_MINOR > 2 || OSG_MAJOR_VERSION >= 2 
    …… 
    378379 
    379380   int mFrameNumber; 
    380    gadget::PositionInterface mHead; 
    381381   vpr::Mutex mSceneViewLock; 
    382382};