From 186c68f964868eff0ba543777f47ff036735ef77 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 8 Nov 2018 08:32:05 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/particles/je_particle_emitter.cpp | 9 +++++++++ src/libjin/Graphics/particles/je_particle_system.h | 2 +- src/libjin/Graphics/shaders/je_shader.h | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/libjin/Graphics') 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 + +#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 { -- cgit v1.1-26-g67d0