diff options
author | chai <chaifix@163.com> | 2018-11-08 08:32:05 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-11-08 08:32:05 +0800 |
commit | 186c68f964868eff0ba543777f47ff036735ef77 (patch) | |
tree | 5018aca298c2c7e3d7788e692cbb8f7c778fb2fe /src/libjin/Graphics | |
parent | 78138dc8e08cebff3b8630cab5b54951061844b8 (diff) |
*更新粒子系统
Diffstat (limited to 'src/libjin/Graphics')
-rw-r--r-- | src/libjin/Graphics/particles/je_particle_emitter.cpp | 9 | ||||
-rw-r--r-- | src/libjin/Graphics/particles/je_particle_system.h | 2 | ||||
-rw-r--r-- | src/libjin/Graphics/shaders/je_shader.h | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/libjin/Graphics/particles/je_particle_emitter.cpp b/src/libjin/Graphics/particles/je_particle_emitter.cpp index ded7b8b..63d3393 100644 --- a/src/libjin/Graphics/particles/je_particle_emitter.cpp +++ b/src/libjin/Graphics/particles/je_particle_emitter.cpp @@ -1,5 +1,11 @@ +#include <time.h> + +#include "../../math/je_random.h" + #include "je_particle_emitter.h" +using namespace JinEngine::Math; + namespace JinEngine { namespace Graphics @@ -7,6 +13,9 @@ namespace JinEngine namespace Particles { + // Particle emitter + static RandomGenerator rnd(time(NULL)); + ParticleEmitter::ParticleEmitter(ParticleSystem& ps) : mParticleSystem(ps) { diff --git a/src/libjin/Graphics/particles/je_particle_system.h b/src/libjin/Graphics/particles/je_particle_system.h index 76d86fa..afa96b2 100644 --- a/src/libjin/Graphics/particles/je_particle_system.h +++ b/src/libjin/Graphics/particles/je_particle_system.h @@ -54,7 +54,7 @@ namespace JinEngine void update(float sec); /// - /// Render particle system it self. + /// Render particle system. /// void render(int x, int y, float sx = 1, float sy = 1, float r = 0, float ax = 0, float ay = 0); diff --git a/src/libjin/Graphics/shaders/je_shader.h b/src/libjin/Graphics/shaders/je_shader.h index d89b827..2009e79 100644 --- a/src/libjin/Graphics/shaders/je_shader.h +++ b/src/libjin/Graphics/shaders/je_shader.h @@ -25,8 +25,9 @@ namespace JinEngine /// /// Built in shader program. /// - /// Built in shader program written with custom shading language called JSL (jin shading language). A JSL - /// program is compiled into glsl, so most glsl built in functions and structs are available in JSL. + /// Built in shader program written with custom shading language called JSL (jin shading language). A + /// JSL program is compiled into glsl, so most glsl built in functions and structs are available in + /// JSL. /// class Shader { |