From 280c39c65f47b4d1395d0dfe583a67a058804a27 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 24 Oct 2018 08:20:13 +0800
Subject: =?UTF-8?q?*=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/particle/je_particle_emitter.h | 64 +++++++++++++++++++---
 1 file changed, 55 insertions(+), 9 deletions(-)

(limited to 'src/libjin/Graphics/particle/je_particle_emitter.h')

diff --git a/src/libjin/Graphics/particle/je_particle_emitter.h b/src/libjin/Graphics/particle/je_particle_emitter.h
index 95b7875..e700f16 100644
--- a/src/libjin/Graphics/particle/je_particle_emitter.h
+++ b/src/libjin/Graphics/particle/je_particle_emitter.h
@@ -11,29 +11,75 @@ namespace JinEngine
     namespace Graphics
     {
 
+        struct PositionDef
+        {
+            bool enableRandom = false;
+            union 
+            {
+                struct 
+                {
+                    Math::Vector2<float> min;
+                    Math::Vector2<float> max;
+                } random;
+                Math::Vector2<float> position;
+            } position;
+        };
+
+        struct DirectionDef 
+        {
+            bool enableRandom = false;
+            union 
+            {
+                struct 
+                {
+                    float min = 0;
+                    float max = 0;
+                } random;
+                float direction = 0;
+            } direction;
+        };
+
+        struct EmitRateDef
+        {
+            bool enableRandom = false; 
+            union
+            {
+                struct
+                {
+                    float min = 1; 
+                    float max = 1;
+                } random;
+                float rate = 1;
+            } rate;
+        };
+
         ///
         /// Definition of particle emitter.
         ///
         struct ParticleEmitterDef : public Temporary
         {
-            Math::Vector2<float> position; 
-
+            PositionDef positionDef;   ///< Emit position(relativily to the particle system center).
+            DirectionDef directionDef; ///< Emit direction.
+            EmitRateDef emitRateDef;   ///< Emit rate.
+            ///
+            /// Particle definition.
+            ///
+            ParticleDef particleDef;   ///< Particle definition.
         };
 
+        ///
+        /// Emit a single particle.
+        ///
         class ParticleEmitter
         {
         public:
             ParticleEmitter(const ParticleEmitterDef& def);
 
             ///
-            /// Create new particle.
-            ///
-            Particle* emit();
-
-            ///
-            /// Emitter position.
+            /// Emit a particle, particle system should assign particle value to the particle in particle pool, 
+            /// but not use this return particle.
             ///
-            Math::Vector2<float> mPosition;
+            Particle emit();
 
             ///
             ///
-- 
cgit v1.1-26-g67d0