Changeset 671 for cpp/frams/genetics/f4/conv_f4.cpp

Timestamp:

08/18/17 15:24:59 (7 years ago)

Author:

Maciej Komosinski

Message:

Unified property names of f1 and f4; improved docs; 3.141 -> M_PI

File:

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

cpp/frams/genetics/f4/conv_f4.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -179 +179 @@
                         // coordinates are left to be computed by Model
                         sprintf(tmpLine, "p:fr=%g,ing=%g,as=%g",
-                                /*1.0/C->P.mass,*/ C->P.friction, C->P.ingest, C->P.assim
+                                /*1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation
                                 //C->firstend.x, C->firstend.y, C->firstend.z
                                 );
@@ -196 +196 @@
                 sprintf(tmpLine, "p:fr=%g,ing=%g,as=%g",
                         //C->lastend.x, C->lastend.y, C->lastend.z
-                        /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingest, C->P.assim
+                        /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation
                         );
                 partidx = singleStepBuild(tmpLine, &range);
@@ -212 +212 @@
                         // relative position -- always (len, 0, 0), along the stick
                         // this is optional!
-                        C->P.len,
+                        C->P.length,
                         // relative rotation
                         C->xrot, C->zrot,
                         //C->P.ruch,   // rotstif
-                        C->P.odpor
+                        C->P.stamina
                         );
                 partidx = singleStepBuild(tmpLine, &range);
@@ -241 +241 @@
                 {
                         if (1 == C->ctrl)
-                                sprintf(tmpLine, "n:j=%d,d=\"@:p=%g\"", C->dadlink->joint_refno, C->P.ruch);
+                                sprintf(tmpLine, "n:j=%d,d=\"@:p=%g\"", C->dadlink->joint_refno, C->P.muscle_power);
                         else
-                                sprintf(tmpLine, "n:j=%d,d=\"|:p=%g,r=%g\"", C->dadlink->joint_refno, C->P.ruch, C->mz);
+                                sprintf(tmpLine, "n:j=%d,d=\"|:p=%g,r=%g\"", C->dadlink->joint_refno, C->P.muscle_power, C->mz);
                         partidx = singleStepBuild(tmpLine, &range);
                         if (partidx < 0) return -32;