From 0056e468d9c3291443d87bfc05441e375a315433 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 16 Nov 2018 08:15:30 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0gl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/je_gl.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 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 1dddab3..03bd26a 100644 --- a/src/libjin/Graphics/je_gl.h +++ b/src/libjin/Graphics/je_gl.h @@ -14,19 +14,20 @@ namespace JinEngine namespace Graphics { - class OpenGL : public ogl2d::OpenGL + class OpenGL + : public ogl2d::OpenGL { public: /// /// /// Math::Matrix ProjectionMatrix; - +/* /// /// /// Math::Matrix ModelMatrix; - +*/ /// /// /// @@ -50,11 +51,13 @@ namespace JinEngine void rotate(float r); - const Math::Matrix& getMatrix() { return mMatrix; }; + Math::Matrix getModelMatrix(float x, float y, float sx, float sy, float r, float ox, float oy); + + Math::Matrix getModelMatrix(); private: - void calcMatrix(); + void solve(); Color mCurrentColor; std::vector mMatrices; -- cgit v1.1-26-g67d0