Fix compiler errors
This commit is contained in:
parent
9134d0af23
commit
9202c10795
|
@ -42,7 +42,7 @@
|
|||
#include <sstream>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
|
||||
|
||||
namespace se = simpleengine;
|
||||
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
#include "../../gfx/model.h"
|
||||
#include "simpleengine/vector.h"
|
||||
|
||||
#include <bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h>
|
||||
#include <bullet/BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <bullet/LinearMath/btDefaultMotionState.h>
|
||||
#include <bullet/LinearMath/btScalar.h>
|
||||
#include <bullet/LinearMath/btTransform.h>
|
||||
#include <bullet/LinearMath/btVector3.h>
|
||||
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
|
||||
#include <BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <LinearMath/btDefaultMotionState.h>
|
||||
#include <LinearMath/btScalar.h>
|
||||
#include <LinearMath/btTransform.h>
|
||||
#include <LinearMath/btVector3.h>
|
||||
|
||||
#include <bullet/btBulletDynamicsCommon.h>
|
||||
#include <btBulletDynamicsCommon.h>
|
||||
|
||||
namespace simpleengine::physics {
|
||||
class PhysicsSystem;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "../../vector.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btBoxShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btBoxShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class BoxShape {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCapsuleShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btCapsuleShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class CapsuleShape {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class CollisionShape {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <utility>
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btConeShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btConeShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class ConeShape {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCylinderShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btCylinderShape.h>
|
||||
#include "vector.h"
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <bullet/BulletCollision/CollisionShapes/btSphereShape.h>
|
||||
#include <BulletCollision/CollisionShapes/btSphereShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class SphereShape {
|
||||
|
|
|
@ -12,15 +12,15 @@
|
|||
#include "ecs/registry.h"
|
||||
#include "game.h"
|
||||
|
||||
#include <bullet/btBulletDynamicsCommon.h>
|
||||
#include <bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h>
|
||||
#include <bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
|
||||
#include <bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
|
||||
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
|
||||
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
|
||||
#include <bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
|
||||
#include <bullet/BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
#include <btBulletDynamicsCommon.h>
|
||||
#include <BulletCollision/CollisionDispatch/btCollisionDispatcher.h>
|
||||
#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
|
||||
#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
|
||||
#include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
|
||||
#include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
|
||||
#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
|
||||
#include <BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
|
Loading…
Reference in New Issue