diff options
Diffstat (limited to 'src/libjin/Graphics/je_sprite.h')
-rw-r--r-- | src/libjin/Graphics/je_sprite.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/libjin/Graphics/je_sprite.h b/src/libjin/Graphics/je_sprite.h index 65e00eb..faf16df 100644 --- a/src/libjin/Graphics/je_sprite.h +++ b/src/libjin/Graphics/je_sprite.h @@ -41,36 +41,29 @@ namespace JinEngine void setPosition(float x, float y); void setScale(float sx, float sy); void setColor(Color color); - void setShader(Shaders::Shader* shader); void setGraphic(const Graphic* graphic); void move(float x, float y); void rotate(float r); void scale(float sx, float sy); - float getRotation() { return mRotation; } + float getRotation() { return mTransform.getRotation(); } Math::Vector2<int> getSize() { return Math::Vector2<int>(mQuad.w, mQuad.h); } const Math::Quad& getQuad() { return mQuad; } - const Math::Vector2<float>& getPosition() { return mPosition; } - const Math::Vector2<int>& getOrigin() { return mOrigin; } - const Math::Vector2<float>& getScale() { return mScale; } + const Math::Vector2<float>& getPosition() { return mTransform.getPosition(); } + const Math::Vector2<float>& getOrigin() { return mTransform.getOrigin(); } + const Math::Vector2<float>& getScale() { return mTransform.getScale(); } const Color& getColor() { return mColor; } const Graphic* getGraphic() { return mGraphic; } - const Shaders::Shader* getShader() { return mShader; } - /// - /// Render callback. - /// - virtual void render(); + void render(); private: /// /// Origin must be 0~1 float value. /// - Math::Vector2<float> mPosition; - Math::Vector2<int> mOrigin; - Math::Vector2<float> mScale; - float mRotation; + Math::Transform mTransform; + Color mColor; Math::Quad mQuad; @@ -78,7 +71,6 @@ namespace JinEngine bool mIsOriginEnum; Origin mOriginEnum; - Shaders::Shader* mShader; const Graphic* mGraphic; }; |