From 1d54138b94a384917d47abd8109c586b1b7ac323 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 25 Nov 2018 13:08:56 +0800
Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/graphics/je_gl.h | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/libjin/graphics/je_gl.h')

diff --git a/src/libjin/graphics/je_gl.h b/src/libjin/graphics/je_gl.h
index 4f53152..ee0194e 100644
--- a/src/libjin/graphics/je_gl.h
+++ b/src/libjin/graphics/je_gl.h
@@ -18,6 +18,9 @@ namespace JinEngine
 
         namespace Shaders { class Shader; };
         namespace Fonts { class Font; };
+
+        class Texture;
+
         class Canvas;
 
 		class OpenGL
@@ -130,22 +133,22 @@ namespace JinEngine
             /// 
             /// 
             /// 
-            void useShader();
+            void useShader(const Shaders::Shader* shader);
 
             /// 
             /// 
             /// 
-            void useFont(); 
+            void useFont(const Fonts::Font* font);
 
             /// 
             /// 
             /// 
-            void useCanvas();
+            void useCanvas(const Canvas* canvas);
 
             ///
             ///
             ///
-            void unUseShader();
+            void unuseShader();
 
             ///
             ///
@@ -177,31 +180,33 @@ namespace JinEngine
             ///
             ///
             ///
-            Color mCurrentColor;
+            Color mColor;
 
             ///
             ///
             ///
             BlendMode mBlendMode;
 
-            struct { GLubyte r, g, b, a; } mColor;    // current draw color
-            struct { GLubyte r, g, b, a; } mPrecolor; // previous draw color
-            GLuint mTexture;                          // current binded texture
+            //struct { GLubyte r, g, b, a; } mColor;     // current draw color
+            //struct { GLubyte r, g, b, a; } mBackColor; // previous draw color
+            Color mBackColor;
+
+            GLuint mTexture;                           // current binded texture
 
             ///
             ///
             ///
-            Canvas* mCurrentCanvas;
+            Canvas* mCanvas;
 
             ///
             ///
             ///
-            Shaders::Shader* mCurrentShader;
+            Shaders::Shader* mShader;
 
             ///
             ///
             ///
-            Fonts::Font* mCurrentFont;
+            Fonts::Font* mFont;
 
 		};
 
-- 
cgit v1.1-26-g67d0