Changeset 544 for cpp/frams/genetics

Timestamp:

07/28/16 01:09:29 (8 years ago)

Author:

Maciej Komosinski

Message:

Renamed:
Model::getShape() ==> Model::getShapeType()
Model::SHAPE_OLD ==> Model::SHAPE_BALL_AND_STICK
Model::SHAPE_NEW ==> Model::SHAPE_SOLIDS
Part::SHAPE_DEFAULT ==> Part::SHAPE_BALL_AND_STICK
Joint::SHAPE_DEFAULT ==> Joint::SHAPE_BALL_AND_STICK
Joint::SHAPE_SOLID ==> Joint::SHAPE_FIXED

File:

• cpp/frams/genetics/fF/conv_fF.cpp (modified) (2 diffs)

cpp/frams/genetics/fF/conv_fF.cpp

@@ -59 +59 @@
                 Part *p2 = addNewPart(&m, chambers[i]);
                 p2->scale = p1->scale.entrywiseProduct(Pt3D(gp.scalex, gp.scaley, gp.scalez)); //each part's scale is its predecessor's scale * scaling
-                m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
+                m.addNewJoint(p1, p2, Joint::SHAPE_FIXED); //all parts must be connected
                 p1 = p2;
         }
@@ -68 +68 @@
 
         m.close();
-        return m.getF0Geno().getGene();
+        return m.getF0Geno().getGenes();
 }