Changeset 588

Timestamp:

08/19/16 11:35:59 (8 years ago)

Author:

oriona

Message:

Movement of forams in z axis restricted.

File:

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

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

@@ -329 +329 @@
         var cr = Populations[0].add(geno);
         cr.name = "Initial creature" + species + "_" + iter;
-        placeCreatureRandomly(cr, 0, 0);
+        placeRandomlyNotColliding(cr);
         cr.energy = start_energy;
         setGenotype({"opt" : "birth", "cr" : cr, "gen" : ploid, "species" : species, "energy0" : cr.energy, "genes" : species_genes[species], "parentsuids" : ["c0"]});
@@ -410 +410 @@
                 placeCreatureRandomly(cr, 0, 0);
                 if (!cr.boundingBoxCollisions(0))
+                {
+                        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)
                         return cr;
+                }
         }
 
@@ -539 +542 @@
                 if (!eating && cr.data->lifeparams->hibernated == 0)
                 {
+                        mindistvec.z = 0;
                         mindistvec.normalize();
                         mindistvec.scale(-1*movePerStep);
@@ -570 +574 @@
 function foramMove(cr)
 {
-        //adjustment in z axis
-        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?
         {