Physics!!!!!1111oneoneonetwo

This commit is contained in:
ViktorLjung
2014-04-06 03:39:50 +02:00
parent d6fc82c91e
commit 1d0747076f
12 changed files with 373 additions and 18 deletions
+3 -1
View File
@@ -8,7 +8,9 @@ namespace Components
struct BoxShape : Component
{
float height, width;
float Height;
float Width;
float Depth;
};
}
+3 -4
View File
@@ -1,7 +1,6 @@
#ifndef Components_Physics_h__
#define Components_Physics_h__
//#include "btBulletDynamicsCommon.h"
#include "Component.h"
namespace Components
@@ -9,9 +8,9 @@ namespace Components
struct Physics : Component
{
float Mass;
float Inertia[3];
//btRigidBody RigidBody;
float Mass = 0;
float Friction = 0;
glm::vec3 Gravity = glm::vec3(0, -9.82f, 0);
};
}
+2 -1
View File
@@ -8,7 +8,8 @@ namespace Components
struct SphereShape : Component
{
float radius;
float Radius;
float RollingFriction;
};
}