+bitmap

1 files changed, 7 insertions, 7 deletions

diff --git a/src/libjin/Graphics/Shader.cpp b/src/libjin/Graphics/Shader.cpp
index a40f78d..45ad3d6 100644
--- a/src/libjin/Graphics/Shader.cpp
+++ b/src/libjin/Graphics/Shader.cpp
@@ -72,7 +72,7 @@ namespace graphics
     {
         glUseProgram(pid);
         currentJSLProgram = this;
-        bindDefaultTex();
+        bindDefaultTexture();
     }
 
     /*static*/ void JSLProgram::unuse()
@@ -81,7 +81,7 @@ namespace graphics
         currentJSLProgram = nullptr;
     }
 
-    void JSLProgram::bindDefaultTex()
+    void JSLProgram::bindDefaultTexture()
     {
         int loc = glGetUniformLocation(pid, default_tex);
         glUniform1i(loc, DEFAULT_TEX_UNIT);
@@ -181,15 +181,15 @@ namespace graphics
         glUniform4f(loc, x, y, z, w);
     }
     
-    void JSLProgram::sendColor(const char* name, const color* col) 
+    void JSLProgram::sendColor(const char* name, const Color* col) 
     {
         checkJSL();
         int loc = glGetUniformLocation(pid, name);
         glUniform4f(loc,
-            col->rgba.r / 255.f,
-            col->rgba.g / 255.f,
-            col->rgba.b / 255.f,
-            col->rgba.a / 255.f
+            col->r / 255.f,
+            col->g / 255.f,
+            col->b / 255.f,
+            col->a / 255.f
         );
     }