Merge branch 'master' into havok

Conflicts: assets src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-17 21:23:46 +02:00
parent a8ecacab11 542ad075ea
commit a36d6c554a
40 changed files with 1394 additions and 883 deletions
@@ -9,13 +9,22 @@ namespace Components

 struct PointLight : Component
 {
-	float Intensity;
-	float MaxRange;
+	PointLight() 
+		: Specular(1.0f, 1.0f, 1.0f)
+		, Diffuse(1.0f, 1.0f, 1.0f)
+		, specularExponent(50.0f)
+		, ConstantAttenuation(1.0f)
+		, LinearAttenuation(0.f)
+		, QuadraticAttenuation(3.f)
+	{ }
+
+	float ConstantAttenuation, LinearAttenuation, QuadraticAttenuation;
+	Color color;
+
 	glm::vec3 Specular;
 	glm::vec3 Diffuse;
-	float constantAttenuation, linearAttenuation, quadraticAttenuation;
-	float spotExponent;
-	Color color;
+	float specularExponent;
+	float Scale;
 	
 	virtual PointLight* Clone() const override { return new PointLight(*this); }
 };