*合并master到minimal分支

1 files changed, 47 insertions, 49 deletions

diff --git a/src/libjin/Graphics/je_graphic.cpp b/src/libjin/Graphics/je_graphic.cpp
index 831e409..6f3ff58 100644
--- a/src/libjin/Graphics/je_graphic.cpp
+++ b/src/libjin/Graphics/je_graphic.cpp
@@ -5,9 +5,11 @@
 
 #include "../math/je_matrix.h"
 
-#include "shader/je_shader.h"
+#include "shaders/je_shader.h"
 #include "je_graphic.h"
 
+using namespace JinEngine::Graphics::Shaders;
+
 namespace JinEngine
 {
     namespace Graphics
@@ -17,32 +19,14 @@ namespace JinEngine
             : mTexture(0)
             , mSize(w, h)
         {
-            mVertexCoords[0] = 0; mVertexCoords[1] = 0;
-            mVertexCoords[2] = 0; mVertexCoords[3] = h;
-            mVertexCoords[4] = w; mVertexCoords[5] = h;
-            mVertexCoords[6] = w; mVertexCoords[7] = 0;
-
-            mTextureCoords[0] = 0; mTextureCoords[1] = 0;
-            mTextureCoords[2] = 0; mTextureCoords[3] = 1;
-            mTextureCoords[4] = 1; mTextureCoords[5] = 1;
-            mTextureCoords[6] = 1; mTextureCoords[7] = 0;
+            mTexture = gl.genTexture();
         }
 
         Graphic::Graphic(const Bitmap* bitmap)
             : mTexture(0)
         {
-            uint32 w = mSize.w = bitmap->getWidth();
-            uint32 h = mSize.h = bitmap->getHeight();
-
-            mVertexCoords[0] = 0; mVertexCoords[1] = 0;
-            mVertexCoords[2] = 0; mVertexCoords[3] = h;
-            mVertexCoords[4] = w; mVertexCoords[5] = h;
-            mVertexCoords[6] = w; mVertexCoords[7] = 0;
-
-            mTextureCoords[0] = 0; mTextureCoords[1] = 0;
-            mTextureCoords[2] = 0; mTextureCoords[3] = 1;
-            mTextureCoords[4] = 1; mTextureCoords[5] = 1;
-            mTextureCoords[6] = 1; mTextureCoords[7] = 0;
+            mSize.w = bitmap->getWidth();
+            mSize.h = bitmap->getHeight();
 
             const Color* pixels = bitmap->getPixels();
 
@@ -50,7 +34,7 @@ namespace JinEngine
             gl.bindTexture(mTexture);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            gl.texImage(GL_RGBA8, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+            gl.texImage(GL_RGBA8, mSize.w, mSize.h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
             gl.bindTexture(0);
         }
 
@@ -59,49 +43,63 @@ namespace JinEngine
             glDeleteTextures(1, &mTexture);
         }
 
-        void Graphic::draw(int x, int y, float sx, float sy, float r, float ox, float oy)
+        void Graphic::render(int x, int y, float sx, float sy, float r, float ox, float oy) const
         {
             gl.ModelMatrix.setTransformation(x, y, r, sx, sy, ox, oy);
+            int w = getWidth(), h = getHeight();
+            static float vertexCoords[8];
+            static float textureCoords[8];
+            // Set vertex coordinates.
+            vertexCoords[0] = 0; vertexCoords[1] = 0;
+            vertexCoords[2] = 0; vertexCoords[3] = h;
+            vertexCoords[4] = w; vertexCoords[5] = h;
+            vertexCoords[6] = w; vertexCoords[7] = 0;
+            // Set texture coordinates.
+            textureCoords[0] = 0; textureCoords[1] = 0;
+            textureCoords[2] = 0; textureCoords[3] = 1;
+            textureCoords[4] = 1; textureCoords[5] = 1;
+            textureCoords[6] = 1; textureCoords[7] = 0;
+            // Set shader.
+            Shader* shader = Shader::getCurrentShader();
+            shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix));
+            shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+            shader->setVertexPointer(2, GL_FLOAT, 0, vertexCoords);
+            shader->setUVPointer(2, GL_FLOAT, 0, textureCoords);
 
-		    Shader* shader = Shader::getCurrentShader();
-		    shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-		    shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
-		    shader->bindVertexPointer(2, GL_FLOAT, 0, mVertexCoords);
-		    shader->bindUVPointer(2, GL_FLOAT, 0, mTextureCoords);
-
-            gl.bindTexture(mTexture);
+            gl.bindTexture(getGLTexture());
             gl.drawArrays(GL_QUADS, 0, 4);
             gl.bindTexture(0);
         }
-		
-        void Graphic::draw(const Math::Quad& slice, int x, int y, float sx, float sy, float r, float ax, float ay)
+
+        void Graphic::render(const Math::Quad& slice, int x, int y, float sx, float sy, float r, float ax, float ay) const
         {
-            float vertCoords[8] = {
-                0,       0, 
-                0,       slice.h,
-                slice.w, slice.h,
-                slice.w, 0
-            };
+            static float vertexCoords[8];
+            static float textureCoords[8];
+
+            // Set vertex coordinates.
+            vertexCoords[0] = 0;       vertexCoords[1] = 0;
+            vertexCoords[2] = 0;       vertexCoords[3] = slice.h;
+            vertexCoords[4] = slice.w; vertexCoords[5] = slice.h;
+            vertexCoords[6] = slice.w; vertexCoords[7] = 0;
+            // Set texture coordinates.
             float slx = slice.x / mSize.w;
             float sly = slice.y / mSize.h;
             float slw = slice.w / mSize.w;
             float slh = slice.h / mSize.h;
-            float texCoords[8] = {
-                slx,       sly, 
-                slx,       sly + slh,
-                slx + slw, sly + slh, 
-                slx + slw, sly
-            };
+            textureCoords[0] = slx; textureCoords[1] = sly;
+            textureCoords[2] = slx; textureCoords[3] = sly + slh;
+            textureCoords[4] = slx + slw; textureCoords[5] = sly + slh;
+            textureCoords[6] = slx + slw; textureCoords[7] = sly;
 
             gl.ModelMatrix.setTransformation(x, y, r, sx, sy, ax, ay);
 
             Shader* shader = Shader::getCurrentShader();
-            shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+            shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix));
             shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
-            shader->bindVertexPointer(2, GL_FLOAT, 0, vertCoords);
-            shader->bindUVPointer(2, GL_FLOAT, 0, texCoords);
+            shader->setVertexPointer(2, GL_FLOAT, 0, vertexCoords);
+            shader->setUVPointer(2, GL_FLOAT, 0, textureCoords);
 
-            gl.bindTexture(mTexture);
+            gl.bindTexture(getGLTexture());
             gl.drawArrays(GL_QUADS, 0, 4);
             gl.bindTexture(0);
         }