Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some merging conflicts

Browse Source
This commit is contained in:
ejcoumans
2006-09-27 20:58:49 +00:00
parent eb23bb5c0c
commit d0f09040e9
8 changed files with 42 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/BulletDynamics/Dynamics/btDynamicsWorld.h
View File

@@ -1,50 +1,3 @@
<<<<<<< .working
/*
Bullet Continuous Collision Detection and Physics Library
Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef BT_DYNAMICS_WORLD_H
#define BT_DYNAMICS_WORLD_H
#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
class TypedConstraint;
///btDynamicsWorld is the baseclass for several dynamics implementation, basic, discrete, parallel, and continuous
class btDynamicsWorld : public CollisionWorld
{
public:
btDynamicsWorld(Dispatcher* dispatcher,OverlappingPairCache* pairCache)
:CollisionWorld(dispatcher,pairCache)
{
}
virtual ~btDynamicsWorld()
{
}
///stepSimulation proceeds the simulation over timeStep units
virtual void stepSimulation( float timeStep) = 0;
virtual void addConstraint(TypedConstraint* constraint) {};
virtual void removeConstraint(TypedConstraint* constraint) {};
};
#endif //BT_DYNAMICS_WORLD_H=======
/*
Bullet Continuous Collision Detection and Physics Library
Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
@@ -90,4 +43,5 @@ class btDynamicsWorld : public btCollisionWorld
};
#endif //BT_DYNAMICS_WORLD_H>>>>>>> .merge-right.r324
#endif //BT_DYNAMICS_WORLD_H