Create Shader class as a base for vertex and pixel shader

1 files changed, 14 insertions, 6 deletions

diff --git a/src/RenderBackend/OpenGL/ShaderVec.cpp b/src/RenderBackend/OpenGL/ShaderVec.cpp
index dd3bbe5..8897b84 100644
--- a/src/RenderBackend/OpenGL/ShaderVec.cpp
+++ b/src/RenderBackend/OpenGL/ShaderVec.cpp
@@ -1,6 +1,5 @@
 #include "../../../include/RenderBackend/OpenGL/ShaderVec.hpp"
-#include "../../../include/RenderBackend/OpenGL/VertexShader.hpp"
-#include "../../../include/RenderBackend/OpenGL/PixelShader.hpp"
+#include "../../../include/RenderBackend/OpenGL/Shader.hpp"
 #include "../../../include/RenderBackend/OpenGL/ShaderProgram.hpp"
 #include "../../../include/RenderBackend/OpenGL/opengl.hpp"
 #include <cstring>
@@ -16,7 +15,16 @@ namespace amalgine
         {
             return AttributeType::VEC2;
         }
+        else if(strncmp(attributeName, "vec3", 4) == 0)
+        {
+            return AttributeType::VEC3;
+        }
+        else if(strncmp(attributeName, "vec4", 4) == 0)
+        {
+            return AttributeType::VEC4;
+        }
         
+        assert(false);
         return AttributeType::NONE;
     }
     
@@ -28,13 +36,13 @@ namespace amalgine
     
     const string& ShaderInputVec2::getName() const
     {
-        return vertexShader->getInputAttributeName(attributeIndex);
+        return shader->getInputAttributeName(attributeIndex);
     }
     
     void ShaderInputVec2::setData(const DeviceMemory &data)
     {
         data.use();
-        AttributeType attributeType = vertexShader->getInputAttributeType(attributeIndex);
+        AttributeType attributeType = shader->getInputAttributeType(attributeIndex);
         switch(attributeType)
         {
             case AttributeType::VEC2:
@@ -51,11 +59,11 @@ namespace amalgine
     
     const string& ShaderOutputVec4::getName() const
     {
-        return pixelShader->getOutputAttributeName(attributeIndex);
+        return shader->getOutputAttributeName(attributeIndex);
     }
     
     void ShaderOutputVec4::operator=(const ShaderVec4 &shaderVec4)
     {
-        pixelShader->assign(*this, shaderVec4);
+        shader->assign(*this, shaderVec4);
     }
 }