Colors now working correcly.

2014-05-30 22:45:00 +02:00
parent ed803733da
commit 0e612cb3f3
6 changed files with 47 additions and 39 deletions
@@ -4,16 +4,15 @@
 #include <string>

 #include "Component.h"
-#include "Color.h"

 namespace Components
 {

 struct Model : Component
 {
-	Model() : Visible(true), ShadowCaster(true), Transparent(false) { }
+	Model() : Color(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)), Visible(true), ShadowCaster(true), Transparent(false) { }
 	std::string ModelFile;
-	Color Color;
+	glm::vec4 Color;
 	bool Visible;
 	bool ShadowCaster;
 	bool Transparent;