Changeset 20656

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

MF22 r20654: 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.0/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h

    r20649 r20656  
    3939#include <vpr/Sync/Guard.h> 
    4040 
    41 #include <gadget/Type/PositionInterface.h> 
    42  
    4341#include <vrj/Draw/OGL/GlApp.h> 
    4442#include <vrj/Draw/OGL/GlContextData.h> 
    …… 
    4644 
    4745#include <vrj/Display/CameraProjection.h> 
     46 
     47#include <vrj/Kernel/Kernel.h> 
     48#include <vrj/Kernel/User.h> 
    4849 
    4950#include <osg/Version> 
    …… 
    169170      GlApp::init(); 
    170171 
    171       mHead.init("VJHead"); 
    172  
    173172      //Create the scene 
    174173      this->initScene(); 
    …… 
    270269      mFrameStamp->setFrameNumber(mFrameNumber); 
    271270 
    272       const double head_time(mHead->getTimeStamp().secd()); 
     271      const double head_time( 
     272         mKernel->getUsers()[0]->getHeadPosProxy()->getTimeStamp().secd() 
     273      ); 
    273274      mFrameStamp->setReferenceTime(head_time); 
    274275#if OSG_VERSION_MAJOR == 1 && OSG_VERSION_MINOR > 2 || OSG_MAJOR_VERSION >= 2 
    …… 
    296297 
    297298   int mFrameNumber; 
    298    gadget::PositionInterface mHead; 
    299299   vpr::Mutex mSceneViewLock; 
    300300};