diff options
Diffstat (limited to 'src/libjin/Graphics/je_graphic.h')
-rw-r--r-- | src/libjin/Graphics/je_graphic.h | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/libjin/Graphics/je_graphic.h b/src/libjin/Graphics/je_graphic.h index 3410d61..2ed028d 100644 --- a/src/libjin/Graphics/je_graphic.h +++ b/src/libjin/Graphics/je_graphic.h @@ -16,9 +16,8 @@ namespace JinEngine // // Graphic - // |-Texture - // |-Canvas - // |-TextureFont + // |- GraphicSingle + // |- GraphicBatch // /// @@ -28,7 +27,7 @@ namespace JinEngine { public: /// - /// + /// /// Graphic(int w = 0, int h = 0); @@ -45,16 +44,6 @@ namespace JinEngine /// /// /// - void render(int x, int y, float sx = 1, float sy = 1, float r = 0, float ox = 0, float oy = 0); - - /// - /// - /// - void render(const Math::Quad& slice, int x, int y, float sx = 1, float sy = 1, float r = 0, float ox = 0, float oy = 0); - - /// - /// - /// inline int getWidth() const { return mSize.w; } /// @@ -63,9 +52,11 @@ namespace JinEngine inline int getHeight() const { return mSize.h; } /// - /// + /// Get opengl texture token. + /// + /// @return OpenGL texture token. /// - inline GLuint getTexture() const { return mTexture; } + inline GLuint getGLTexture() const { return mTexture; } /// /// @@ -73,14 +64,11 @@ namespace JinEngine void setFilter(GLint min, GLint max); protected: - GLuint mTexture; + JinEngine::Math::Vector2<uint> mSize; private: - JinEngine::Math::Vector2<uint> mSize; - // Screen coordinates and uv coordinates. - float mVertexCoords[8]; - float mTextureCoords[8]; - + GLuint mTexture; + }; } // namespace Graphics |