Changeset 584

Timestamp:

08/18/16 21:37:53 (8 years ago)

Author:

oriona

Message:

Positions of foraminifera, reticulopodia and nutrients corrected.

File:

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

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

@@ -563 +563 @@
 }
 
-function fence(pos, zone) //TODO consider sizes (bboxes) of creatures and nutrients consistently throughout this expdef
-{
-        return Math.min(Math.max(0,pos),World.wrldsiz);
+function fence(center, zone)
+{
+        return Math.min(Math.max(0+zone,center),World.wrldsiz-zone); //add and subtract zone from the world size to prevent reticulopodia from crossing the fence
 }
 
@@ -571 +571 @@
 {
         //adjustment in z axis
-        var change_direction = 0;
-        var new_x = fence(cr.pos_x, getZoneRange(cr, 1));
-        var new_y = fence(cr.pos_y, getZoneRange(cr, 1));
-
-        if ((new_x != cr.pos_x) || (new_y != cr.pos_y) || (cr.data->lifeparams->dir_counter >= int(secToSimSteps(ExpProperties.dir_change_sec))))
-        {
-                change_direction = 1;
-        }
-
-        cr.moveAbs(new_x, new_y, -cr.getPart(cr.numparts-1).sx); //place slightly under the bottom surface ("z" value depends on the size of the last=largest chamber)
+        cr.moveAbs(cr.pos_x, cr.pos_y, -cr.getPart(cr.numparts-1).sx); //place slightly under the bottom surface ("z" value depends on the size of the last=largest chamber)
 
         //are there any nutrients in zone 1 or 2?
@@ -590 +581 @@
                         return;
                 }
+        }
+
+        //Prevents forams from crossing the world border. In the case of touching the border with the reticulopodia direction of the movement should be changed. 
+        var change_direction = 0;
+        var new_x = fence(cr.center_x, getZoneRange(cr, 1));
+        var new_y = fence(cr.center_y, getZoneRange(cr, 1));
+
+        if ((new_x != cr.center_x) || (new_y != cr.center_y) || (cr.data->lifeparams->dir_counter >= int(secToSimSteps(ExpProperties.dir_change_sec))))
+        {
+                change_direction = 1;
+                cr.moveAbs(new_x-cr.size_x/2, new_y-cr.size_y/2, -cr.getPart(cr.numparts-1).sx);
         }
 
@@ -786 +788 @@
                 var nut = Populations[2].add("//0\nm:Vstyle=nutrient_visual\np:sh=2,sx="+nutsize+",sy="+nutsize+",sz="+nutsize+",ry=1.5,vr=0.0,1.0,0.0");
                 cr.data->reticulopodiacreature = nut;
-                nut.moveAbs(cr.pos_x-1.5*nutsize, cr.pos_y-1.5*nutsize, -nutsize); //TODO replace -1.5 with the properly calculated value, now nutsize=1, cr.size=0.28284271
+                nut.moveAbs(cr.pos_x-nutsize, cr.pos_y-nutsize, -nutsize); 
         }
 }