Change of the directory structure
git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@446 92aac97c-a6ce-11dd-a772-7fcde58d38e6
This commit is contained in:
parent
5620b6e12e
commit
38a8969c63
|
@ -24,9 +24,8 @@
|
|||
|
||||
// Libraries
|
||||
#include "CollisionDetection.h"
|
||||
#include "SAPAlgorithm.h"
|
||||
#include "GJK/GJKAlgorithm.h"
|
||||
#include "SATAlgorithm.h"
|
||||
#include "broadphase/SAPAlgorithm.h"
|
||||
#include "narrowphase/GJK/GJKAlgorithm.h"
|
||||
#include "../body/Body.h"
|
||||
#include "../shapes/BoxShape.h"
|
||||
#include "../body/RigidBody.h"
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#include <set>
|
||||
#include <utility>
|
||||
|
||||
// TODO : Add a broadphase and a narrowphase folder in the src/collision/ folder
|
||||
|
||||
// ReactPhysics3D namespace
|
||||
namespace reactphysics3d {
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
// Libraries
|
||||
#include <vector>
|
||||
#include "../body/Body.h"
|
||||
#include "../../body/Body.h"
|
||||
|
||||
// Namespace ReactPhysics3D
|
||||
namespace reactphysics3d {
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
// Libraries
|
||||
#include "NoBroadPhaseAlgorithm.h"
|
||||
#include "CollisionDetection.h"
|
||||
#include "../CollisionDetection.h"
|
||||
|
||||
// We want to use the ReactPhysics3D namespace
|
||||
using namespace reactphysics3d;
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
// Libraries
|
||||
#include "SAPAlgorithm.h"
|
||||
#include "CollisionDetection.h"
|
||||
#include "../CollisionDetection.h"
|
||||
#include <algorithm>
|
||||
|
||||
// Namespaces
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
// Libraries
|
||||
#include "BroadPhaseAlgorithm.h"
|
||||
#include "../shapes/AABB.h"
|
||||
#include "../../shapes/AABB.h"
|
||||
|
||||
// TODO : Rename this class SweepAndPruneAlgorithm
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
// Libraries
|
||||
#include "EPAAlgorithm.h"
|
||||
#include "../../GJK/GJKAlgorithm.h"
|
||||
#include "../GJK/GJKAlgorithm.h"
|
||||
#include "TrianglesStore.h"
|
||||
|
||||
// We want to use the ReactPhysics3D namespace
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define EPA_ALGORITHM_H
|
||||
|
||||
// Libraries
|
||||
#include "../../GJK/Simplex.h"
|
||||
#include "../GJK/Simplex.h"
|
||||
#include "../../../shapes/Shape.h"
|
||||
#include "../../ContactInfo.h"
|
||||
#include "../../../mathematics/mathematics.h"
|
||||
|
|
|
@ -26,8 +26,8 @@
|
|||
// Libraries
|
||||
#include "GJKAlgorithm.h"
|
||||
#include "Simplex.h"
|
||||
#include "../../constraint/Contact.h"
|
||||
#include "../../constants.h"
|
||||
#include "../../../constraint/Contact.h"
|
||||
#include "../../../constants.h"
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <cfloat>
|
|
@ -27,9 +27,9 @@
|
|||
|
||||
// Libraries
|
||||
#include "../NarrowPhaseAlgorithm.h"
|
||||
#include "../ContactInfo.h"
|
||||
#include "../../shapes/Shape.h"
|
||||
#include "../narrowphase/EPA/EPAAlgorithm.h"
|
||||
#include "../../ContactInfo.h"
|
||||
#include "../../../shapes/Shape.h"
|
||||
#include "../EPA/EPAAlgorithm.h"
|
||||
|
||||
|
||||
// ReactPhysics3D namespace
|
|
@ -26,7 +26,7 @@
|
|||
#define SIMPLEX_H
|
||||
|
||||
// Libraries
|
||||
#include "../../mathematics/mathematics.h"
|
||||
#include "../../../mathematics/mathematics.h"
|
||||
#include <vector>
|
||||
|
||||
// ReactPhysics3D namespace
|
|
@ -26,9 +26,9 @@
|
|||
#define NARROW_PHASE_ALGORITHM_H
|
||||
|
||||
// Libraries
|
||||
#include "../body/Body.h"
|
||||
#include "ContactInfo.h"
|
||||
#include "CollisionDetection.h"
|
||||
#include "../../body/Body.h"
|
||||
#include "../ContactInfo.h"
|
||||
#include "../CollisionDetection.h"
|
||||
|
||||
// Namespace ReactPhysics3D
|
||||
namespace reactphysics3d {
|
|
@ -24,10 +24,10 @@
|
|||
|
||||
// Libraries
|
||||
#include "SATAlgorithm.h"
|
||||
#include "../shapes/BoxShape.h"
|
||||
#include "../body/RigidBody.h"
|
||||
#include "../constraint/Contact.h"
|
||||
#include "../mathematics/Transform.h"
|
||||
#include "../../shapes/BoxShape.h"
|
||||
#include "../../body/RigidBody.h"
|
||||
#include "../../constraint/Contact.h"
|
||||
#include "../../mathematics/Transform.h"
|
||||
#include <algorithm>
|
||||
#include <cfloat>
|
||||
#include <cmath>
|
|
@ -27,9 +27,9 @@
|
|||
|
||||
// Libraries
|
||||
#include "NarrowPhaseAlgorithm.h"
|
||||
#include "../constraint/Contact.h"
|
||||
#include "../shapes/BoxShape.h"
|
||||
#include "../mathematics/Transform.h"
|
||||
#include "../../constraint/Contact.h"
|
||||
#include "../../shapes/BoxShape.h"
|
||||
#include "../../mathematics/Transform.h"
|
||||
|
||||
// ReactPhysics3D namespace
|
||||
namespace reactphysics3d {
|
|
@ -61,7 +61,6 @@ public :
|
|||
void start(); // Start the physics simulation
|
||||
void stop(); // Stop the physics simulation
|
||||
void update(); // Update the physics simulation
|
||||
CollisionDetection& getCollisionDetection(); // TODO : DELETE THIS METHOD
|
||||
};
|
||||
|
||||
// --- Inline functions --- //
|
||||
|
@ -73,12 +72,7 @@ inline void PhysicsEngine::start() {
|
|||
|
||||
inline void PhysicsEngine::stop() {
|
||||
timer.stop();
|
||||
}
|
||||
|
||||
// TODO : DELETE THIS METHOD
|
||||
inline CollisionDetection& PhysicsEngine::getCollisionDetection() {
|
||||
return collisionDetection;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -30,8 +30,6 @@
|
|||
#include "Shape.h"
|
||||
#include "../mathematics/mathematics.h"
|
||||
|
||||
// TODO : CHECK THAT THE AABB IS CORRECT
|
||||
// TODO : TEST THIS SHAPE WITH GJK AND EPA ALGORITHMS
|
||||
|
||||
// ReactPhysics3D namespace
|
||||
namespace reactphysics3d {
|
||||
|
|
Loading…
Reference in New Issue
Block a user