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

Change of the directory structure

Browse Source 
git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@446 92aac97c-a6ce-11dd-a772-7fcde58d38e6
This commit is contained in:
chappuis.daniel 2011-10-18 22:51:29 +00:00
parent 5620b6e12e
commit 38a8969c63
20 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/collision/CollisionDetection.cpp
View File

@ -24,9 +24,8 @@
// Libraries // Libraries
#include "CollisionDetection.h" #include "CollisionDetection.h"
#include "SAPAlgorithm.h" #include "broadphase/SAPAlgorithm.h"
#include "GJK/GJKAlgorithm.h" #include "narrowphase/GJK/GJKAlgorithm.h"
#include "SATAlgorithm.h"
#include "../body/Body.h" #include "../body/Body.h"
#include "../shapes/BoxShape.h" #include "../shapes/BoxShape.h"
#include "../body/RigidBody.h" #include "../body/RigidBody.h"

1
src/collision/CollisionDetection.h
View File

@ -36,7 +36,6 @@
#include <set> #include <set>
#include <utility> #include <utility>
// TODO : Add a broadphase and a narrowphase folder in the src/collision/ folder
// ReactPhysics3D namespace // ReactPhysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {

0
src/collision/BroadPhaseAlgorithm.cpp → src/collision/broadphase/BroadPhaseAlgorithm.cpp
View File

2
src/collision/BroadPhaseAlgorithm.h → src/collision/broadphase/BroadPhaseAlgorithm.h
View File

