Browse Source

Small .h & .cpp refactor

legacy
Benjamin ‘Touky’ Huet touky 12 years ago
parent
commit
50c2855d89
8 changed files with 27 additions and 15 deletions
  1. +1
    -1
      test/BtPhysTest.cpp
  2. +1
    -2
      test/Physics/Include/EasyCharacterController.h
  3. +0
    -1
      test/Physics/Include/EasyConstraint.h
  4. +1
    -3
      test/Physics/Include/EasyPhysics.h
  5. +1
    -2
      test/Physics/Include/LolPhysics.h
  6. +2
    -2
      test/Physics/Src/EasyCharacterController.cpp
  7. +18
    -2
      test/Physics/Src/EasyConstraint.cpp
  8. +3
    -2
      test/Physics/Src/EasyPhysics.cpp

+ 1
- 1
test/BtPhysTest.cpp View File

@@ -104,7 +104,7 @@ BtPhysTest::BtPhysTest(bool editor)
NewPhyobj->SetTransform(NewPosition, NewRotation);
Ticker::Ref(NewPhyobj);
m_ground_list << NewPhyobj;
}
}
}

if (USE_PLATFORM)


+ 1
- 2
test/Physics/Include/EasyCharacterController.h View File

@@ -18,9 +18,8 @@
#define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__

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

namespace lol


+ 0
- 1
test/Physics/Include/EasyConstraint.h View File

@@ -18,7 +18,6 @@
#define __EASYCONSTRAINT_EASYCONSTRAINT_H__

#ifdef HAVE_PHYS_USE_BULLET
#include "core.h"
#include "EasyPhysics.h"
#endif



+ 1
- 3
test/Physics/Include/EasyPhysics.h View File

@@ -19,9 +19,7 @@

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

namespace lol


+ 1
- 2
test/Physics/Include/LolPhysics.h View File

@@ -11,9 +11,8 @@
#ifdef HAVE_PHYS_USE_BULLET
#include <bullet/btBulletDynamicsCommon.h>
#include <bullet/btBulletCollisionCommon.h>
#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
#include "LolBtPhysicsIntegration.h"
#include "EasyPhysics.h"
#include "EasyConstraint.h"
#endif

namespace lol


+ 2
- 2
test/Physics/Src/EasyCharacterController.cpp View File

@@ -14,9 +14,9 @@
# include "config.h"
#endif

#include "../Include/LolBtPhysicsIntegration.h"
#include "../Include/LolPhysics.h"
#ifdef HAVE_PHYS_USE_BULLET
#include "../Include/EasyCharacterController.h"
#endif //HAVE_PHYS_USE_BULLET

namespace lol
{


+ 18
- 2
test/Physics/Src/EasyConstraint.cpp View File

@@ -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"
#endif //HAVE_PHYS_USE_BULLET

namespace lol
{


+ 3
- 2
test/Physics/Src/EasyPhysics.cpp View File

@@ -14,8 +14,9 @@
# include "config.h"
#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
{


Loading…
Cancel
Save