Changeset 1305

Timestamp:

05/11/24 16:51:08 (7 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/frams/config/version.h (modified) (1 diff)
• cpp/frams/genetics/geneprops.h (modified) (1 diff)
• framspy/recording-body-coords.sim (modified) (3 diffs)

cpp/frams/config/version.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
-#define MAIN_REL_ID "5.0rc10"
-#define VERSION_INT 3
+#define MAIN_REL_ID "5.0rc30"
+#define VERSION_INT 22
+
+
+#ifdef IPHONE
+        // make the version displayed in the "About" window compatible with Apple's ideas about versioning
+        #define IOS_VERSION "5.0.5" //can't be arbitrary text as in some other platforms, so let's make it "Framsticks version (disregarding rc)" + dot + "number increased on each release"
+        #define VERSION_FOR_MOBI_ABOUT IOS_VERSION "<br><small>(Framsticks " MAIN_REL_ID ")</small>" //...but still display the true internal Framsticks version
+#else
+        #define VERSION_FOR_MOBI_ABOUT MAIN_REL_ID
+#endif

cpp/frams/genetics/geneprops.h

@@ -137 +137 @@
 
         double cred;              ///<incremented by D, decremented by d. Part's red color proportion
-        double cgreen;            ///<incremented by B, decremented by b. Part's blue color proportion
-        double cblue;             ///<incremented by G, decremented by g. Part's green color proportion
+        double cgreen;            ///<incremented by B, decremented by b. Part's green color proportion
+        double cblue;             ///<incremented by G, decremented by g. Part's blue color proportion
 
         static GeneProps standard_values;

framspy/recording-body-coords.sim

@@ -5 +5 @@
 # If STORE_ALL_PART_COORDS=0 below, only COG is stored and the format is
 # [ [cog1x,cog1y,cog1z], [cog2x,cog2y,cog2z], [cog3x,cog3y,cog3z], ...]
-# where numbers are simulation steps.
+# where index numbers in the names are simulation steps.
 # So you get a vector of COG x,y,z coordinates repeated for every simulation step.
 #
 # If STORE_ALL_PART_COORDS=1 below, the format is more verbose with one more level of nesting, because after the COG,
-# the list of coordinates of all Parts follows (the first number below is the simulation step, the second is Part number)
+# the list of coordinates of all Parts follows (the first index in the names below is the simulation step, the second one is Part number)
 # [ [[cog1x,cog1y,cog1z], [p1_1x,p1_1y,p1_1z], [p1_2x,p1_2y,p1_2z], ...], ...]
 #
@@ -25 +25 @@
 {
         super_onBorn(cr);
-        cr.data->bodyrecording=[]; //create key and initialize its value in the "data" dictionary
+        cr.data->bodyrecording=[]; //in the creature's "data" dictionary, create the key "bodyrecording" and initialize its value to empty vector. Equivalent to cr.data["bodyrecording"]=[]
 }
 
@@ -49 +49 @@
         super_addGenotypePerformanceFromCreature(g, cr);
 
-        g.data->bodyrecording = cr.data->bodyrecording; //no averaging or any other form of aggregation - here assuming we only evaluate a genotype once; if not, then we ignore (overwrite) recordings from previous evaluations
+        g.data->bodyrecording = cr.data->bodyrecording; //no averaging or any other form of aggregation - here assuming we only evaluate a given Genotype object once; if not, then we ignore (overwrite) recordings from previous evaluations of this genotype
         
         //Simulator.print("Recorded time steps: %d" % g.data->bodyrecording.size); //just for debugging