Ticket #1922: ParticleUpdates.patch

binaries/data/mods/public/art/particles/smoke_light.xml

@@ -5 +5 @@
     <blend mode="over"/>
 
     <start_full/>
+    <use_relative_velocity/>
 
-    <constant name="emissionrate" value="5.0"/>
+    <constant name="emissionrate" value="2.0"/>
     <uniform name="lifetime" min="30.0" max="35.0"/>
 
     <constant name="position.y" value="2.0"/>
@@ -14 +15 @@
     <uniform name="angle" min="-2.0" max="2.0"/>
 
     <uniform name="velocity.x" min="-0.3" max="0.3"/>
-    <uniform name="velocity.y" min="1.5" max="2.0"/>
+    <uniform name="velocity.y" min="0.5" max="1.2"/>
     <uniform name="velocity.z" min="-0.5" max="0.5"/>
     <uniform name="velocity.angle" min="-2.0" max="2.0"/>
 
-    <uniform name="size" min="3.0" max="4.5"/>
+    <uniform name="size" min="1.0" max="1.5"/>
+    <uniform name="size.growth" min="1.0" max="1.5"/>
 
     <uniform name="color.r" min="0.6" max="1.0"/>
     <copy name="color.g" from="color.r"/>
     <copy name="color.b" from="color.r"/>
 
+    <force y="0.2"/>
+    <force x="0.04"/>
+    <force z="0.04"/>
 </particles>

source/graphics/ParticleEmitterType.cpp

@@ -325 +325 @@
     if (name == "velocity.z")   return VAR_VELOCITY_Z;
     if (name == "velocity.angle")   return VAR_VELOCITY_ANGLE;
     if (name == "size")         return VAR_SIZE;
+    if (name == "size.growth")          return VAR_SIZE_GROWTH;
     if (name == "color.r")      return VAR_COLOR_R;
     if (name == "color.g")      return VAR_COLOR_G;
     if (name == "color.b")      return VAR_COLOR_B;
@@ -348 +349 @@
     m_Variables[VAR_VELOCITY_Z] = IParticleVarPtr(new CParticleVarConstant(0.f));
     m_Variables[VAR_VELOCITY_ANGLE] = IParticleVarPtr(new CParticleVarConstant(0.f));
     m_Variables[VAR_SIZE] = IParticleVarPtr(new CParticleVarConstant(1.f));
+    m_Variables[VAR_SIZE_GROWTH] = IParticleVarPtr(new CParticleVarConstant(0.f));
     m_Variables[VAR_COLOR_R] = IParticleVarPtr(new CParticleVarConstant(1.f));
     m_Variables[VAR_COLOR_G] = IParticleVarPtr(new CParticleVarConstant(1.f));
     m_Variables[VAR_COLOR_B] = IParticleVarPtr(new CParticleVarConstant(1.f));
@@ -355 +357 @@
     m_BlendFuncSrc = GL_SRC_ALPHA;
     m_BlendFuncDst = GL_ONE_MINUS_SRC_ALPHA;
     m_StartFull = false;
+    m_UseRelativeVelocity = false;
     m_Texture = g_Renderer.GetTextureManager().GetErrorTexture();
 
     CXeromyces XeroFile;
@@ -370 +373 @@
     EL(texture);
     EL(blend);
     EL(start_full);
+    EL(use_relative_velocity);
     EL(constant);
     EL(uniform);
     EL(copy);
@@ -430 +434 @@
         {
             m_StartFull = true;
         }
+        else if (Child.GetNodeName() == el_use_relative_velocity)
+        {
+            m_UseRelativeVelocity = true;
+        }
         else if (Child.GetNodeName() == el_constant)
         {
             int id = GetVariableID(Child.GetAttributes().GetNamedItem(at_name));
@@ -530 +538 @@
             particle.pos.Z = m_Variables[VAR_POSITION_Z]->Evaluate(emitter);
             particle.pos += emitter.m_Pos;
 
-            particle.velocity.X = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
-            particle.velocity.Y = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
-            particle.velocity.Z = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
-
+            if (m_UseRelativeVelocity)
+            {
+                float xVel = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
+                float yVel = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
+                float zVel = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
+                CVector3D EmitterAngle = emitter.GetRotation().ToMatrix().Transform(CVector3D(xVel,yVel,zVel));
+                particle.velocity.X = EmitterAngle.X;
+                particle.velocity.Y = EmitterAngle.Y;
+                particle.velocity.Z = EmitterAngle.Z;
+            } else {
+                particle.velocity.X = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
+                particle.velocity.Y = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
+                particle.velocity.Z = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
+            }
             particle.angle = m_Variables[VAR_ANGLE]->Evaluate(emitter);
             particle.angleSpeed = m_Variables[VAR_VELOCITY_ANGLE]->Evaluate(emitter);
 
             particle.size = m_Variables[VAR_SIZE]->Evaluate(emitter);
+            particle.sizeGrowth = m_Variables[VAR_SIZE_GROWTH]->Evaluate(emitter);
 
             RGBColor color;
             color.X = m_Variables[VAR_COLOR_R]->Evaluate(emitter);
@@ -564 +583 @@
         p.pos += p.velocity * dt;
         p.angle += p.angleSpeed * dt;
         p.age += dt;
+        p.size += p.sizeGrowth * dt;
 
         // Make alpha fade in/out nicely
         // TODO: this should probably be done as a variable or something,

source/graphics/ParticleEmitter.cpp

@@ -277 +277 @@
 void CModelParticleEmitter::SetTransform(const CMatrix3D& transform)
 {
     m_Emitter->SetPosition(transform.GetTranslation());
+    m_Emitter->SetRotation(transform.GetRotation());
 }

source/graphics/ParticleEmitterType.h

@@ -67 +67 @@
         VAR_VELOCITY_Z,
         VAR_VELOCITY_ANGLE,
         VAR_SIZE,
+        VAR_SIZE_GROWTH,
         VAR_COLOR_R,
         VAR_COLOR_G,
         VAR_COLOR_B,
@@ -96 +97 @@
     GLenum m_BlendFuncSrc;
     GLenum m_BlendFuncDst;
     bool m_StartFull;
-
+    bool m_UseRelativeVelocity;
+    
     float m_MaxLifetime;
     size_t m_MaxParticles;
     CBoundingBoxAligned m_MaxBounds;

source/graphics/ParticleEmitter.h

@@ -21 +21 @@
 #include "graphics/ModelAbstract.h"
 #include "graphics/ParticleEmitterType.h"
 #include "graphics/Texture.h"
+#include "maths/Quaternion.h"
 #include "renderer/VertexArray.h"
 
 #include <map>
@@ -35 +36 @@
     float angle;
     float angleSpeed;
     float size;
+    float sizeGrowth;
     SColor4ub color;
     float age;
     float maxAge;
@@ -81 +83 @@
     }
 
     /**
+     * Set the rotation to be used for emission of new particles (note: depends on particles).
+     */
+    void SetRotation(const CQuaternion& rot)
+    {
+        m_Rot = rot;
+    }
+    
+    CQuaternion GetRotation() const
+    {
+        return m_Rot;
+    }
+    
+
+    /**
      * Get the bounding box of the center points of particles at their current positions.
      */
     CBoundingBoxAligned GetParticleBounds() { return m_ParticleBounds; }
@@ -122 +138 @@
     bool m_Active;
 
     CVector3D m_Pos;
+    CQuaternion m_Rot;
 
     std::map<std::string, float> m_EntityVariables;