Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/) Options: --style=allman --indent=tab --keep-one-line-blocks --align-pointer=type --align-reference=name
This commit is contained in:
+26
-26
@@ -19,34 +19,34 @@
|
||||
namespace Systems
|
||||
{
|
||||
|
||||
class PhysicsSystem : public System
|
||||
class PhysicsSystem : public System
|
||||
{
|
||||
public:
|
||||
PhysicsSystem(World* world);
|
||||
void Update(double dt) override;
|
||||
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
|
||||
void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
|
||||
void OnComponentRemoved(std::string type, Component* component) override;
|
||||
|
||||
private:
|
||||
btBroadphaseInterface* m_Broadphase;
|
||||
btDefaultCollisionConfiguration* m_CollisionConfiguration;
|
||||
btCollisionDispatcher* m_Dispatcher;
|
||||
btSequentialImpulseConstraintSolver* m_Solver;
|
||||
btDiscreteDynamicsWorld* m_DynamicsWorld;
|
||||
|
||||
struct PhysicsData
|
||||
{
|
||||
public:
|
||||
PhysicsSystem(World* world);
|
||||
void Update(double dt) override;
|
||||
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
|
||||
void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
|
||||
void OnComponentRemoved(std::string type, Component* component) override;
|
||||
|
||||
private:
|
||||
btBroadphaseInterface* m_Broadphase;
|
||||
btDefaultCollisionConfiguration* m_CollisionConfiguration;
|
||||
btCollisionDispatcher* m_Dispatcher;
|
||||
btSequentialImpulseConstraintSolver* m_Solver;
|
||||
btDiscreteDynamicsWorld* m_DynamicsWorld;
|
||||
|
||||
struct PhysicsData
|
||||
{
|
||||
btRigidBody* RigidBody;
|
||||
btMotionState* MotionState;
|
||||
btCollisionShape* CollisionShape;
|
||||
};
|
||||
std::map<EntityID, PhysicsData> m_PhysicsData;
|
||||
std::map<std::pair<EntityID, EntityID>, btTypedConstraint*> m_Constraints;
|
||||
|
||||
void SetUpPhysicsState(EntityID entity, EntityID parent);
|
||||
void TearDownPhysicsState(EntityID entity, EntityID parent);
|
||||
btRigidBody* RigidBody;
|
||||
btMotionState* MotionState;
|
||||
btCollisionShape* CollisionShape;
|
||||
};
|
||||
std::map<EntityID, PhysicsData> m_PhysicsData;
|
||||
std::map<std::pair<EntityID, EntityID>, btTypedConstraint*> m_Constraints;
|
||||
|
||||
void SetUpPhysicsState(EntityID entity, EntityID parent);
|
||||
void TearDownPhysicsState(EntityID entity, EntityID parent);
|
||||
};
|
||||
}
|
||||
|
||||
#endif // PhysicsSystem_h__
|
||||
|
||||
Reference in New Issue
Block a user