Changeset 1313 for cpp/frams/genetics/f4/f4_conv.cpp

Timestamp:

07/11/24 17:15:51 (4 months ago)

Author:

Maciej Komosinski

Message:

Color mutations in f1 and f4, and a new syntax for "allowed modifiers" (opposite to previous "excluded modifiers") with optional probabilities for each modifier

File:

• cpp/frams/genetics/f4/f4_conv.cpp (modified) (5 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -189 +189 @@
         }
 
-        char tmpLine[100];
+        char tmpLine[256];
         MultiRange range = C->genoRange;
 
@@ -200 +200 @@
                         // new part object for firstend
                         // coordinates are left to be computed by Model
-                        sprintf(tmpLine, "fr=%g,ing=%g,as=%g",
-                                /*1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation
+                        sprintf(tmpLine, "fr=%g,ing=%g,as=%g,vr=%g,vg=%g,vb=%g",
+                                /*1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation, C->P.cred, C->P.cgreen, C->P.cblue
                                 //C->firstend.x, C->firstend.y, C->firstend.z
                         );
@@ -216 +216 @@
                 }
                 // new part object for lastend
-                sprintf(tmpLine, "fr=%g,ing=%g,as=%g",
+                sprintf(tmpLine, "fr=%g,ing=%g,as=%g,vr=%g,vg=%g,vb=%g",
                         //C->lastend.x, C->lastend.y, C->lastend.z
-                        /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation
+                        /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation, C->P.cred, C->P.cgreen, C->P.cblue
                 );
                 C->p2_refno = addFromString(PartType, tmpLine, &range);
@@ -241 +241 @@
                 C->joint_refno = addFromString(JointType, tmpLine, &range);
                 if (C->joint_refno < 0) return -13;
+                getJoint(C->joint_refno)->vcolor = (getPart(jj_p1_refno)->vcolor + getPart(jj_p2_refno)->vcolor) / 2; //joint gets the average color of both connected parts
                 this->checkpoint();
         }