From 5bd4477d4cf413e90a6b9ef5c8991798a687a0ec Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 20 Nov 2018 08:35:18 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0sprite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/particles/je_particle.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/libjin/graphics/particles/je_particle.cpp') diff --git a/src/libjin/graphics/particles/je_particle.cpp b/src/libjin/graphics/particles/je_particle.cpp index 20e4b9e..1fa8bc2 100644 --- a/src/libjin/graphics/particles/je_particle.cpp +++ b/src/libjin/graphics/particles/je_particle.cpp @@ -1,5 +1,7 @@ #include "../../math/je_math.h" +#include "../je_sprite.h" + #include "je_particle.h" using namespace JinEngine::Math; @@ -11,8 +13,8 @@ namespace JinEngine namespace Particles { - Particle::Particle(const Graphic* grc) - : graphic(grc) + Particle::Particle(const Sprite* spr) + : sprite(spr) { reset(); } @@ -62,8 +64,13 @@ namespace JinEngine { Color c = gl.getColor(); gl.setColor(color); - if (graphic != nullptr) - graphic->render(transform); + if (sprite != nullptr) + { + Vector2& position = transform.getPosition(); + Vector2& scale = transform.getScale(); + float r = transform.getRotation(); + sprite->render(position.x, position.y, scale.x, scale.y, r); + } gl.getColor(); } -- cgit v1.1-26-g67d0