diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-02-21 22:30:11 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-02-21 22:30:11 +0400 |
| commit | 815e00917dcb4137f9687ab602f527920fa8c41d (patch) | |
| tree | 4c089bc7f19a9249f59428268c8aa99edad1b438 /source/gameengine/Physics/Dummy | |
| parent | 6b600d079351fa5490d74d5661c47346196e57f3 (diff) | |
BGE cleanup: Removing the PHY__Vector classes and replacing them with MT_Vectors. The PHY__Vectors didn't offer anything (not even any real abstraction) and they required annoying MT_Vector <-> PHY_Vector conversions all over the place. No functional changes.
Diffstat (limited to 'source/gameengine/Physics/Dummy')
| -rw-r--r-- | source/gameengine/Physics/Dummy/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt index 6a21fc6fcb7..529a75b2a62 100644 --- a/source/gameengine/Physics/Dummy/CMakeLists.txt +++ b/source/gameengine/Physics/Dummy/CMakeLists.txt @@ -26,6 +26,7 @@ set(INC . ../common + ../../../../intern/moto/include ) set(INC_SYS diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp index d1fabba18f9..72450e4307c 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp @@ -85,7 +85,7 @@ void DummyPhysicsEnvironment::setGravity(float x,float y,float z) { } -void DummyPhysicsEnvironment::getGravity(PHY__Vector3& grav) +void DummyPhysicsEnvironment::getGravity(class MT_Vector3& grav) { } diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index 5ce34bdf7cf..9f6bc85fced 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -56,7 +56,7 @@ public: virtual float getFixedTimeStep(); virtual void setGravity(float x,float y,float z); - virtual void getGravity(PHY__Vector3& grav); + virtual void getGravity(class MT_Vector3& grav); virtual int createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type, float pivotX,float pivotY,float pivotZ, @@ -80,7 +80,7 @@ public: } virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ); - virtual bool cullingTest(PHY_CullingCallback callback, void* userData, PHY__Vector4* planes, int nplanes, int occlusionRes, const int *viewport, double modelview[16], double projection[16]) { return false; } + virtual bool cullingTest(PHY_CullingCallback callback, void* userData, class MT_Vector4* planes, int nplanes, int occlusionRes, const int *viewport, double modelview[16], double projection[16]) { return false; } //gamelogic callbacks @@ -91,7 +91,7 @@ public: } virtual bool requestCollisionCallback(PHY_IPhysicsController* ctrl) { return false; } virtual bool removeCollisionCallback(PHY_IPhysicsController* ctrl) { return false;} - virtual PHY_IPhysicsController* CreateSphereController(float radius,const PHY__Vector3& position) {return 0;} + virtual PHY_IPhysicsController* CreateSphereController(float radius,const class MT_Vector3& position) {return 0;} virtual PHY_IPhysicsController* CreateConeController(float coneradius,float coneheight) { return 0;} virtual void setConstraintParam(int constraintId,int param,float value,float value1) |