Changeset 20528

Show
Ignore:
Timestamp:
07/09/07 20:12:28 (1 year ago)
Author:
patrick
Message:

In r20525, I accidentally committed r20512, too. This change undoes that so
that now this is properly in sync with r20509.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/modules/vrjuggler/samples/Pf/advanced/nav/pfPogoCollider.h

    r20525 r20528  
    7474inline bool pfPogoCollider::testMove( gmtl::Vec3f feetPosition, gmtl::Vec3f feetDelta, gmtl::Vec3f& correction, bool feetPositionWithDelta ) 
    7575{ 
    76    pfVec3 pf_feet_position    = vrj::pf::GetPfVec(feetPosition); 
    77    pfVec3 pf_feet_delta       = vrj::pf::GetPfVec(feetDelta); 
     76   pfVec3 pf_feet_position    = vrj::GetPfVec(feetPosition); 
     77   pfVec3 pf_feet_delta       = vrj::GetPfVec(feetDelta); 
    7878   pfVec3 pf_feet_destination = pf_feet_position + pf_feet_delta; 
    7979   pfVec3 pf_correction;      // Needs to be set 
    …… 
    8787   if (terryCollide.collide( pf_correction, mWorldNode, 0x1, pf_step_destination, step_height)) 
    8888   { 
    89       correction = vrj::pf::GetVjVec(pf_correction); 
     89      correction = vrj::GetVjVec(pf_correction); 
    9090 
    9191      setDidCollide(true);