Changeset 1257 for cpp/frams/genetics/fH/fH_general.cpp

Timestamp:

06/22/23 03:47:26 (17 months ago)

Author:

Maciej Komosinski

Message:

• fH: don't mutate non-standard properties: assimilation, ingestion, stamina, density
• fH: allow relative mutation probabilities in the range 0..100, like in other genetic formats

File:

• cpp/frams/genetics/fH/fH_general.cpp (modified) (4 diffs)

cpp/frams/genetics/fH/fH_general.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -16 +16 @@
 // Methods for loading handles
 
-const char *fH_part_names[FH_PART_PROPS_COUNT] = { "dn", "fr", "ing", "as" };
-
-const char *fH_joint_names[FH_JOINT_PROPS_COUNT] = { "stif", "rotstif", "stam" };
+const char *fH_part_names[FH_PART_PROPS_COUNT] = { "fr" }; // , "dn", "ing", "as" };
+
+const char *fH_joint_names[FH_JOINT_PROPS_COUNT] = { "stif", "rotstif" }; //, "stam" };
 
 void fH_Handle::loadProperties(Param par)
@@ -376 +376 @@
         model->addPart(newpart);
 
-        newpart->density = partprops[0];
-        newpart->friction = partprops[1];
-        newpart->ingest = partprops[2];
-        newpart->assim = partprops[3];
+        newpart->friction = partprops[0]; //Macko 2023-06: TODO partprops[0] is different from par.getDoubleById("fr"); (and par.getDoubleById() is used in createJoint() below, investigate why this difference and whether hardcoded references to fields like here could be avoided? Only use fH_part_names if possible.)
+        //newpart->density = partprops[1];
+        //newpart->ingest = partprops[2];
+        //newpart->assim = partprops[3];
 
         if (createmapping) newpart->addMapping(ranges);
@@ -399 +399 @@
         newjoint->stif = par.getDoubleById("stif");
         newjoint->rotstif = par.getDoubleById("rotstif");
-        newjoint->stamina = par.getDoubleById("stam");
+        //newjoint->stamina = par.getDoubleById("stam");
         newjoint->attachToParts(firstpart, secondpart);
         if (createmapping) newjoint->addMapping(IRange(begin, end));