From e92caa97329016d012b46b9d37e1b2c3b613a8f2 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 10 Nov 2018 20:13:55 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/particles/je_particle_emitter.cpp | 4 ++-- src/libjin/Graphics/particles/je_particle_emitter.h | 2 +- src/libjin/Math/je_random.cpp | 2 -- src/libjin/ai/je_state_machine.h | 13 +------------ 4 files changed, 4 insertions(+), 17 deletions(-) (limited to 'src/libjin') diff --git a/src/libjin/Graphics/particles/je_particle_emitter.cpp b/src/libjin/Graphics/particles/je_particle_emitter.cpp index 63d3393..edc4bee 100644 --- a/src/libjin/Graphics/particles/je_particle_emitter.cpp +++ b/src/libjin/Graphics/particles/je_particle_emitter.cpp @@ -31,9 +31,9 @@ namespace JinEngine mTime -= 1; } - void ParticleEmitter::emit(const ParticleEmitterDef& emitterDef, const ParticleDef& def, Particle& particle) + void ParticleEmitter::emit() { - particle.reset(); + } diff --git a/src/libjin/Graphics/particles/je_particle_emitter.h b/src/libjin/Graphics/particles/je_particle_emitter.h index 34d0ee4..9200532 100644 --- a/src/libjin/Graphics/particles/je_particle_emitter.h +++ b/src/libjin/Graphics/particles/je_particle_emitter.h @@ -96,7 +96,7 @@ namespace JinEngine /// Emit a particle according to emitter definition and particle definition, particle system should /// assign particle value to the particle in particle pool, but not use this return particle. /// - void emit(const ParticleEmitterDef& emitterDef, const ParticleDef& def, Particle& particle); + void emit(); /// /// diff --git a/src/libjin/Math/je_random.cpp b/src/libjin/Math/je_random.cpp index a8f3310..983fa36 100644 --- a/src/libjin/Math/je_random.cpp +++ b/src/libjin/Math/je_random.cpp @@ -5,8 +5,6 @@ namespace JinEngine namespace Math { - - RandomGenerator::RandomGenerator() { } diff --git a/src/libjin/ai/je_state_machine.h b/src/libjin/ai/je_state_machine.h index d496c61..6cd3f17 100644 --- a/src/libjin/ai/je_state_machine.h +++ b/src/libjin/ai/je_state_machine.h @@ -411,15 +411,4 @@ namespace JinEngine #endif // jin_ai -#endif - -//local sp = jin.graphics.newSprite() -//local sm = jin.ai.newStateMachine(jin.StateMachineMode.STEPWISE, sp) -//sm:addState("run") -//sm:addEnterCallback("run", function(spr) -// spr:setRun() -//end) -// -//function jin.core.onUpdate(dt) -// sm:update() -//end +#endif \ No newline at end of file -- cgit v1.1-26-g67d0