Changed color values from floats to glm::vec4

2016-01-24 14:18:04 +01:00
parent b5b1140f5c
commit 8286d052b3
6 changed files with 18 additions and 8 deletions
@@ -48,9 +48,9 @@ public:
    {
        float SpecularExponent;
        float ReflectionFactor;
-        float DiffuseColor[3];
-        float SpecularColor[3];
-        float IncandescenceColor[3];
+        glm::vec4 DiffuseColor{ 1.0f, 1.0f, 1.0f, 1.0f };
+        glm::vec4 SpecularColor{ 1.0f, 1.0f, 1.0f, 1.0f };
+        glm::vec4 IncandescenceColor{ 1.0f, 1.0f, 1.0f, 1.0f };
        unsigned int StartIndex;
        unsigned int EndIndex;
        //float Transparency;