@ -27,7 +27,7 @@
// Libraries // Libraries
#include <vector> #include <vector>
#include "../body/Body.h" #include "../../body/Body.h"
// Namespace ReactPhysics3D // Namespace ReactPhysics3D
namespace reactphysics3d { namespace reactphysics3d {

2
src/collision/NoBroadPhaseAlgorithm.cpp → src/collision/broadphase/NoBroadPhaseAlgorithm.cpp
View File

@ -24,7 +24,7 @@
// Libraries // Libraries
#include "NoBroadPhaseAlgorithm.h" #include "NoBroadPhaseAlgorithm.h"
#include "CollisionDetection.h" #include "../CollisionDetection.h"
// We want to use the ReactPhysics3D namespace // We want to use the ReactPhysics3D namespace
using namespace reactphysics3d; using namespace reactphysics3d;

0
src/collision/NoBroadPhaseAlgorithm.h → src/collision/broadphase/NoBroadPhaseAlgorithm.h
View File

2
src/collision/SAPAlgorithm.cpp → src/collision/broadphase/SAPAlgorithm.cpp
View File

@ -24,7 +24,7 @@
// Libraries // Libraries
#include "SAPAlgorithm.h" #include "SAPAlgorithm.h"
#include "CollisionDetection.h" #include "../CollisionDetection.h"
#include <algorithm> #include <algorithm>
// Namespaces // Namespaces

2
src/collision/SAPAlgorithm.h → src/collision/broadphase/SAPAlgorithm.h
View File

@ -27,7 +27,7 @@
// Libraries // Libraries
#include "BroadPhaseAlgorithm.h" #include "BroadPhaseAlgorithm.h"
#include "../shapes/AABB.h" #include "../../shapes/AABB.h"
// TODO : Rename this class SweepAndPruneAlgorithm // TODO : Rename this class SweepAndPruneAlgorithm

2
src/collision/narrowphase/EPA/EPAAlgorithm.cpp
View File

@ -24,7 +24,7 @@
// Libraries // Libraries
#include "EPAAlgorithm.h" #include "EPAAlgorithm.h"
#include "../../GJK/GJKAlgorithm.h" #include "../GJK/GJKAlgorithm.h"
#include "TrianglesStore.h" #include "TrianglesStore.h"
// We want to use the ReactPhysics3D namespace // We want to use the ReactPhysics3D namespace

2
src/collision/narrowphase/EPA/EPAAlgorithm.h
View File

@ -26,7 +26,7 @@
#define EPA_ALGORITHM_H #define EPA_ALGORITHM_H
// Libraries // Libraries
#include "../../GJK/Simplex.h" #include "../GJK/Simplex.h"
#include "../../../shapes/Shape.h" #include "../../../shapes/Shape.h"
#include "../../ContactInfo.h" #include "../../ContactInfo.h"
#include "../../../mathematics/mathematics.h" #include "../../../mathematics/mathematics.h"

4
src/collision/GJK/GJKAlgorithm.cpp → src/collision/narrowphase/GJK/GJKAlgorithm.cpp
View File

@ -26,8 +26,8 @@
// Libraries // Libraries
#include "GJKAlgorithm.h" #include "GJKAlgorithm.h"
#include "Simplex.h" #include "Simplex.h"
#include "../../constraint/Contact.h" #include "../../../constraint/Contact.h"
#include "../../constants.h" #include "../../../constants.h"
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <cfloat> #include <cfloat>

6
src/collision/GJK/GJKAlgorithm.h → src/collision/narrowphase/GJK/GJKAlgorithm.h
View File

@ -27,9 +27,9 @@
// Libraries // Libraries
#include "../NarrowPhaseAlgorithm.h" #include "../NarrowPhaseAlgorithm.h"
#include "../ContactInfo.h" #include "../../ContactInfo.h"
#include "../../shapes/Shape.h" #include "../../../shapes/Shape.h"
#include "../narrowphase/EPA/EPAAlgorithm.h" #include "../EPA/EPAAlgorithm.h"
// ReactPhysics3D namespace // ReactPhysics3D namespace

0
src/collision/GJK/Simplex.cpp → src/collision/narrowphase/GJK/Simplex.cpp
View File

2
src/collision/GJK/Simplex.h → src/collision/narrowphase/GJK/Simplex.h
View File

@ -26,7 +26,7 @@
#define SIMPLEX_H #define SIMPLEX_H
// Libraries // Libraries
#include "../../mathematics/mathematics.h" #include "../../../mathematics/mathematics.h"
#include <vector> #include <vector>
// ReactPhysics3D namespace // ReactPhysics3D namespace

0
src/collision/NarrowPhaseAlgorithm.cpp → src/collision/narrowphase/NarrowPhaseAlgorithm.cpp
View File

6
src/collision/NarrowPhaseAlgorithm.h → src/collision/narrowphase/NarrowPhaseAlgorithm.h
View File

@ -26,9 +26,9 @@
#define NARROW_PHASE_ALGORITHM_H #define NARROW_PHASE_ALGORITHM_H
// Libraries // Libraries
#include "../body/Body.h" #include "../../body/Body.h"
#include "ContactInfo.h" #include "../ContactInfo.h"
#include "CollisionDetection.h" #include "../CollisionDetection.h"
// Namespace ReactPhysics3D // Namespace ReactPhysics3D
namespace reactphysics3d { namespace reactphysics3d {

8
src/collision/SATAlgorithm.cpp → src/collision/narrowphase/SATAlgorithm.cpp
View File

@ -24,10 +24,10 @@
// Libraries // Libraries
#include "SATAlgorithm.h" #include "SATAlgorithm.h"
#include "../shapes/BoxShape.h" #include "../../shapes/BoxShape.h"
#include "../body/RigidBody.h" #include "../../body/RigidBody.h"
#include "../constraint/Contact.h" #include "../../constraint/Contact.h"
#include "../mathematics/Transform.h" #include "../../mathematics/Transform.h"
#include <algorithm> #include <algorithm>
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>

6
src/collision/SATAlgorithm.h → src/collision/narrowphase/SATAlgorithm.h
View File

@ -27,9 +27,9 @@
// Libraries // Libraries
#include "NarrowPhaseAlgorithm.h" #include "NarrowPhaseAlgorithm.h"
#include "../constraint/Contact.h" #include "../../constraint/Contact.h"
#include "../shapes/BoxShape.h" #include "../../shapes/BoxShape.h"
#include "../mathematics/Transform.h" #include "../../mathematics/Transform.h"
// ReactPhysics3D namespace // ReactPhysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {

8
src/engine/PhysicsEngine.h
View File

@ -61,7 +61,6 @@ public :
void start(); // Start the physics simulation void start(); // Start the physics simulation
void stop(); // Stop the physics simulation void stop(); // Stop the physics simulation
void update(); // Update the physics simulation void update(); // Update the physics simulation
CollisionDetection& getCollisionDetection(); // TODO : DELETE THIS METHOD
}; };
// --- Inline functions --- // // --- Inline functions --- //
@ -73,12 +72,7 @@ inline void PhysicsEngine::start() {
inline void PhysicsEngine::stop() { inline void PhysicsEngine::stop() {
timer.stop(); timer.stop();
} }
// TODO : DELETE THIS METHOD
inline CollisionDetection& PhysicsEngine::getCollisionDetection() {
return collisionDetection;
}
} }

2
src/shapes/BoxShape.h
View File

@ -30,8 +30,6 @@
#include "Shape.h" #include "Shape.h"
#include "../mathematics/mathematics.h" #include "../mathematics/mathematics.h"
// TODO : CHECK THAT THE AABB IS CORRECT
// TODO : TEST THIS SHAPE WITH GJK AND EPA ALGORITHMS
// ReactPhysics3D namespace // ReactPhysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {