SeanOMik
/
SimpleEngine
mirror of https://github.com/SeanOMik/SimpleEngine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup a tiny bit

This commit is contained in:
SeanOMik 2022-11-11 00:01:17 -05:00
parent bac1ff4a00
commit 9134d0af23
Signed by: SeanOMik
GPG Key ID: 568F326C7EB33ACB
7 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/simpleengine/physics/collision/box_shape.h
View File

@ -1,14 +1,12 @@
#pragma once #pragma once
#include "../../vector.h" #include "../../vector.h"
#include <BulletCollision/CollisionShapes/btBoxShape.h> #include <bullet/BulletCollision/CollisionShapes/btBoxShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class BoxShape { class BoxShape {
btBoxShape inner; btBoxShape inner;
public: public:
BoxShape() = default;
BoxShape(btBoxShape inner) : inner(inner) { BoxShape(btBoxShape inner) : inner(inner) {
} }

4
include/simpleengine/physics/collision/capsule_shape.h
View File

@ -1,13 +1,11 @@
#pragma once #pragma once
#include "BulletCollision/CollisionShapes/btCapsuleShape.h" #include <bullet/BulletCollision/CollisionShapes/btCapsuleShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class CapsuleShape { class CapsuleShape {
btCapsuleShape inner; btCapsuleShape inner;
public: public:
CapsuleShape() = default;
CapsuleShape(btCapsuleShape inner) : inner(inner) { CapsuleShape(btCapsuleShape inner) : inner(inner) {
} }

2
include/simpleengine/physics/collision/collision_shape.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "BulletCollision/CollisionShapes/btCollisionShape.h" #include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class CollisionShape { class CollisionShape {

4
include/simpleengine/physics/collision/cone_shape.h
View File

@ -2,14 +2,12 @@
#include <utility> #include <utility>
#include "BulletCollision/CollisionShapes/btConeShape.h" #include <bullet/BulletCollision/CollisionShapes/btConeShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class ConeShape { class ConeShape {
btConeShape inner; btConeShape inner;
public: public:
ConeShape() = default;
ConeShape(btConeShape inner) : inner(std::move(inner)) { ConeShape(btConeShape inner) : inner(std::move(inner)) {
} }

4
include/simpleengine/physics/collision/cylinder_shape.h
View File

@ -1,14 +1,12 @@
#pragma once #pragma once
#include "BulletCollision/CollisionShapes/btCylinderShape.h" #include <bullet/BulletCollision/CollisionShapes/btCylinderShape.h>
#include "vector.h" #include "vector.h"
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class CylinderShape { class CylinderShape {
btCylinderShape inner; btCylinderShape inner;
public: public:
CylinderShape() = default;
CylinderShape(btCylinderShape inner) : inner(inner) { CylinderShape(btCylinderShape inner) : inner(inner) {
} }

4
include/simpleengine/physics/collision/sphere_shape.h
View File

@ -1,13 +1,11 @@
#pragma once #pragma once
#include "BulletCollision/CollisionShapes/btSphereShape.h" #include <bullet/BulletCollision/CollisionShapes/btSphereShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class SphereShape { class SphereShape {
btSphereShape inner; btSphereShape inner;
public: public:
SphereShape() = default;
SphereShape(btSphereShape inner) : inner(inner) { SphereShape(btSphereShape inner) : inner(inner) {
} }

8
src/physics/physics_system.cpp
View File

@ -1,4 +1,3 @@
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
#include "ecs/component/box_collider_component.h" #include "ecs/component/box_collider_component.h"
#include "ecs/component/sphere_collider_component.h" #include "ecs/component/sphere_collider_component.h"
#include "ecs/component/cylinder_collider_component.h" #include "ecs/component/cylinder_collider_component.h"
@ -14,13 +13,14 @@
#include "game.h" #include "game.h"
#include <bullet/btBulletDynamicsCommon.h> #include <bullet/btBulletDynamicsCommon.h>
#include <BulletCollision/CollisionDispatch/btCollisionDispatcher.h> #include <bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h>
#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h> #include <bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
#include <bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h> #include <bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h> #include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h> #include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
#include <bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.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> #include <memory>