Ignore:
Timestamp:
07/13/20 13:51:43 (2 years ago)
Author:
Maciej Komosinski
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/model/model.h

    r972 r999  
    101101        };
    102102protected:
    103         ShapeType shape;
    104         ShapeType declared_shape;
     103        ShapeType shapetype;
     104        ShapeType declared_shapetype;
    105105
    106106        SString nameForErrors() const;
     
    134134        int isValid() const { return buildstatus == valid; }
    135135        int getErrorPosition(bool includingwarnings = false);
    136         ShapeType getShapeType() const { return shape; }
     136        ShapeType getShapeType() const { return shapetype; }
    137137        bool isUsingCheckpoints() const { return using_checkpoints; }
    138138        bool isCheckpoint() const { return is_checkpoint; }
     
    155155
    156156        /// Create empty model with invalid empty genotype, declaring the shape type for later operations
    157         Model(ShapeType sh = SHAPE_UNKNOWN);
     157        Model(ShapeType sh = SHAPETYPE_UNKNOWN);
    158158
    159159        /// Change the declared shape type of the Model
     
    333333
    334334        /** create new Part and add it to the model. @see addPart()  */
    335         Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL_AND_STICK) { return addPart(new Part(shape)); }
     335        Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL) { return addPart(new Part(shape)); }
    336336        /** create new Joint and add it to the model. @see addJoint() */
    337         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; }
     337        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; }
    338338        /** create new Neuro and add it to the model. @see addNeuro() */
    339339        Neuro *addNewNeuro() { return addNeuro(new Neuro()); }
Note: See TracChangeset for help on using the changeset viewer.