Merge remote-tracking branch 'origin/havok' into particles

Conflicts: src/Components/Vehicle.h
2014-05-12 15:43:41 +02:00
parent e0b5b72454 2aa51c3e90
commit 457ee84903
34 changed files with 1243 additions and 447 deletions
@@ -0,0 +1,23 @@
+#ifndef Components_Box_h__
+#define Components_Box_h__
+
+#include "Component.h"
+
+namespace Components
+{
+
+struct BoxShape : Component
+{
+	BoxShape()
+		: Width(1.f), Height(1.f), Depth(1.f){ }
+
+	float Width;
+	float Height;
+	float Depth;
+
+	virtual BoxShape* Clone() const override { return new BoxShape(*this); }
+};
+
+}
+
+#endif // Components_Box_h__