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

Fix compiler errors

This commit is contained in:
SeanOMik 2022-11-20 13:08:12 -05:00
parent 9134d0af23
commit 9202c10795
Signed by: SeanOMik
GPG Key ID: 568F326C7EB33ACB
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dev_testing/src/main.cpp
View File

@ -42,7 +42,7 @@
#include <sstream> #include <sstream>
#include <stdint.h> #include <stdint.h>
#include <bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h> #include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
namespace se = simpleengine; namespace se = simpleengine;

14
include/simpleengine/ecs/component/rigid_body_component.h
View File

@ -3,14 +3,14 @@
#include "../../gfx/model.h" #include "../../gfx/model.h"
#include "simpleengine/vector.h" #include "simpleengine/vector.h"
#include <bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h> #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
#include <bullet/BulletDynamics/Dynamics/btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include <bullet/LinearMath/btDefaultMotionState.h> #include <LinearMath/btDefaultMotionState.h>
#include <bullet/LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
#include <bullet/LinearMath/btTransform.h> #include <LinearMath/btTransform.h>
#include <bullet/LinearMath/btVector3.h> #include <LinearMath/btVector3.h>
#include <bullet/btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
namespace simpleengine::physics { namespace simpleengine::physics {
class PhysicsSystem; class PhysicsSystem;

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

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "../../vector.h" #include "../../vector.h"
#include <bullet/BulletCollision/CollisionShapes/btBoxShape.h> #include <BulletCollision/CollisionShapes/btBoxShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class BoxShape { class BoxShape {

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

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

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

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

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

@ -2,7 +2,7 @@
#include <utility> #include <utility>
#include <bullet/BulletCollision/CollisionShapes/btConeShape.h> #include <BulletCollision/CollisionShapes/btConeShape.h>
namespace simpleengine::physics::collision { namespace simpleengine::physics::collision {
class ConeShape { class ConeShape {

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

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

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

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

18
src/physics/physics_system.cpp
View File

@ -12,15 +12,15 @@
#include "ecs/registry.h" #include "ecs/registry.h"
#include "game.h" #include "game.h"
#include <bullet/btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h> #include <BulletCollision/CollisionDispatch/btCollisionDispatcher.h>
#include <bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h> #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
#include <bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h> #include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h> #include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
#include <bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h> #include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
#include <bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> #include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
#include <bullet/BulletDynamics/Dynamics/btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include <bullet/BulletCollision/CollisionShapes/btCollisionShape.h> #include <BulletCollision/CollisionShapes/btCollisionShape.h>
#include <memory> #include <memory>