修改JSL

1 files changed, 11 insertions, 2 deletions

diff --git a/src/libjin/render/jsl.h b/src/libjin/render/jsl.h
index 4e0a6f0..80ef4dc 100644
--- a/src/libjin/render/jsl.h
+++ b/src/libjin/render/jsl.h
@@ -3,7 +3,9 @@
 
 #include <string>
 #include <map>
+#include "color.h"
 #include "image.h"
+#include "canvas.h"
 #include "3rdparty/GLee/GLee.h"
 
 namespace jin
@@ -23,15 +25,22 @@ namespace render
 
         void sendFloat(const char* name, float number);
         void sendImage(const char*  name, const Image* image);
+		void sendVec2(const char* name, float x, float y);
+		void sendVec3(const char* name, float x, float y, float z);
+		void sendVec4(const char* name, float x, float y, float z, float w);
+		void sendCanvas(const char* name, const Canvas* canvas);
+		void sendColor(const char* name, const color* col);
        
     private:
 
         JSLProgram();
 
         GLuint pid; 
+		
+		static JSLProgram* current_JSL_program;
 
-        static GLint _current_texture_unit;
-		static GLint _max_texture_units;
+        static GLint current_texture_unit;
+		static GLint max_texture_units;
 		static GLint getTextureUnit(const std::string& name);
     };