← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
46
46
                m_enableSPU(true),
47
47
                m_useEpa(true),
48
48
                m_allowedCcdPenetration(btScalar(0.04)),
 
49
                m_useConvexConservativeDistanceUtil(true),
 
50
                m_convexConservativeDistanceThreshold(0.0f),
49
51
                m_stackAllocator(0)
50
52
        {
51
53
 
52
54
        }
53
55
        btScalar        m_timeStep;
54
 
        int             m_stepCount;
55
 
        int             m_dispatchFunc;
 
56
        int                     m_stepCount;
 
57
        int                     m_dispatchFunc;
56
58
        mutable btScalar        m_timeOfImpact;
57
 
        bool    m_useContinuous;
 
59
        bool            m_useContinuous;
58
60
        class btIDebugDraw*     m_debugDraw;
59
 
        bool    m_enableSatConvex;
60
 
        bool    m_enableSPU;
61
 
        bool    m_useEpa;
 
61
        bool            m_enableSatConvex;
 
62
        bool            m_enableSPU;
 
63
        bool            m_useEpa;
62
64
        btScalar        m_allowedCcdPenetration;
 
65
        bool            m_useConvexConservativeDistanceUtil;
 
66
        btScalar        m_convexConservativeDistanceThreshold;
63
67
        btStackAlloc*   m_stackAllocator;
64
 
        
65
68
};
66
69
 
67
70
///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.