Changeset 1749


Ignore:
Timestamp:
Aug 15, 2012, 4:11:32 PM (7 years ago)
Author:
touky
Message:

Reverted last CL

Location:
trunk/test
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/BtPhysTest.cpp

    r1748 r1749  
    105105                        Ticker::Ref(NewPhyobj);
    106106                        m_ground_list << NewPhyobj;
    107                 }       
     107                }
    108108        }
    109109
  • trunk/test/Physics/Include/EasyCharacterController.h

    r1748 r1749  
    1919
    2020#ifdef HAVE_PHYS_USE_BULLET
     21#include "core.h"
     22#include "EasyPhysics.h"
    2123#include <BulletDynamics/Character/btKinematicCharacterController.h>
    22 #include "EasyPhysics.h"
    2324#endif
    2425
  • trunk/test/Physics/Include/EasyConstraint.h

    r1748 r1749  
    1919
    2020#ifdef HAVE_PHYS_USE_BULLET
     21#include "core.h"
    2122#include "EasyPhysics.h"
    2223#endif
  • trunk/test/Physics/Include/EasyPhysics.h

    r1748 r1749  
    2020#ifdef HAVE_PHYS_USE_BULLET
    2121#include "core.h"
    22 #include "LolPhysics.h"
     22#include <bullet/btBulletDynamicsCommon.h>
     23#include <bullet/btBulletCollisionCommon.h>
     24#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
    2325#endif
    2426
  • trunk/test/Physics/Include/LolPhysics.h

    r1748 r1749  
    1212#include <bullet/btBulletDynamicsCommon.h>
    1313#include <bullet/btBulletCollisionCommon.h>
    14 #include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
    1514#include "LolBtPhysicsIntegration.h"
     15#include "EasyPhysics.h"
     16#include "EasyConstraint.h"
    1617#endif
    1718
  • trunk/test/Physics/Src/EasyCharacterController.cpp

    r1748 r1749  
    1515#endif
    1616
    17 #ifdef HAVE_PHYS_USE_BULLET
     17#include "../Include/LolBtPhysicsIntegration.h"
     18#include "../Include/LolPhysics.h"
    1819#include "../Include/EasyCharacterController.h"
    19 #endif //HAVE_PHYS_USE_BULLET
    2020
    2121namespace lol
  • trunk/test/Physics/Src/EasyConstraint.cpp

    r1748 r1749  
    1 //
    2 // Lol Engine
    3 //
    4 // Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
    5 //            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
    6 //            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
    7 //   This program is free software; you can redistribute it and/or
    8 //   modify it under the terms of the Do What The Fuck You Want To
    9 //   Public License, Version 2, as published by Sam Hocevar. See
    10 //   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    11 //
    12 
    13 #if defined HAVE_CONFIG_H
    14 #   include "config.h"
    15 #endif
    16 
    17 #ifdef HAVE_PHYS_USE_BULLET
     1#include "../Include/LolBtPhysicsIntegration.h"
     2#include "../Include/LolPhysics.h"
    183#include "../Include/EasyConstraint.h"
    19 #endif //HAVE_PHYS_USE_BULLET
    204
    215namespace lol
  • trunk/test/Physics/Src/EasyPhysics.cpp

    r1748 r1749  
    1515#endif
    1616
    17 #ifdef HAVE_PHYS_USE_BULLET
    18 #include "../Include/EasyPhysics.h"
    19 #endif // HAVE_PHYS_USE_BULLET
     17#include "../Include/LolBtPhysicsIntegration.h"
     18#include "../Include/LolPhysics.h"
    2019
    2120namespace lol
Note: See TracChangeset for help on using the changeset viewer.