aboutsummaryrefslogtreecommitdiff
path: root/src/libjin
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-11-10 20:13:55 +0800
committerchai <chaifix@163.com>2018-11-10 20:13:55 +0800
commite92caa97329016d012b46b9d37e1b2c3b613a8f2 (patch)
tree5bef0b7547e12f61dede5e09843e1718b808f9c4 /src/libjin
parent63153bc8e742c522cfd3f5ab10609966e33310e6 (diff)
*修改代码结构
Diffstat (limited to 'src/libjin')
-rw-r--r--src/libjin/Graphics/particles/je_particle_emitter.cpp4
-rw-r--r--src/libjin/Graphics/particles/je_particle_emitter.h2
-rw-r--r--src/libjin/Math/je_random.cpp2
-rw-r--r--src/libjin/ai/je_state_machine.h13
4 files changed, 4 insertions, 17 deletions
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