*粒子系统

1 files changed, 9 insertions, 5 deletions

diff --git a/src/libjin/graphics/je_gl.cpp b/src/libjin/graphics/je_gl.cpp
index 745bbb2..c45a50e 100644
--- a/src/libjin/graphics/je_gl.cpp
+++ b/src/libjin/graphics/je_gl.cpp
@@ -1,6 +1,10 @@
 #define OGL2D_IMPLEMENT
 #include "je_gl.h"
 #include "je_color.h"
+#include "je_canvas.h"
+#include "je_texture.h"
+#include "shaders/je_shader.h"
+#include "fonts/je_font.h"
 
 using namespace JinEngine::Math;
 
@@ -15,7 +19,7 @@ namespace JinEngine
             : mBlendMode(BlendMode::NONE)
         {
             memset(&mColor, 0xff, sizeof(mColor));
-            memset(&mPrecolor, 0xff, sizeof(mPrecolor));
+            memset(&mBackColor, 0xff, sizeof(mBackColor));
             // Set default modelview matrix.
             mModelViewMatrices.push_back(Matrix());
             mModelViewMatrix.setIdentity();
@@ -29,7 +33,7 @@ namespace JinEngine
 
         void OpenGL::pushColor(GLubyte r, GLubyte g, GLubyte b, GLubyte a)
         {
-            memcpy(&mPrecolor, &mColor, sizeof(mPrecolor));
+            memcpy(&mBackColor, &mColor, sizeof(mBackColor));
             mColor.r = r;
             mColor.g = g;
             mColor.b = b;
@@ -54,7 +58,7 @@ namespace JinEngine
 
         void OpenGL::popColor()
         {
-            memcpy(&mColor, &mPrecolor, sizeof(mPrecolor));
+            memcpy(&mColor, &mBackColor, sizeof(mBackColor));
             glColor4ub(mColor.r, mColor.g, mColor.b, mColor.a);
         }
 
@@ -161,13 +165,13 @@ namespace JinEngine
 
         void OpenGL::setColor(Color c)
         {
-            mCurrentColor = c;
+            mColor = c;
             glColor4f(c.r / 255.f, c.g / 255.f, c.b / 255.f, c.a / 255.f);
         }
 
         Color OpenGL::getColor()
         {
-            return mCurrentColor;
+            return mColor;
         }
 
         void OpenGL::clearMatrix()