Changeset 496 for experiments/frams/foraminifera/data/scripts/foraminifera.expdef

Timestamp:

04/15/16 02:10:12 (8 years ago)

Author:

oriona

Message:

Haploid and diploid morphologies changed.

File:

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

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

@@ -83 +83 @@
         //world
         SignalView.mode = 1;
-        World.wrldwat = 500;
+        World.wrldwat = 200;
         World.wrldsiz = micronsToFrams(100000);
         World.wrldbnd = 1;
@@ -220 +220 @@
 function addForam(species, iter, chambernum, ploid)
 {
-        var geno = createForamMorphology(species_genes[species]->morphotype, ploid, chambernum);
+        var geno = createForamMorphology(ploid, ploid, chambernum);
         curColor = retColors[ploid];
         var cr = Populations[0].add(geno);
@@ -367 +367 @@
                 var ret = Populations[2].add("//0\np:sh=3,sx=0.01,sy="+getZoneRange(cr,1)+",sz="+getZoneRange(cr,1)+",ry=1.57,vr="+curColor);
                 cr.data->reticulopodiacreature = ret;
+                ret.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
         }
 }
@@ -403 +404 @@
         {
                 curColor = retColors[cr.data->lifeparams->gen];
-                var geno = createForamMorphology(getGene(cr, "morphotype", 0), cr.data->lifeparams->gen, chamber_num+1);
+                var geno = createForamMorphology(cr.data->lifeparams->gen, cr.data->lifeparams->gen, chamber_num+1);
                 var cr2 = Populations[0].add(geno);
 
@@ -486 +487 @@
 function fence(pos, zone)
 {
-        return Math.min(Math.max(0+zone,pos),World.wrldsiz-zone);
+        return Math.min(Math.max(0,pos),World.wrldsiz);
 }
 
@@ -614 +615 @@
 
                 cr.getMechPart(0).orient.set(o);
-                if (visualization(cr))
-                {
-                        cr.data->reticulopodiacreature.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
-                }
 
                 if (deathConditions(cr) == 1)
@@ -630 +627 @@
 
                 foramMove(cr);
+
+                if (visualization(cr))
+
+                {
+                        cr.data->reticulopodiacreature.moveAbs(cr.center_x-getZoneRange(cr,1), cr.center_y-getZoneRange(cr,1), cr.center_z-getZoneRange(cr,1));
+                }
 
                 var repro = foramReproduce(cr);