Display Multiple Animations on Landmass

meteor/app/client/js/zData.gui.min.js

@@ -688,8 +688,8 @@ Examples =
 		opacityTween : new Tween( [2, 3], [1, 0] ),
 		colorTween   : new Tween( [0.5, 2], [ new THREE.Vector3(0,1,0.5), new THREE.Vector3(0.8, 1, 0.5) ] ),
 
-		particlesPerSecond : 200,
+		particlesPerSecond : 100,
-		particleDeathAge   : 3.0,		
+		particleDeathAge   : 30000000.0,
 		emitterDeathAge    : 60
 	},
 
@@ -710,8 +710,8 @@ Examples =
 		colorBase    : new THREE.Vector3(0.02, 1, 0.4),
 		blendStyle   : THREE.AdditiveBlending,  
 		
-		particlesPerSecond : 60,
+		particlesPerSecond : 30,
-		particleDeathAge   : 1.5,		
+		particleDeathAge   : 10000000.5,
 		emitterDeathAge    : 60
 	},
 	
@@ -737,8 +737,8 @@ Examples =
 		opacityTween : new Tween( [0.8, 2], [0.5, 0] ),
 		colorTween   : new Tween( [0.4, 1], [ new THREE.Vector3(0,0,0.2), new THREE.Vector3(0, 0, 0.5) ] ),
 
-		particlesPerSecond : 200,
+		particlesPerSecond : 100,
-		particleDeathAge   : 2.0,		
+		particleDeathAge   : 20000000.0,
 		emitterDeathAge    : 60
 	},
 	
@@ -759,8 +759,8 @@ Examples =
 		colorBase    : new THREE.Vector3(0.0, 0.0, 1.0), // H,S,L
 		opacityTween : new Tween([0,1,4,5],[0,1,1,0]),
 
-		particlesPerSecond : 50,
+		particlesPerSecond : 25,
-		particleDeathAge   : 10.0,		
+		particleDeathAge   : 10000000.0,
 		emitterDeathAge    : 60
 	},
 		
@@ -786,8 +786,8 @@ Examples =
 		colorBase   : new THREE.Vector3(0.66, 1.0, 0.9), // H,S,L
 		opacityTween : new Tween( [2, 3], [0.8, 0] ),
 
-		particlesPerSecond : 200,
+		particlesPerSecond : 100,
-		particleDeathAge   : 4.0,		
+		particleDeathAge   : 40000000.0,
 		emitterDeathAge    : 60
 	},
 	
@@ -810,8 +810,8 @@ Examples =
 		colorSpread : new THREE.Vector3(0.00, 0.0, 0.2),
 		opacityBase : 0.6,
 
-		particlesPerSecond : 1000,
+		particlesPerSecond : 500,
-		particleDeathAge   : 1.0,		
+		particleDeathAge   : 10000000.0,
 		emitterDeathAge    : 60
 	},
 		
@@ -838,8 +838,8 @@ Examples =
 		colorSpread : new THREE.Vector3(0.00, 0.0, 0.2),
 		opacityBase : 1,
 
-		particlesPerSecond : 20000,
+		particlesPerSecond : 10000,
-		particleDeathAge   : 60.0,		
+		particleDeathAge   : 600000000.0,
 		emitterDeathAge    : 0.1
 	},
 
@@ -862,8 +862,8 @@ Examples =
 		colorBase   : new THREE.Vector3(0.30, 1.0, 0.6), // H,S,L
 		colorSpread : new THREE.Vector3(0.3, 0.0, 0.0),
 
-		particlesPerSecond : 20,
+		particlesPerSecond : 10,
-		particleDeathAge   : 6.1,		
+		particleDeathAge   : 60000000.1,
 		emitterDeathAge    : 600
 	},
 	
@@ -890,8 +890,8 @@ Examples =
 		opacityBase : 1,
 		blendStyle  : THREE.AdditiveBlending,
 
-		particlesPerSecond : 500,
+		particlesPerSecond : 250,
-		particleDeathAge   : 4.0,		
+		particleDeathAge   : 40000000.0,
 		emitterDeathAge    : 60
 	},
 
@@ -914,8 +914,8 @@ Examples =
 		colorTween   : new Tween( [0.4, 0.8, 1.0], [ new THREE.Vector3(0,1,1), new THREE.Vector3(0,1,0.6), new THREE.Vector3(0.8, 1, 0.6) ] ),
 		blendStyle   : THREE.AdditiveBlending,  
 		
-		particlesPerSecond : 3000,
+		particlesPerSecond : 1500,
-		particleDeathAge   : 2.5,		
+		particleDeathAge   : 20000000.5,
 		emitterDeathAge    : 0.2
 	},
 
@@ -936,8 +936,8 @@ Examples =
 		colorTween   : new Tween( [0.5, 1.0], [ new THREE.Vector3(0.02, 1, 0.5), new THREE.Vector3(0.05, 1, 0) ] ),
 		blendStyle : THREE.AdditiveBlending,  
 		
-		particlesPerSecond : 60,
+		particlesPerSecond : 30,
-		particleDeathAge   : 1.5,		
+		particleDeathAge   : 10000000.5,
 		emitterDeathAge    : 60
 	}
 	

meteor/app/client/vr.js

@@ -53,9 +53,9 @@ if (Meteor.isClient) {
     {x: -754, z: -1087}
   ];
   var ATTACKANIMATIONS = {
-    'broxss': Examples.fireball,
+    'broxss': Examples.smoke,
     'bro_notice': Examples.smoke,
-    'brosqli': Examples.candle,
+    'brosqli': Examples.smoke,
     'brotunnel': Examples.rain,
     'brointel': Examples.clouds
   };
@@ -82,6 +82,7 @@ if (Meteor.isClient) {
   var cssRenderer = null;
   var intersectedObject = null;
   var engine = null;
+  var enginesList = [];
   var world = {};
   var jsonData = {};
 
@@ -111,18 +112,17 @@ if (Meteor.isClient) {
     cssRenderer = new THREE.CSS3DRenderer();
     controls = new THREE.OrbitControls(camera);
     stats = new Stats();
-    engine = new ParticleEngine();
-    engine.initialize(scene);
   }
 
   function restartEngine(parameters, x, z) {
-    // engine.destroy(scene);
-    // engine = new ParticleEngine();
     parameters.positionBase.x=x;
     parameters.positionBase.z=z;
 
+    engine = new ParticleEngine();
     engine.setValues(parameters);
     engine.initialize(scene);
+
+    enginesList.push(engine);
   }
 
   function setStats() {
@@ -170,7 +170,9 @@ if (Meteor.isClient) {
   function update() {
     controls.update();
     stats.update();
-    engine.update(clock.getDelta()*0.5);
+    enginesList.forEach(function(engine) {
+      engine.update(0.01*0.5);
+    });
   }
 
   function render() {