Merge pull request #173 from teamfisk/ExplosionEffectV2

Explosion effect v2
2016-03-12 15:25:12 +01:00
parent e7a3793486 4df936ca70
commit 068e151741
7 changed files with 138 additions and 141 deletions
@@ -27,6 +27,8 @@ struct ExplosionEffectJob : ModelJob
        Velocity = (glm::vec2)explosionEffectComponent["Velocity"];
        ColorByDistance = (bool)explosionEffectComponent["ColorByDistance"];
        ExponentialAccelaration = (bool)explosionEffectComponent["ExponentialAccelaration"];
+		Reverse = (bool)explosionEffectComponent["Reverse"];
+		ColorDistanceScalar = (double)explosionEffectComponent["ColorDistanceScalar"];
    };

    glm::vec3 ExplosionOrigin;
@@ -38,12 +40,14 @@ struct ExplosionEffectJob : ModelJob
    glm::vec4 EndColor;
    bool Randomness = false;
    
-    float RandomnessScalar = 1.f;
+    double RandomnessScalar = 1.f;
    glm::vec2 Velocity;
    bool ColorByDistance = false;
    //bool ReverseAnimation = false;
    //bool Wireframe = false;
    bool ExponentialAccelaration = false;
+	bool Reverse = false;
+	double ColorDistanceScalar = 1.f;

    std::array<float, 50> RandomNumbers = {
        0.3257552917701f,