toadd: different colors for fireworks

examples/playa/fireworks/fireworksLaunchButtonEntityScript.js

@@ -17,7 +17,10 @@
       _this = this;
       _this.launchSound = SoundCache.getSound("https://s3-us-west-1.amazonaws.com/hifi-content/eric/Sounds/missle+launch.wav");
       _this.explosionSound = SoundCache.getSound("https://s3-us-west-1.amazonaws.com/hifi-content/eric/Sounds/fireworksExplosion.wav");
-      _this.timeToExplosionRange = {min: 1000, max: 2000}; 
+      _this.timeToExplosionRange = {
+        min: 2000,
+        max: 3000
+      };
     };
 
     Fireworks.prototype = {
@@ -32,34 +35,60 @@
       },
 
       shootFirework: function() {
-        var rocketPosition = Vec3.sum(_this.position, {x: 0, y: 0.1, z: 0});
+        var rocketPosition = Vec3.sum(_this.position, {
-        Audio.playSound(_this.launchSound, {position: rocketPosition});
+          x: 0,
+          y: 0.1,
+          z: 0
+        });
+        Audio.playSound(_this.launchSound, {
+          position: rocketPosition
+        });
 
-        var MODEL_URL = "file:///C:/Users/Eric/Desktop/Rocket-2.fbx"
+        var MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Rocket-2.fbx";
+        var missleDimensions = {
+              x: 0.24,
+              y: 0.7,
+              z: 0.24
+            };
           _this.missle = Entities.addEntity({
             type: "Model",
             modelURL: MODEL_URL,
             position: rocketPosition,
-          color: {red: 200, green : 10, blue: 200},
+            dimensions: missleDimensions,
-          dimensions: {x: 0.2, y: 0.4, z: 0.2},
             damping: 0,
             dynamic: true,
-          velocity: {x: 0.0, y: 0.1, z: 0},
+            velocity: {
-          acceleration: {x: 0, y: 1, z: 0}
+              x: 0.0,
+              y: 0.1,
+              z: 0
+            },
+            acceleration: {
+              x: 0,
+              y: 1,
+              z: 0
+            }
           });
 
-        var smokeTrailPosition = Vec3.sum(rocketPosition, {x: 0, y: -0.15, z: 0});
+        var smokeTrailPosition = Vec3.sum(rocketPosition, {
+          x: 0,
+          y: -missleDimensions.y/2 + 0.08,
+          z: 0
+        });
         var smokeSettings = {
           type: "ParticleEffect",
           position: smokeTrailPosition,
-                lifespan: 2,
+          lifespan: 1.6,
           lifetime: 20,
           name: "Smoke Trail",
           maxParticles: 3000,
           emitRate: 50,
           emitSpeed: 0,
           speedSpread: 0,
-                dimensions: {x: 1000, y: 1000, z: 1000},
+          dimensions: {
+            x: 1000,
+            y: 1000,
+            z: 1000
+          },
           polarStart: 0,
           polarFinish: 0,
           azimuthStart: -3.14,
@@ -89,9 +118,21 @@
 
         _this.smoke = Entities.addEntity(smokeSettings);
 
-            smokeSettings.colorStart = {red: 75, green: 193, blue: 254};
+        smokeSettings.colorStart = {
-            smokeSettings.color = {red: 202, green: 132, blue: 151};
+          red: 75,
-            smokeSettings.colorFinish = {red: 250, green: 132, blue: 21};
+          green: 193,
+          blue: 254
+        };
+        smokeSettings.color = {
+          red: 202,
+          green: 132,
+          blue: 151
+        };
+        smokeSettings.colorFinish = {
+          red: 250,
+          green: 132,
+          blue: 21
+        };
         smokeSettings.lifespan = 0.7;
         smokeSettings.emitAcceleration.y = -1;;
         smokeSettings.alphaStart = 0.7;
@@ -100,6 +141,7 @@
         smokeSettings.particleRadius = 0.06;
         smokeSettings.emitRate = 200;
         smokeSettings.emitterShouldTrail = false;
+        smokeSettings.name = "fire emitter";
         _this.fire = Entities.addEntity(smokeSettings);
 
         Script.setTimeout(function() {
@@ -112,10 +154,18 @@
 
       explodeFirework: function(explodePosition) {
         // We just exploded firework, so stop emitting its fire and smoke
-        Entities.editEntity(_this.smoke, {parentID: null, isEmitting: false});
+        Entities.editEntity(_this.smoke, {
-        Entities.editEntity(_this.fire, {parentID: null, isEmitting: false});
+          parentID: null,
+          isEmitting: false
+        });
+        Entities.editEntity(_this.fire, {
+          parentID: null,
+          isEmitting: false
+        });
         Entities.deleteEntity(_this.missle);
-        Audio.playSound(_this.explosionSound, {position: explodePosition});
+        Audio.playSound(_this.explosionSound, {
+          position: explodePosition
+        });
         var fireworkSettings = {
           name: "fireworks emitter",
           position: explodePosition,
@@ -180,7 +230,9 @@
         _this.firework = Entities.addEntity(fireworkSettings);
 
         Script.setTimeout(function() {
-          Entities.editEntity(_this.firework, {isEmitting: false});
+          Entities.editEntity(_this.firework, {
+            isEmitting: false
+          });
         }, 1000)
 
       },

examples/playa/fireworks/fireworksLaunchButtonSpawner.js

@@ -18,19 +18,15 @@
 
   // Math.random ensures no caching of script
   var SCRIPT_URL = Script.resolvePath("fireworksLaunchButtonEntityScript.js?v1" + Math.random())
-
+  var MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Launch-Button.fbx";
-  var myEntity = Entities.addEntity({
+  var launchButton = Entities.addEntity({
-    type: "Box",
+    type: "Model",
-    color: {
+    modelURL: MODEL_URL,
-      red: 200,
-      green: 10,
-      blue: 10
-    },
     position: center,
     dimensions: {
-      x: 0.1,
+      x: 0.98,
-      y: 0.1,
+      y: 1.16,
-      z: 0.1
+      z: 0.98
     },
     script: SCRIPT_URL,
     userData: JSON.stringify({
@@ -42,7 +38,7 @@
 
 
   function cleanup() {
-    Entities.deleteEntity(myEntity);
+    Entities.deleteEntity(launchButton);
   }
 
   Script.scriptEnding.connect(cleanup);