Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 20, 2008, 5:40:38 PM (16 years ago)
Author:
rgrieder
Message:

Downgraded Bullet to latest tagged version: 2.72
That should give us more stability.

Location:
code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp

    r1963 r1972  
    886886        const btVector3 delta=  results.witnesses[1]-
    887887                                                        results.witnesses[0];
    888         const btScalar  margin= shape0->getMarginNonVirtual()+
    889                                                         shape1.getMarginNonVirtual();
     888        const btScalar  margin= shape0->getMargin()+
     889                                                        shape1.getMargin();
    890890        const btScalar  length= delta.length();
    891891        results.normal                  =       delta/length;

  • code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp

    r1963 r1972  
    2222
    2323#if defined(DEBUG) || defined (_DEBUG)
    24 //#define TEST_NON_VIRTUAL 1
     24#define TEST_NON_VIRTUAL 1
    2525#include <stdio.h> //for debug printf
    2626#ifdef __SPU__
Note: See TracChangeset for help on using the changeset viewer.