Code cleanup a tiny bit
This commit is contained in:
parent
bac1ff4a00
commit
9134d0af23
|
@ -1,14 +1,12 @@
|
|||
#pragma once
|
||||
|
||||
#include "../../vector.h"
|
||||
#include <BulletCollision/CollisionShapes/btBoxShape.h>
|
||||
#include <bullet/BulletCollision/CollisionShapes/btBoxShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class BoxShape {
|
||||
btBoxShape inner;
|
||||
public:
|
||||
BoxShape() = default;
|
||||
|
||||
BoxShape(btBoxShape inner) : inner(inner) {
|
||||
|
||||
}
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
#pragma once
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btCapsuleShape.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCapsuleShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class CapsuleShape {
|
||||
btCapsuleShape inner;
|
||||
public:
|
||||
CapsuleShape() = default;
|
||||
|
||||
CapsuleShape(btCapsuleShape inner) : inner(inner) {
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class CollisionShape {
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
|
||||
#include <utility>
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btConeShape.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btConeShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class ConeShape {
|
||||
btConeShape inner;
|
||||
public:
|
||||
ConeShape() = default;
|
||||
|
||||
ConeShape(btConeShape inner) : inner(std::move(inner)) {
|
||||
|
||||
}
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
#pragma once
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btCylinderShape.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCylinderShape.h>
|
||||
#include "vector.h"
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class CylinderShape {
|
||||
btCylinderShape inner;
|
||||
public:
|
||||
CylinderShape() = default;
|
||||
|
||||
CylinderShape(btCylinderShape inner) : inner(inner) {
|
||||
|
||||
}
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
#pragma once
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btSphereShape.h"
|
||||
#include <bullet/BulletCollision/CollisionShapes/btSphereShape.h>
|
||||
|
||||
namespace simpleengine::physics::collision {
|
||||
class SphereShape {
|
||||
btSphereShape inner;
|
||||
public:
|
||||
SphereShape() = default;
|
||||
|
||||
SphereShape(btSphereShape inner) : inner(inner) {
|
||||
|
||||
}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
|
||||
#include "ecs/component/box_collider_component.h"
|
||||
#include "ecs/component/sphere_collider_component.h"
|
||||
#include "ecs/component/cylinder_collider_component.h"
|
||||
|
@ -14,13 +13,14 @@
|
|||
#include "game.h"
|
||||
|
||||
#include <bullet/btBulletDynamicsCommon.h>
|
||||
#include <BulletCollision/CollisionDispatch/btCollisionDispatcher.h>
|
||||
#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.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 <BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <bullet/BulletDynamics/Dynamics/btRigidBody.h>
|
||||
#include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
|
|
Loading…
Reference in New Issue