Merge branch 'havok'

Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Components/BallSocketConstraint.h

@@ -1,19 +0,0 @@
-#ifndef Components_BallSocketConstraint_h__
-#define Components_BallSocketConstraint_h__
-
-#include "Component.h"
-
-namespace Components
-{
-// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
-struct BallSocketConstraint : Component
-{
-	// Create constraint between these entities
-	EntityID EntityA;
-	EntityID EntityB;
-	// The pivot point in local coordinates
-	glm::vec3 PivotA;
-	glm::vec3 PivotB;
-};
-}
-#endif // Components_BallSocketConstraint_h__

src/Components/Box.h

@@ -0,0 +1,21 @@
+#ifndef Components_Box_h__
+#define Components_Box_h__
+
+#include "Component.h"
+
+namespace Components
+{
+
+struct Box : Component
+{
+	Box()
+		: Width(1.f), Height(1.f), Depth(1.f){ }
+
+	float Width;
+	float Height;
+	float Depth;
+};
+
+}
+
+#endif // Components_Box_h__

src/Components/BoxShape.h

@@ -1,18 +0,0 @@
-#ifndef Components_BoxShape_h__
-#define Components_BoxShape_h__
-
-#include "Component.h"
-
-namespace Components
-{
-
-struct BoxShape : Component
-{
-	float Height;
-	float Width;
-	float Depth;
-};
-
-}
-
-#endif // !Components_BoxShape_h__

src/Components/CompoundShape.h

@@ -1,14 +0,0 @@
-#ifndef Components_CompoundShape_h__
-#define Components_CompoundShape_h__
-
-#include "Component.h"
-
-namespace Components
-{
-struct CompoundShape : Component
-{
-
-};
-}
-
-#endif // Components_CompoundShape_h__

src/Components/CustomShape.h

@@ -1,17 +0,0 @@
-#ifndef Components_CustomShape_h__
-#define Components_CustomShape_h__
-
-#include "Component.h"
-#include <string>
-
-namespace Components
-{
-
-struct CustomShape : Component
-{
-	std::string fileName;
-};
-
-}
-
-#endif // !Components_CustomShape_h__

src/Components/FreeSteering.h

@@ -7,7 +7,8 @@ namespace Components
 {
 struct FreeSteering : Component
 {
-	float Speed = 35;
+	FreeSteering() : Speed(35) { }
+	float Speed;
 };
 }
 

src/Components/HingeConstraint.h

@@ -1,35 +0,0 @@
-#ifndef Components_HingeConstraint_h__
-#define Components_HingeConstraint_h__
-
-#include "Component.h"
-
-namespace Components
-{
-// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
-struct HingeConstraint : Component
-{
-	// Create constraint between these entities
-	EntityID EntityA;
-	EntityID EntityB;
-	// The pivot point in local coordinates
-	glm::vec3 PivotA;
-	glm::vec3 PivotB;
-	// The axis to rotate around
-	glm::vec3 AxisA;
-	glm::vec3 AxisB;
-
-	/*
-		void setLimit(btScalar low,
-					  btScalar high,
-					  btScalar softness = 0.9f,
-					  btScalar_biasFactor = 0.3f,
-					  btScalar relaxationFactor = 1.0f)
-	*/
-	float LowLimit;
-	float HighLimit;
-	float Softness = 0.9f;
-	float BiasFactor = 0.3f;
-	float RelaxationFactor = 1.0f;
-};
-}
-#endif // Components_HingeConstraint_h__

src/Components/MeshShape.h

@@ -1,14 +0,0 @@
-#ifndef Components_MeshShape_h__
-#define Components_MeshShape_h__
-
-#include "Component.h"
-
-namespace Components
-{
-struct MeshShape : Component
-{
-	std::string Filename;
-};
-}
-
-#endif // Components_MeshShape_h__

src/Components/Physics.h

@@ -8,11 +8,12 @@ namespace Components
 
 struct Physics : Component
 {
-	float Mass			= 0;
-	float Friction		= 0;
-	glm::vec3 Gravity = glm::vec3(0, -9.82f, 0);
+	Physics()
+		: Mass(0.f) { }
+
+	float Mass;
 };
 
 }
 
-#endif // !Components_Physics_h__
+#endif // Components_Physics_h__

src/Components/SliderConstraint.h

@@ -1,16 +0,0 @@
-#ifndef Components_SliderConstraint_h__
-#define Components_SliderConstraint_h__
-
-#include "Component.h"
-
-namespace Components
-{
-// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
-struct SliderConstraint : Component
-{
-	// Create constraint between these entities
-	EntityID EntityA;
-	EntityID EntityB;
-};
-}
-#endif // Components_SliderConstraint_h__

src/Components/SoundEmitter.h

@@ -10,11 +10,12 @@ namespace Components
 
 struct SoundEmitter : Component
 {
-	float Gain = 1.f;
-	float MaxDistance = 1.f;
-	float ReferenceDistance = 1.f;
-	float Pitch = 1.f;
-	bool Loop = false;
+	SoundEmitter() : Gain(1.f), MaxDistance(1.f), ReferenceDistance(1.f), Pitch(1.f), Loop(false) {}
+	float Gain;
+	float MaxDistance;
+	float ReferenceDistance;
+	float Pitch;
+	bool Loop;
 	std::string Path;
 };
 

src/Components/Sphere.h

@@ -0,0 +1,19 @@
+#ifndef Components_Sphere_h__
+#define Components_Sphere_h__
+
+#include "Component.h"
+
+namespace Components
+{
+
+struct Sphere : Component
+{
+	Sphere()
+		: Radius(1.f){ }
+
+	float Radius;
+};
+
+}
+
+#endif // Components_Sphere_h__

src/Components/SphereShape.h

@@ -1,17 +0,0 @@
-#ifndef Components_SphereShape_h__
-#define Components_SphereShape_h__
-
-#include "Component.h"
-
-namespace Components
-{
-
-struct SphereShape : Component
-{
-	float Radius;
-	float RollingFriction;
-};
-
-}
-
-#endif // !Components_SphereShape_h__

src/Components/StaticMeshShape.h

@@ -1,14 +0,0 @@
-#ifndef Components_StaticMeshShape_h__
-#define Components_StaticMeshShape_h__
-
-#include "Component.h"
-
-namespace Components
-{
-struct StaticMeshShape : Component
-{
-	std::string Filename;
-};
-}
-
-#endif // Components_StaticMeshShape_h__

src/Components/Vehicle.h

@@ -1,18 +0,0 @@
-#ifndef Components_Vehicle_h__
-#define Components_Vehicle_h__
-
-#include "Component.h"
-
-namespace Components
-{
-
-	struct Vehicle : Component
-{
-		
-
-		
-};
-
-}
-
-#endif // Components_Vehicle_h__

src/Components/Wheel.h

@@ -1,31 +0,0 @@
-#ifndef Components_Wheel_h__
-#define Components_Wheel_h__
-
-#include "Component.h"
-
-
-namespace Components
-{
-
-	struct Wheel : Component
-{
-		EntityID CarID;
-
-		glm::vec3 ConnectionPoint;
-		glm::vec3 Direction;
-		glm::vec3 Axle;
-		float SuspensionRestLength;
-		float Radius;
-		bool IsFrontWheel;
-
-		float 	SuspensionStiffness;
-		float 	SuspensionCompression;
-		float 	SuspensionDamping;
-		float 	MaxSuspensionTravelCm;
-		float 	FrictionSlip;
-		float 	MaxSuspensionForce;
-};
-
-}
-
-#endif // Components_Wheel_h__