From 6cb616689535c340b0b4f441c12ef8eb1ee42cb0 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 22 Dec 2018 10:58:06 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9vector=E8=AE=BF=E9=97=AE=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/particles/je_particle.cpp | 2 +- src/libjin/graphics/particles/je_particle_emitter.cpp | 8 ++++---- src/libjin/graphics/particles/je_particle_system.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libjin/graphics/particles') diff --git a/src/libjin/graphics/particles/je_particle.cpp b/src/libjin/graphics/particles/je_particle.cpp index 71c0426..c6bbf42 100644 --- a/src/libjin/graphics/particles/je_particle.cpp +++ b/src/libjin/graphics/particles/je_particle.cpp @@ -179,7 +179,7 @@ namespace JinEngine Vector2& position = transform.getPosition(); Vector2& scale = transform.getScale(); float r = transform.getRotation(); - sprite->render(position.x, position.y, scale.x, scale.y, r); + sprite->render(position.x(), position.y(), scale.x(), scale.y(), r); } gl.setColor(c); gl.setBlendMode(blend); diff --git a/src/libjin/graphics/particles/je_particle_emitter.cpp b/src/libjin/graphics/particles/je_particle_emitter.cpp index 47957b6..644fd6e 100644 --- a/src/libjin/graphics/particles/je_particle_emitter.cpp +++ b/src/libjin/graphics/particles/je_particle_emitter.cpp @@ -53,10 +53,10 @@ namespace JinEngine // Init position. if (mDef.positionDef.enableRandom) { - float x = rng.randf(mDef.positionDef.position.random.floor.x, mDef.positionDef.position.random.ceil.x, ACCURACY_4); - float y = rng.randf(mDef.positionDef.position.random.floor.y, mDef.positionDef.position.random.ceil.y, ACCURACY_4); - x += mPS.mPosition.x; - y += mPS.mPosition.y; + float x = rng.randf(mDef.positionDef.position.random.floor.x(), mDef.positionDef.position.random.ceil.x(), ACCURACY_4); + float y = rng.randf(mDef.positionDef.position.random.floor.y(), mDef.positionDef.position.random.ceil.y(), ACCURACY_4); + x += mPS.mPosition.x(); + y += mPS.mPosition.y(); p->transform.setPosition(x, y); } else diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/je_particle_system.cpp index d0cd4e0..ec25163 100644 --- a/src/libjin/graphics/particles/je_particle_system.cpp +++ b/src/libjin/graphics/particles/je_particle_system.cpp @@ -30,8 +30,8 @@ namespace JinEngine void ParticleSystem::setPosition(float x, float y) { - mPosition.x = x; - mPosition.y = y; + mPosition.x() = x; + mPosition.y() = y; } void ParticleSystem::update(float dt) -- cgit v1.1-26-g67d0