Changeset 999 for cpp/frams/model/model.h

Timestamp:

07/13/20 13:51:43 (5 years ago)

Author:

Maciej Komosinski

Message:

More consistent usage of "shapetype" (vs. "shape")

File:

• cpp/frams/model/model.h (modified) (4 diffs)

cpp/frams/model/model.h

@@ -101 +101 @@
         };
 protected:
-        ShapeType shape;
-        ShapeType declared_shape;
+        ShapeType shapetype;
+        ShapeType declared_shapetype;
 
         SString nameForErrors() const;
@@ -134 +134 @@
         int isValid() const { return buildstatus == valid; }
         int getErrorPosition(bool includingwarnings = false);
-        ShapeType getShapeType() const { return shape; }
+        ShapeType getShapeType() const { return shapetype; }
         bool isUsingCheckpoints() const { return using_checkpoints; }
         bool isCheckpoint() const { return is_checkpoint; }
@@ -155 +155 @@
 
         /// Create empty model with invalid empty genotype, declaring the shape type for later operations
-        Model(ShapeType sh = SHAPE_UNKNOWN);
+        Model(ShapeType sh = SHAPETYPE_UNKNOWN);
 
         /// Change the declared shape type of the Model
@@ -333 +333 @@
 
         /** create new Part and add it to the model. @see addPart()  */
-        Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL_AND_STICK) { return addPart(new Part(shape)); }
+        Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL) { return addPart(new Part(shape)); }
         /** create new Joint and add it to the model. @see addJoint() */
-        Joint *addNewJoint(Part *p1 = NULL, Part *p2 = NULL, Joint::Shape shape = Joint::SHAPE_BALL_AND_STICK) { Joint *j = addJoint(new Joint()); j->shape = shape; if ((p1 != NULL) && (p2 != NULL)) j->attachToParts(p1, p2); return j; }
+        Joint *addNewJoint(Part *p1 = NULL, Part *p2 = NULL, Joint::Shape shape = Joint::SHAPE_STICK) { Joint *j = addJoint(new Joint()); j->shape = shape; if ((p1 != NULL) && (p2 != NULL)) j->attachToParts(p1, p2); return j; }
         /** create new Neuro and add it to the model. @see addNeuro() */
         Neuro *addNewNeuro() { return addNeuro(new Neuro()); }