diff --git a/build/vs2010/Lol.Core.Vars.props b/build/vs2010/Lol.Core.Vars.props index d3426f28..961b0d1d 100644 --- a/build/vs2010/Lol.Core.Vars.props +++ b/build/vs2010/Lol.Core.Vars.props @@ -20,13 +20,6 @@ HAVE_SDL_H;USE_SDL;$(Win32Defines) USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines) - - $(ExternalDir)\bullet-2.80-rev2531 - $(BtPhysDir)\include;$(BtPhysDir)\include\bullet - HAVE_PHYS_USE_BULLET;$(Win32Defines) - HAVE_PHYS_USE_BULLET;$(Ps3Defines) - HAVE_PHYS_USE_BULLET;$(XboxDefines) - $(ExternalDir)\gtk-2.22.1 $(ExternalDir)\gtkglarea-2.0.1 diff --git a/build/vs2010/config-build.xml b/build/vs2010/config-build.xml index 5bab9443..5b1c0ce6 100644 --- a/build/vs2010/config-build.xml +++ b/build/vs2010/config-build.xml @@ -9,8 +9,5 @@ true - - true - diff --git a/build/vs2012/Lol.Core.Vars.props b/build/vs2012/Lol.Core.Vars.props index d3426f28..961b0d1d 100644 --- a/build/vs2012/Lol.Core.Vars.props +++ b/build/vs2012/Lol.Core.Vars.props @@ -20,13 +20,6 @@ HAVE_SDL_H;USE_SDL;$(Win32Defines) USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines) - - $(ExternalDir)\bullet-2.80-rev2531 - $(BtPhysDir)\include;$(BtPhysDir)\include\bullet - HAVE_PHYS_USE_BULLET;$(Win32Defines) - HAVE_PHYS_USE_BULLET;$(Ps3Defines) - HAVE_PHYS_USE_BULLET;$(XboxDefines) - $(ExternalDir)\gtk-2.22.1 $(ExternalDir)\gtkglarea-2.0.1 diff --git a/test/btphystest.cpp b/test/btphystest.cpp index 03273913..b448c084 100644 --- a/test/btphystest.cpp +++ b/test/btphystest.cpp @@ -14,10 +14,6 @@ using namespace lol; -#ifndef HAVE_PHYS_USE_BULLET -#define HAVE_PHYS_USE_BULLET -#endif /* HAVE_PHYS_USE_BULLET */ - #include "physics/lolphysics.h" #include "physics/easyphysics.h" diff --git a/test/nacl_phystest.cpp b/test/nacl_phystest.cpp index dd6d55b2..e9be063a 100644 --- a/test/nacl_phystest.cpp +++ b/test/nacl_phystest.cpp @@ -14,10 +14,6 @@ using namespace lol; -#ifndef HAVE_PHYS_USE_BULLET -#define HAVE_PHYS_USE_BULLET -#endif /* HAVE_PHYS_USE_BULLET */ - //#include "physics/lolphysics.h" //#include "physics/easyphysics.h" diff --git a/test/physics/bulletcharactercontroller.cpp b/test/physics/bulletcharactercontroller.cpp index 46925fc7..cfbd1f0b 100644 --- a/test/physics/bulletcharactercontroller.cpp +++ b/test/physics/bulletcharactercontroller.cpp @@ -16,7 +16,6 @@ #define USE_LOL_CTRLR_CHARAC -#ifdef HAVE_PHYS_USE_BULLET #include "core.h" #include #include "lolbtphysicsintegration.h" @@ -30,8 +29,6 @@ //#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" //#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" //#include "LinearMath/btDefaultMotionState.h" -#endif //HAVE_PHYS_USE_BULLET - namespace lol { @@ -40,7 +37,6 @@ namespace phys { #ifdef USE_LOL_CTRLR_CHARAC -#ifdef HAVE_PHYS_USE_BULLET //When called, will try to remove Character controller from its collision. bool BulletKinematicCharacterController::RecoverFromPenetration(btCollisionWorld* CollisionWorld) @@ -238,7 +234,6 @@ void BulletKinematicCharacterController::Jump() m_was_jumping = true; } -#endif // HAVE_PHYS_USE_BULLET #endif // USE_LOL_CTRLR_CHARAC } /* namespace phys */ diff --git a/test/physics/bulletcharactercontroller.h b/test/physics/bulletcharactercontroller.h index aabf0a8e..18df9ca5 100644 --- a/test/physics/bulletcharactercontroller.h +++ b/test/physics/bulletcharactercontroller.h @@ -18,11 +18,9 @@ #if !defined __BULLETCHARACTERCONTROLLER_BULLETCHARACTERCONTROLLER_H__ #define __BULLETCHARACTERCONTROLLER_BULLETCHARACTERCONTROLLER_H__ -#ifdef HAVE_PHYS_USE_BULLET #include "core.h" #include "easyphysics.h" //#include "BulletDynamics\Character\btCharacterControllerInterface.h" -#endif #define USE_LOL_CTRLR_CHARAC @@ -33,7 +31,6 @@ namespace lol { #ifdef USE_LOL_CTRLR_CHARAC -#ifdef HAVE_PHYS_USE_BULLET //SweepCallback used for Swweep Tests. class ClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback @@ -278,7 +275,6 @@ namespace lol vec3 m_velocity; }; -#endif // HAVE_PHYS_USE_BULLET #endif // USE_LOL_CTRLR_CHARAC } /* namespace phys */ diff --git a/test/physics/easycharactercontroller.cpp b/test/physics/easycharactercontroller.cpp index 466b012b..bc6281e0 100644 --- a/test/physics/easycharactercontroller.cpp +++ b/test/physics/easycharactercontroller.cpp @@ -24,8 +24,6 @@ namespace lol namespace phys { -#ifdef HAVE_PHYS_USE_BULLET - //------------------------------------------------------------------------- //EASY_CHARACTER_CONTROLLER //-- @@ -146,8 +144,6 @@ void EasyCharacterController::TickGame(float seconds) } } -#endif // HAVE_PHYS_USE_BULLET - } /* namespace phys */ } /* namespace lol */ diff --git a/test/physics/easycharactercontroller.h b/test/physics/easycharactercontroller.h index c81fcb62..d1fcd5ce 100644 --- a/test/physics/easycharactercontroller.h +++ b/test/physics/easycharactercontroller.h @@ -20,12 +20,10 @@ #if !defined __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__ #define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__ -#ifdef HAVE_PHYS_USE_BULLET #include "core.h" #include "easyphysics.h" #include "bulletcharactercontroller.h" #include -#endif namespace lol { @@ -40,8 +38,6 @@ class EasyCharacterController : public EasyPhysic, friend class Simulation; friend class EasyPhysic; -#ifdef HAVE_PHYS_USE_BULLET - public: EasyCharacterController(WorldEntity* NewOwnerEntity) : EasyPhysic(NewOwnerEntity), @@ -101,17 +97,6 @@ protected: //---- vec3 m_walk_velocity; vec3 m_current_velocity; - -#else // NO PHYSIC IMPLEMENTATION - - virtual void InitBodyToRigid(bool ZeroMassIsKinematic=false) { } - virtual void InitBodyToGhost() { } - virtual void AddToSimulation(class Simulation* current_simulation) { } - virtual void RemoveFromSimulation(class Simulation* current_simulation) { } - virtual void SetMovementForFrame(vec3 const &MoveQuantity) { } - -#endif // PHYSIC IMPLEMENTATION - }; } /* namespace phys */ diff --git a/test/physics/easyconstraint.cpp b/test/physics/easyconstraint.cpp index 9e307fd4..e90ebf89 100644 --- a/test/physics/easyconstraint.cpp +++ b/test/physics/easyconstraint.cpp @@ -13,8 +13,6 @@ namespace lol namespace phys { -#ifdef HAVE_PHYS_USE_BULLET - //------------------------------------------------------------------------- //EASY_CONSTRAINT //-- @@ -39,8 +37,7 @@ void EasyConstraint::RemoveFromSimulation(class Simulation* current_simulation) } } -#endif // HAVE_PHYS_USE_BULLET - } /* namespace phys */ } /* namespace lol */ + diff --git a/test/physics/easyconstraint.h b/test/physics/easyconstraint.h index e8b321e7..8969f62d 100644 --- a/test/physics/easyconstraint.h +++ b/test/physics/easyconstraint.h @@ -17,10 +17,8 @@ #if !defined __EASYCONSTRAINT_EASYCONSTRAINT_H__ #define __EASYCONSTRAINT_EASYCONSTRAINT_H__ -#ifdef HAVE_PHYS_USE_BULLET #include "core.h" #include "easyphysics.h" -#endif namespace lol { @@ -34,8 +32,6 @@ class EasyConstraint friend class Simulation; friend class EasyPhysic; -#ifdef HAVE_PHYS_USE_BULLET - public: EasyConstraint() : m_typed_constraint(NULL), @@ -133,34 +129,6 @@ private: btConeTwistConstraint* m_cone_twist_constraint; btGeneric6DofConstraint* m_6dof_constraint; -#else // NO PHYSIC IMPLEMENTATION - -public: - EasyConstraint() : - m_a_physobj(NULL), - m_b_physobj(NULL), - m_a_transform(lol::mat4(1.f)), - m_b_transform(lol::mat4(1.f)), - m_using_ref_a(false), - m_disable_a2b_collision(false) - { - } - -private: - - void AddToSimulation(class Simulation* current_simulation) { } - void RemoveFromSimulation(class Simulation* current_simulation) { } - - //check if Init can be done - bool CanProceedWithInit() { return false; } - void CustomInitConstraintToPoint2Point() { } - void CustomInitConstraintToHinge() { } - void CustomInitConstraintToSlider() { } - void CustomInitConstraintToConeTwist() { } - void CustomInitConstraintTo6Dof() { } - -#endif // PHYSIC IMPLEMENTATION - public: void InitConstraintToPoint2Point() { if (CanProceedWithInit()) CustomInitConstraintToPoint2Point(); } void InitConstraintToHinge() { if (CanProceedWithInit()) CustomInitConstraintToHinge(); } diff --git a/test/physics/easyphysics.cpp b/test/physics/easyphysics.cpp index 4448d2c1..61bc96ce 100644 --- a/test/physics/easyphysics.cpp +++ b/test/physics/easyphysics.cpp @@ -23,8 +23,6 @@ namespace lol namespace phys { -#ifdef HAVE_PHYS_USE_BULLET - //------------------------------------------------------------------------- //EASY_PHYSIC //-- @@ -425,8 +423,6 @@ void EasyPhysic::SetLocalInertia(float mass) m_local_inertia = btVector3(.0f, .0f, .0f); } -#endif // HAVE_PHYS_USE_BULLET - } /* namespace phys */ } /* namespace lol */ diff --git a/test/physics/easyphysics.h b/test/physics/easyphysics.h index b4625936..de43201c 100644 --- a/test/physics/easyphysics.h +++ b/test/physics/easyphysics.h @@ -17,12 +17,10 @@ #if !defined __EASYPHYSICS_EASYPHYSICS_H__ #define __EASYPHYSICS_EASYPHYSICS_H__ -#ifdef HAVE_PHYS_USE_BULLET #include "core.h" #include #include #include -#endif //HAVE_PHYS_USE_BULLET namespace lol { @@ -36,8 +34,6 @@ class EasyPhysic friend class Simulation; friend class EasyConstraint; -#ifdef HAVE_PHYS_USE_BULLET - public: EasyPhysic(WorldEntity* NewOwnerEntity); ~EasyPhysic(); @@ -93,49 +89,6 @@ protected: btConvexShape* m_convex_shape; btMotionState* m_motion_state; -#else // NO PHYSIC IMPLEMENTATION - -public: - EasyPhysic(WorldEntity* NewOwnerEntity) { m_owner_entity = NewOwnerEntity; } - - virtual void SetShapeToBox(lol::vec3& BoxSize) { } - virtual void SetShapeToSphere(float radius) { } - virtual void SetShapeToCone(float radius, float height) { } - virtual void SetShapeToCylinder(lol::vec3& cyl_size) { } - virtual void SetShapeToCapsule(float radius, float height) { } - - virtual bool CanChangeCollisionChannel() { return true; } - virtual mat4 GetTransform() { return mat4(1.0f); } - virtual void SetTransform(const lol::vec3& base_location, const lol::quat& base_rotation=lol::quat(lol::mat4(1.0f))) { } -private: - virtual void BaseTransformChanged(const lol::mat4& PreviousMatrix, const lol::mat4& NewMatrix) { } -public: - virtual void SetMass(float mass) { } - virtual float GetMass() { return .0f; } - virtual void SetHitRestitution(float hit_restitution) { } - virtual void InitBodyToRigid() { } - virtual void InitBodyToGhost() { } - virtual void AddToSimulation(class Simulation* current_simulation) { } - virtual void RemoveFromSimulation(class Simulation* current_simulation) { } - - //Force/Impulse functions - virtual void AddImpulse(const lol::vec3& impulse) { } - virtual void AddImpulse(const lol::vec3& impulse, const lol::vec3& rel_pos) { } - virtual void AddImpulseTorque(const lol::vec3& torque) { } - virtual void AddForce(const lol::vec3& force) { } - virtual void AddForce(const lol::vec3& force, const lol::vec3& rel_pos) { } - virtual void AddForceTorque(const lol::vec3& torque) { } - - //Movements getter - lol::vec3 GetLinearVelocity() const { return lol::vec3(.0f); } - lol::vec3 GetLinearForce() const { return lol::vec3(.0f); } - lol::vec3 GetAngularVelocity() const { return lol::vec3(.0f); } - lol::vec3 GetAngularForce() const { return lol::vec3(.0f); } - - virtual void InitBodyToGhost() { } - -#endif // PHYSIC IMPLEMENTATION - public: //Sets the collision Group & Mask. //Mask can change at runtime, not group ! diff --git a/test/physics/lolbtphysicsintegration.h b/test/physics/lolbtphysicsintegration.h index 65435f44..323d999c 100644 --- a/test/physics/lolbtphysicsintegration.h +++ b/test/physics/lolbtphysicsintegration.h @@ -28,8 +28,6 @@ namespace lol #define GAMEGROUP_EZP_CHAR_CTRLR GAMEGROUP_AFTER_0 #define GAMEGROUP_SIMULATION GAMEGROUP_AFTER_1 -#ifdef HAVE_PHYS_USE_BULLET - #define LOL2BT_UNIT 1.0f #define BT2LOL_UNIT 1.0f @@ -46,8 +44,6 @@ namespace lol #define LOL2BT_QUAT(ELEMENT) btQuaternion((ELEMENT).x, (ELEMENT).y, (ELEMENT).z, (ELEMENT).w) #define BT2LOL_QUAT(ELEMENT) lol::quat((ELEMENT).getW(), BT2LOL_VEC3((ELEMENT).getAxis()) -#endif // HAVE_PHYS_USE_BULLET - } /* namespace lol */ #endif /* __LOLBTPHYSICSINTEGRATION_H__ */ diff --git a/test/physics/lolphysics.h b/test/physics/lolphysics.h index d75fe6a4..eaf33fed 100644 --- a/test/physics/lolphysics.h +++ b/test/physics/lolphysics.h @@ -8,7 +8,6 @@ #if !defined __LOLPHYSICS_H__ #define __LOLPHYSICS_H__ -#ifdef HAVE_PHYS_USE_BULLET #include #include #include @@ -16,7 +15,6 @@ #include "lolbtphysicsintegration.h" #include "easyphysics.h" #include "easyconstraint.h" -#endif namespace lol { @@ -80,7 +78,6 @@ public: char const *GetName() { return ""; } -#ifdef HAVE_PHYS_USE_BULLET public: void Init() { @@ -267,21 +264,6 @@ private: // The world. btDiscreteDynamicsWorld* m_dynamics_world; -#else // NO PHYSIC IMPLEMENTATION - -public: - void Init() { } - void TickGame(float seconds) { } - bool RayHits(RayCastResult& HitResult, eRaycastType RaycastType, const vec3& RayFrom, const vec3& RayTo, EasyPhysic* SourceCaster=NULL) { return false; } - void Exit() { } -private: - void CustomSetContinuousDetection(bool ShouldUseCCD) { } - void CustomSetGravity(vec3 &NewGravity) { } - void CustomSetWorldLimit(vec3 &NewWorldMin, vec3 &NewWorldMax) { } - void CustomSetTimestep(float NewTimestep) { } - -#endif // PHYSIC IMPLEMENTATION - public: //Main logic : //The Set*() functions do the all-lib-independent data storage.