From 66e070e16391ab7746f5574e16fc46f99e9105d9 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Tue, 13 Jun 2017 13:21:57 +0200
Subject: [PATCH] Add gravity and reduce fire size

---
 .../io/sarl/demos/fireworks/agents/Fire.sarl  | 23 +++++++++++++++----
 .../sarl/demos/fireworks/agents/Rocket.sarl   |  2 +-
 .../fireworks/gui/FXMLViewerController.sarl   |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
index d2bd135..79dce44 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
@@ -31,10 +31,14 @@ agent Fire {
 	var grid : Positions
 	var xf : Double
 	var yf : Double
+	var vx : Double
+	var vy : Double
 	var id = UUID.randomUUID
 	var parentID : UUID
 	var move : AgentTask
 	var parentAgent : UUID
+	var gravity: Double
+	var mass : Double
 
 	on Freeze {
 		this.frozen = occurrence.value
@@ -47,11 +51,12 @@ agent Fire {
 	on Initialize {
 		x = new ArrayList()
 		y = new ArrayList()
-		if (occurrence.parameters.size.equals(4)) {
+		if (occurrence.parameters.size.equals(5)) {
 			x.add(occurrence.parameters.get(0) as Double)
 			y.add(occurrence.parameters.get(1) as Double)
 			grid = occurrence.parameters.get(2) as Positions
 			parentID = occurrence.parameters.get(3) as UUID
+			gravity = occurrence.parameters.get(4) as Double
 		} else {
 			info("Error in fire Initialize : bad parameter number")
 		}
@@ -59,7 +64,11 @@ agent Fire {
 
 		xf = Math.random() * 10.0 - Math.random() * 5
 		yf = Math.random() * 10.0 + 1.0
-
+		
+		vx = xf * 20.0
+		vy = yf * 30.0
+		
+		mass = 10.0
 	}
 
 	on FireReady {
@@ -73,8 +82,14 @@ agent Fire {
 	}
 
 	on UpdateFirePosition [isFromMe(occurrence) && !frozen && !destroyed] {
-		var newx = x.last + xf
-		var newy = y.last + yf
+		var newx : Double
+		var newy : Double
+		
+		vy = vy - gravity * mass * Configuration.FireLifeCycleSchedulingRate / 100.0
+		
+		newx = x.last + vx * Configuration.FireLifeCycleSchedulingRate / 1000.0
+		newy = y.last + vy * Configuration.FireLifeCycleSchedulingRate / 1000.0
+
 		x.add(newx)
 		y.add(newy)
 
diff --git a/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
index 4e4ec18..a203046 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
@@ -107,7 +107,7 @@ agent Rocket {
 
 	on Explode {
 		for (var i = 0; i < fireQuantity; i++) {
-			spawnInContext(Fire, innerContext, x, y, grid, id)
+			spawnInContext(Fire, innerContext, x, y, grid, id, gravity)
 		}
 		// emit(new Launch)
 	}
diff --git a/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
index ca17fc0..1272bd7 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.sarl
@@ -90,7 +90,7 @@ class FXMLViewerController implements EventListener {
 					gc.setFill(fire.getColor());
 					fire.getPositions().forEach(pos |
 						{
-						gc.fillOval(pos.get(0), pos.get(1), 5, 5);
+						gc.fillOval(pos.get(0), pos.get(1), 3, 3);
 						});
 					});
 			} catch (exception : Exception) {