Changeset 583 for experiments

Timestamp:

08/18/16 15:35:44 (8 years ago)

Author:

oriona

Message:

Chamber growth visualization moved to the separate function.

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.expdef (modified) (3 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.expdef

@@ -399 +399 @@
         {
                 addReticulopodia(cr, curRadius);
-        }
-        moveReticulopodia(cr);
+                moveReticulopodia(cr);
+        }
 }
 
@@ -460 +460 @@
         }
         return cr;
+}
+
+function visualizeChamberGrowth(cr, chamber_time)
+{
+        var total_time = secToSimSteps(ExpProperties.chamberGrowthSec);
+        var ret_unit = total_time/chamber_vis_denominator;
+        var chamber_unit = total_time-ret_unit;
+
+        if (chamber_time < ret_unit || chamber_time >= chamber_unit)
+        {
+                var new_rad = Math.min(Math.max((chamber_time%ret_unit)/ret_unit*getZoneRange(cr,1),0.01),getZoneRange(cr,1));
+
+                if(chamber_time < ret_unit)
+                {
+                        new_rad = getZoneRange(cr,1)-new_rad;
+                }
+
+                curColor = colors[cr.data->lifeparams->gen];
+                addReticulopodia(cr,new_rad);
+
+                if (chamber_time == 0)//checking for end of chamber growth process
+                {
+                        cr.data->lifeparams->chamber_growth = -1;       
+                }
+        }
+        else
+        {
+                var new_rad = 1 - Math.min(Math.max((chamber_time-ret_unit)/chamber_unit,0.01),1);
+                curRadius = cr.data->reticulopodiacreature.getPart(1).sy;
+                                
+                if (chamber_time == ret_unit)
+                {
+                        new_rad = 1;
+                }
+
+                var new_cr = foramGrow(cr, chamberNumFromEnergy(cr.data->lifeparams->max_energy_level, cr.data->lifeparams->gen)-1, new_rad);
+                curRadius = getZoneRange(new_cr,1);
+        }
 }
 
@@ -639 +677 @@
                 if (visualization(cr))
                 {
-                        var total_time = secToSimSteps(ExpProperties.chamberGrowthSec);
-                        var ret_unit = total_time/chamber_vis_denominator;
-                        var chamber_unit = total_time-ret_unit;
-
-                        if (chamber_time < ret_unit || chamber_time >= chamber_unit)
-                        {
-                                var new_rad = Math.min(Math.max((chamber_time%ret_unit)/ret_unit*getZoneRange(cr,1),0.01),getZoneRange(cr,1));
-
-                                if(chamber_time < ret_unit)
-                                        new_rad = getZoneRange(cr,1)-new_rad;
-
-                                curColor = colors[cr.data->lifeparams->gen];
-                                addReticulopodia(cr,new_rad);
-                        }
-                        else
-                        {
-                                var new_rad = 1 - Math.min(Math.max((chamber_time-ret_unit)/chamber_unit,0.01),1);
-                                curRadius = cr.data->reticulopodiacreature.getPart(1).sy;
-                                
-                                if (chamber_time == ret_unit){
-                                        new_rad == 1;
-                                }
-        
-                                var new_cr = foramGrow(cr, chamberNumFromEnergy(cr.data->lifeparams->max_energy_level, cr.data->lifeparams->gen)-1, new_rad);
-                                curRadius = getZoneRange(new_cr,1);
-
-                                if (chamber_time == 0)//checking for end of chamber growth process
-                                {
-                                        new_cr.data->lifeparams->chamber_growth = -1;   
-                                }
-                        } 
-                }
-        }
-        //checking for end of chamber growth process
+                        visualizeChamberGrowth(cr, chamber_time);
+                }
+        }
+        //checking for end of the chamber growth process
         else if (cr.data->lifeparams->chamber_growth == 0 && visualization(cr)==0)
         {