← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
41
41
 
42
42
protected:
43
43
                btInternalTickCallback m_internalTickCallback;
 
44
                btInternalTickCallback m_internalPreTickCallback;
44
45
                void*   m_worldUserInfo;
45
46
 
46
47
                btContactSolverInfo     m_solverInfo;
49
50
                
50
51
 
51
52
                btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration)
52
 
                :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0), m_worldUserInfo(0)
 
53
                :btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0),m_internalPreTickCallback(0), m_worldUserInfo(0)
53
54
                {
54
55
                }
55
56
 
85
86
 
86
87
                virtual void    addRigidBody(btRigidBody* body) = 0;
87
88
 
 
89
                virtual void    addRigidBody(btRigidBody* body, short group, short mask) = 0;
 
90
 
88
91
                virtual void    removeRigidBody(btRigidBody* body) = 0;
89
92
 
90
93
                virtual void    setConstraintSolver(btConstraintSolver* solver) = 0;
102
105
                virtual void    clearForces() = 0;
103
106
 
104
107
                /// Set the callback for when an internal tick (simulation substep) happens, optional user info
105
 
                void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0) 
 
108
                void setInternalTickCallback(btInternalTickCallback cb, void* worldUserInfo=0,bool isPreTick=false) 
106
109
                { 
107
 
                        m_internalTickCallback = cb; 
 
110
                        if (isPreTick)
 
111
                        {
 
112
                                m_internalPreTickCallback = cb;
 
113
                        } else
 
114
                        {
 
115
                                m_internalTickCallback = cb; 
 
116
                        }
108
117
                        m_worldUserInfo = worldUserInfo;
109
118
                }
110
119