Changeset 20145

Show
Ignore:
Timestamp:
05/06/07 12:59:35 (1 year ago)
Author:
patrick
Message:

MFT r20143: Fixed animation with OSG 1.9/2.0.

Submitted by: Doug McCorkle? < mccdo at iastate dot edu >

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r20129 r20145  
    4747#include <vrj/Display/CameraProjection.h> 
    4848 
     49#include <osg/Version> 
    4950#include <osg/Vec3> 
    5051#include <osg/Matrix> 
    …… 
    262263      // Update the frame stamp with information from this frame. 
    263264      mFrameStamp->setFrameNumber(mFrameNumber); 
    264       mFrameStamp->setReferenceTime(mHead->getTimeStamp().secd()); 
    265  
     265 
     266      const double head_time(mHead->getTimeStamp().secd()); 
     267      mFrameStamp->setReferenceTime(head_time); 
     268#if OSG_VERSION_MAJOR >= 1 && OSG_VERSION_MINOR > 2 
     269      mFrameStamp->setSimulationTime(head_time); 
     270#endif 
     271       
    266272      // Set up the time and frame number so time-dependent things (animations, 
    267273      // particle system) function correctly.