more work

jeromeetienne · Jul 6, 2012 · 14796c6 · 14796c6
1 parent da8f1b0
commit 14796c6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/examples/flamethrower/index.html b/examples/flamethrower/index.html
@@ -11,7 +11,7 @@
 <script src="../plugins/effect.age.js"></script>
 <script src="../plugins/spawner.rate.js"></script>
 <script src="../plugins/shape.sphere.js"></script>
-<script src="../plugins/effect.applyForce.js"></script>
+<script src="../plugins/effect.applyforce.js"></script>
 <script src="../plugins/effect.init2shapes.js"></script>
 <script src="../plugins/effect.shape.box.js"></script>
 <script src="../plugins/effect.dieifcontained.js"></script>
@@ -80,17 +80,25 @@
 			nParticles	: 300
 		});
 
-		emitter.setSpawner(new Fireworks.SpawnerRate(90));
+		emitter.setSpawner(new Fireworks.SpawnerRate(60));
 
 		emitter.pushBase().pushAge(1.5);
 
+
 		emitter.pushInit2Shapes({
 			origin	: Fireworks.createBox(0, 0, 0, 1, 1, 1),
 			target	: Fireworks.createSphere(+800, 0, 0, 150),
-			speed	: 10
+			speed	: 15
 		});
 
-		Fireworks.createEffect().onPreRender(function(){
+		Fireworks.createEffect('gravity', {
+			gravityY	: 0.003
+		}).onUpdate(function(particle){
+			var ctx	= emitter.getParticleData(particle, 'xBase');
+			ctx.acceleration.y	-= this.opts.gravityY;
+		}).pushTo(emitter);
+
+		Fireworks.createEffect("renderer").onPreRender(function(){
 			// clear the screen
 			ctx.save();
 			ctx.globalAlpha			= 1;
@@ -104,7 +112,12 @@
 			var imageIdx	= Math.floor(canonAge * images.length);
 			var image	= images[imageIdx];
 			if( true ){
-				ctx.drawImage(image, position.x - image.width/2, position.y - image.height/2)
+				var width	= image.width	* 2;
+				var height	= image.height	* 2;
+				ctx.drawImage(image, 
+					position.x - width/2 - 250,
+					position.y - height/2,
+					width, height)
 			}
 			if(false){
 				ctx.fillStyle	= "rgb(200,0,0)";

diff --git a/examples/flamethrower/loadflames.js b/examples/flamethrower/loadflames.js
@@ -48,8 +48,8 @@ function loadFlames(urls, callback){
 
 				luminance	= luminance/255;
 				//luminance	= luminance * luminance * luminance* luminance;
-				//luminance	= luminance * luminance * luminance;
-				p[i+3]		= Math.floor(luminance * 32 * 255);
+				//luminance	= luminance * luminance;
+				p[i+3]		= Math.floor(luminance * 16 * 255);
 				//p[i+3]		= luminance * 4;
 			}
 		}

diff --git a/index.html b/index.html
@@ -89,6 +89,20 @@ <h5>Fiesta in Canvas</h5>
 				</div>
 			</div>
 		</div>
+		<div class='span3'>
+			<div class="thumbnail">
+				<div class="caption">
+					<h5>Flame thrower Canvas</h5>
+					<p>
+						This is an attempts to reproduce
+						tremulous flamethrower in Canvas2D
+					</p>
+					<p>
+						<a href="examples/flamethrower" class="btn">Learn more &raquo;</a>
+					</p>
+				</div>
+			</div>
+		</div>
 		<div class='span3'>
 			<div class="thumbnail">
 				<div class="caption">
@@ -117,8 +131,6 @@ <h5>tQuery Sprite</h5>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div class="row">
 		<div class='span3'>
 			<div class="thumbnail">
 				<div class="caption">