| @@ -104,7 +104,7 @@ BtPhysTest::BtPhysTest(bool editor) | |||||
| NewPhyobj->SetTransform(NewPosition, NewRotation); | NewPhyobj->SetTransform(NewPosition, NewRotation); | ||||
| Ticker::Ref(NewPhyobj); | Ticker::Ref(NewPhyobj); | ||||
| m_ground_list << NewPhyobj; | m_ground_list << NewPhyobj; | ||||
| } | |||||
| } | |||||
| } | } | ||||
| if (USE_PLATFORM) | if (USE_PLATFORM) | ||||
| @@ -18,9 +18,8 @@ | |||||
| #define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__ | #define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__ | ||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | |||||
| #include "EasyPhysics.h" | |||||
| #include <BulletDynamics/Character/btKinematicCharacterController.h> | #include <BulletDynamics/Character/btKinematicCharacterController.h> | ||||
| #include "EasyPhysics.h" | |||||
| #endif | #endif | ||||
| namespace lol | namespace lol | ||||
| @@ -18,7 +18,6 @@ | |||||
| #define __EASYCONSTRAINT_EASYCONSTRAINT_H__ | #define __EASYCONSTRAINT_EASYCONSTRAINT_H__ | ||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | |||||
| #include "EasyPhysics.h" | #include "EasyPhysics.h" | ||||
| #endif | #endif | ||||
| @@ -19,9 +19,7 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | #include "core.h" | ||||
| #include <bullet/btBulletDynamicsCommon.h> | |||||
| #include <bullet/btBulletCollisionCommon.h> | |||||
| #include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h> | |||||
| #include "LolPhysics.h" | |||||
| #endif | #endif | ||||
| namespace lol | namespace lol | ||||
| @@ -11,9 +11,8 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include <bullet/btBulletDynamicsCommon.h> | #include <bullet/btBulletDynamicsCommon.h> | ||||
| #include <bullet/btBulletCollisionCommon.h> | #include <bullet/btBulletCollisionCommon.h> | ||||
| #include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h> | |||||
| #include "LolBtPhysicsIntegration.h" | #include "LolBtPhysicsIntegration.h" | ||||
| #include "EasyPhysics.h" | |||||
| #include "EasyConstraint.h" | |||||
| #endif | #endif | ||||
| namespace lol | namespace lol | ||||
| @@ -14,9 +14,9 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #ifdef HAVE_PHYS_USE_BULLET | |||||
| #include "../Include/EasyCharacterController.h" | #include "../Include/EasyCharacterController.h" | ||||
| #endif //HAVE_PHYS_USE_BULLET | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -1,6 +1,22 @@ | |||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| // | |||||
| // Lol Engine | |||||
| // | |||||
| // Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net> | |||||
| // (c) 2009-2012 Cédric Lecacheur <jordx@free.fr> | |||||
| // (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com> | |||||
| // This program is free software; you can redistribute it and/or | |||||
| // modify it under the terms of the Do What The Fuck You Want To | |||||
| // Public License, Version 2, as published by Sam Hocevar. See | |||||
| // http://sam.zoy.org/projects/COPYING.WTFPL for more details. | |||||
| // | |||||
| #if defined HAVE_CONFIG_H | |||||
| # include "config.h" | |||||
| #endif | |||||
| #ifdef HAVE_PHYS_USE_BULLET | |||||
| #include "../Include/EasyConstraint.h" | #include "../Include/EasyConstraint.h" | ||||
| #endif //HAVE_PHYS_USE_BULLET | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -14,8 +14,9 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #ifdef HAVE_PHYS_USE_BULLET | |||||
| #include "../Include/EasyPhysics.h" | |||||
| #endif // HAVE_PHYS_USE_BULLET | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||