Changeset 1749Tweet

Timestamp:

Aug 15, 2012, 4:11:32 PM (11 years ago)

Author:

touky

Message:

Reverted last CL

Location:

trunk/test

Files:

• BtPhysTest.cpp (modified) (1 diff)
• Physics/Include/EasyCharacterController.h (modified) (1 diff)
• Physics/Include/EasyConstraint.h (modified) (1 diff)
• Physics/Include/EasyPhysics.h (modified) (1 diff)
• Physics/Include/LolPhysics.h (modified) (1 diff)
• Physics/Src/EasyCharacterController.cpp (modified) (1 diff)
• Physics/Src/EasyConstraint.cpp (modified) (1 diff)
• Physics/Src/EasyPhysics.cpp (modified) (1 diff)

trunk/test/BtPhysTest.cpp

@@ -105 +105 @@
                         Ticker::Ref(NewPhyobj);
                         m_ground_list << NewPhyobj;
-                }       
+                }
         }
 

trunk/test/Physics/Include/EasyCharacterController.h

@@ -19 +19 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
+#include "core.h"
+#include "EasyPhysics.h"
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
-#include "EasyPhysics.h"
 #endif
 

trunk/test/Physics/Include/EasyConstraint.h

@@ -19 +19 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
+#include "core.h"
 #include "EasyPhysics.h"
 #endif

trunk/test/Physics/Include/EasyPhysics.h

@@ -20 +20 @@
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
-#include "LolPhysics.h"
+#include <bullet/btBulletDynamicsCommon.h>
+#include <bullet/btBulletCollisionCommon.h>
+#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
 #endif
 

trunk/test/Physics/Include/LolPhysics.h

@@ -12 +12 @@
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
-#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
 #include "LolBtPhysicsIntegration.h"
+#include "EasyPhysics.h"
+#include "EasyConstraint.h"
 #endif
 

trunk/test/Physics/Src/EasyCharacterController.cpp

@@ -15 +15 @@
 #endif
 
-#ifdef HAVE_PHYS_USE_BULLET
+#include "../Include/LolBtPhysicsIntegration.h"
+#include "../Include/LolPhysics.h"
 #include "../Include/EasyCharacterController.h"
-#endif //HAVE_PHYS_USE_BULLET
 
 namespace lol

trunk/test/Physics/Src/EasyConstraint.cpp

@@ -1 @@
-//
-// 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/LolBtPhysicsIntegration.h"
+#include "../Include/LolPhysics.h"
 #include "../Include/EasyConstraint.h"
-#endif //HAVE_PHYS_USE_BULLET
 
 namespace lol

trunk/test/Physics/Src/EasyPhysics.cpp

@@ -15 +15 @@
 #endif
 
-#ifdef HAVE_PHYS_USE_BULLET
-#include "../Include/EasyPhysics.h"
-#endif // HAVE_PHYS_USE_BULLET
+#include "../Include/LolBtPhysicsIntegration.h"
+#include "../Include/LolPhysics.h"
 
 namespace lol