mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile

Browse Source 
git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@316 92aac97c-a6ce-11dd-a772-7fcde58d38e6
This commit is contained in:
chappuis.daniel 2010-05-17 21:38:51 +00:00
parent ad63586b52
commit 96786c2f9e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sources/reactphysics3d/engine/PhysicsWorld.cpp
View File

@ -39,7 +39,7 @@ void PhysicsWorld::addBody(Body* body) throw(std::invalid_argument) {
// Check if the body pointer is not null // Check if the body pointer is not null
if (body != 0) { if (body != 0) {
// Check if the body pointer isn't already in the bodyList // Check if the body pointer isn't already in the bodyList
for(std::vector<Body*>::iterator it = bodyList.begin(); it != bodyList.end(); ++it) { for(std::vector<Body*>::iterator it = bodies.begin(); it != bodies.end(); ++it) {
if (*it == body) { if (*it == body) {
// The body is already in the bodyList, therefore we throw an exception // The body is already in the bodyList, therefore we throw an exception
throw std::invalid_argument("Exception in PhysicsWorld::addBody() : The argument body is already in the PhysicsWorld"); throw std::invalid_argument("Exception in PhysicsWorld::addBody() : The argument body is already in the PhysicsWorld");
@ -47,7 +47,7 @@ void PhysicsWorld::addBody(Body* body) throw(std::invalid_argument) {
} }
// The body isn't already in the bodyList, therefore we add it to the list // The body isn't already in the bodyList, therefore we add it to the list
bodyList.push_back(body); bodies.push_back(body);
} }
else { else {
// Throw an exception // Throw an exception
@ -60,8 +60,8 @@ void PhysicsWorld::removeBody(Body const* const body) throw(std::invalid_argumen
// Check if the body pointer is not null // Check if the body pointer is not null
if (body != 0) { if (body != 0) {
// Look for the body to remove in the bodyList // Look for the body to remove in the bodyList
std::vector<Body*>::iterator it = bodyList.begin(); std::vector<Body*>::iterator it = bodies.begin();
while(it != bodyList.end() && *it != body) { while(it != bodies.end() && *it != body) {
// Increment the iterator // Increment the iterator
++it; ++it;
} }
@ -69,7 +69,7 @@ void PhysicsWorld::removeBody(Body const* const body) throw(std::invalid_argumen
// If we have found the body to remove in the bodyList // If we have found the body to remove in the bodyList
if (*it == body) { if (*it == body) {
// Remove the body // Remove the body
bodyList.erase(it); bodies.erase(it);
} else { } else {
// The body is not in the bodyList, therfore we throw an exception // The body is not in the bodyList, therfore we throw an exception
throw std::invalid_argument("Exception in PhysicsWorld::removeBody() : The argument body to remove is not in the PhysicsWorld"); throw std::invalid_argument("Exception in PhysicsWorld::removeBody() : The argument body to remove is not in the PhysicsWorld");
@ -84,7 +84,7 @@ void PhysicsWorld::removeBody(Body const* const body) throw(std::invalid_argumen
// Add a constraint into the physics world // Add a constraint into the physics world
void PhysicsWorld::addConstraint(Constraint* constraint) throw(std::invalid_argument) { void PhysicsWorld::addConstraint(Constraint* constraint) throw(std::invalid_argument) {
assert(constraint != 0); assert(constraint != 0);
constraintList.push_back(constraint); constraints.push_back(constraint);
} }
// Remove a constraint // Remove a constraint
@ -95,7 +95,7 @@ void PhysicsWorld::removeConstraint(Constraint* constraint) throw(std::invalid_a
// Remove all collision contacts constraints // Remove all collision contacts constraints
void PhysicsWorld::removeAllContactConstraints() { void PhysicsWorld::removeAllContactConstraints() {
// For all constraints // For all constraints
for (std::vector<Constraint*>::iterator it = constraintList.begin(); it != constraintList.end(); ) { for (std::vector<Constraint*>::iterator it = constraints.begin(); it != constraints.end(); ) {
// Try a downcasting // Try a downcasting
Contact* contact = dynamic_cast<Contact*>(*it); Contact* contact = dynamic_cast<Contact*>(*it);
@ -104,7 +104,7 @@ void PhysicsWorld::removeAllContactConstraints() {
if (contact != 0) { if (contact != 0) {
// Delete the contact // Delete the contact
delete (*it); delete (*it);
it = constraintList.erase(it); it = constraints.erase(it);
} }
else { else {
++it; ++it;

8
sources/reactphysics3d/engine/PhysicsWorld.h
View File

@ -61,8 +61,8 @@ class PhysicsWorld {
void removeAllContactConstraints(); // Remove all collision contacts constraints void removeAllContactConstraints(); // Remove all collision contacts constraints
std::vector<Constraint*>::const_iterator getConstraintListStartIterator() const; // Return a start iterator on the constraint list std::vector<Constraint*>::const_iterator getConstraintListStartIterator() const; // Return a start iterator on the constraint list
std::vector<Constraint*>::const_iterator getConstraintListEndIterator() const; // Return a end iterator on the constraint list std::vector<Constraint*>::const_iterator getConstraintListEndIterator() const; // Return a end iterator on the constraint list
std::vector<Body*>& getBodies() const; // Return a reference to the bodies of the physics world std::vector<Body*>& getBodies(); // Return a reference to the bodies of the physics world
std::vector<Constraint*>& getConstraints() const; // Return a reference to the constraints of the physics world std::vector<Constraint*>& getConstraints(); // Return a reference to the constraints of the physics world
}; };
// --- Inline functions --- // // --- Inline functions --- //
@ -105,12 +105,12 @@ inline std::vector<Constraint*>::const_iterator PhysicsWorld::getConstraintListE
} }
// Return a reference to the bodies of the physics world // Return a reference to the bodies of the physics world
std::vector<Body*>& PhysicsWorld::getBodies() const { std::vector<Body*>& PhysicsWorld::getBodies() {
return bodies; return bodies;
} }
// Return a reference to the constraints of the physics world // Return a reference to the constraints of the physics world
std::vector<Constraint*>& PhysicsWorld::getConstraints() const { std::vector<Constraint*>& PhysicsWorld::getConstraints() {
return constraints; return constraints;
} }