Changeset 544 for cpp/frams/model/modelparts.h

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/model/modelparts.h (modified) (3 diffs)

cpp/frams/model/modelparts.h

@@ -85 +85 @@
 ///
 paInt shape;///default=old Framsticks compatible, do not mix with shapes>0
-enum Shape {SHAPE_DEFAULT=0, SHAPE_ELLIPSOID=1, SHAPE_CUBOID=2, SHAPE_CYLINDER=3};
+enum Shape {SHAPE_BALL_AND_STICK=0, SHAPE_ELLIPSOID=1, SHAPE_CUBOID=2, SHAPE_CYLINDER=3};
 double mass,size,density,friction,ingest,assim,hollow;
 Pt3D scale;
@@ -95 +95 @@
 double vsize;
 
-Part(enum Shape s=SHAPE_DEFAULT);
+Part(enum Shape s=SHAPE_BALL_AND_STICK);
 Part(const Part& src):PartBase(getDefaultStyle()) {operator=(src);}
 void operator=(const Part& src);
@@ -124 +124 @@
 class Pt3D d;           ///< position delta between parts
 class Pt3D rot; ///< orientation delta between parts expressed as 3 angles
-enum Shape {SHAPE_DEFAULT=0, SHAPE_SOLID=1};
-paInt shape;///< default=old Framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with shape>0,  solid=merge parts into one physical entity
+enum Shape {SHAPE_BALL_AND_STICK=0, SHAPE_FIXED=1};
+paInt shape;///< ball-and-stick=old Framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with shape>0,  fixed=merge parts into one physical entity
 
 Joint();