Changeset 448 for experiments/frams

Timestamp:

11/27/15 02:46:03 (9 years ago)

Author:

Maciej Komosinski

Message:

Avoid unnecessary computation (time scale is determined by simulation speed only)

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.show (modified) (2 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.show

@@ -14 +14 @@
 
 global Params; //to easily transfer changes in identical properties from this show to expdef
-global lasttimescale; //to display time scale when it changes significantly
+global last_simspeed; //to display time scale when it changes significantly
 
 function onLoad()
 {
         Simulator.init();
-        lasttimescale=0;
+        last_simspeed=0;
         GLDisplay.desiredsimspeed = 50;
         GLDisplay.minfps = 10;
@@ -38 +38 @@
 }
 
-function updateBanner(timescale)
+function updateBanner()
 {
         GLDisplay.banner="World size is %g mm." % (framsToMicrons(World.wrldsiz)/1000);
-        GLDisplay.banner+="\nShowing real-time x %g." % timescale;
+        GLDisplay.banner+="\nShowing real-time x %g." % timeScale();
 }
 
 function onShowStep()
 {
-        var timescale=timeScale();
-        if (timescale<lasttimescale*0.9 || timescale>lasttimescale*1.1) //significant change
+        if (Simulator.simspeed<last_simspeed*0.9 || Simulator.simspeed>last_simspeed*1.1) //significant change
         {
-                updateBanner(timescale);
-                lasttimescale=timescale;
+                updateBanner();
+                last_simspeed=Simulator.simspeed;
         }
 }