Changeset 544

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

Location:

cpp/frams

Files:

• _demos/geometry/geometrytestutils.cpp (modified) (5 diffs)
• _demos/part_shapes.cpp (modified) (2 diffs)
• _demos/shapeconvert.cpp (modified) (1 diff)
• genetics/fF/conv_fF.cpp (modified) (2 diffs)
• model/model.cpp (modified) (4 diffs)
• model/model.h (modified) (3 diffs)
• model/modelparts.h (modified) (3 diffs)

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -244 +244 @@
         part->vcolor = Pt3D(1.0, 1.0, 0.0);
         
-        model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
+        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
 }
 
@@ -258 +258 @@
         part->p = center;
         part->vcolor = Pt3D(1.0, 0.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
+        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
         
         part = model.addNewPart(Part::SHAPE_CUBOID);
@@ -265 +265 @@
         part->p = center;
         part->vcolor = Pt3D(0.0, 1.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
+        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
         
         part = model.addNewPart(Part::SHAPE_CUBOID);
@@ -272 +272 @@
         part->p = center;
         part->vcolor = Pt3D(0.0, 0.0, 1.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
+        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
 }
 
@@ -282 +282 @@
         target.moveElementsFrom(source);
         
-        target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_SOLID);
+        target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_FIXED);
 }
 

cpp/frams/_demos/part_shapes.cpp

@@ -30 +30 @@
                 p2->setOrient(p1->o.transform(rotation)); //rotation transformed by p1's orientation
 
-                m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
+                m.addNewJoint(p1, p2, Joint::SHAPE_FIXED); //all parts must be connected
         }
 
@@ -45 +45 @@
                         p2->scale = Pt3D(prev.distanceTo(next)*0.5, 0.05, 0.05);// distance*0.5 because scale is "radius", not cylinder length
 
-                        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;

cpp/frams/_demos/shapeconvert.cpp

@@ -75 +75 @@
         }
 
-        if (m.getShape() != Model::SHAPE_OLD)
+        if (m.getShapeType() != Model::SHAPE_BALL_AND_STICK)
         {
-                logPrintf("", "shapeconvert", LOG_ERROR, "Only old style shapes can be converted");
+                logPrintf("", "shapeconvert", LOG_ERROR, "Only ball-and-stick models can be converted");
                 return 3;
         }

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();
 }
 

cpp/frams/model/model.cpp

@@ -944 +944 @@
                         if (p->p.z + p->size > bbmax.z) bbmax.z = p->p.z + p->size;
                         if (shape == SHAPE_UNKNOWN)
-                                shape = (p->shape == Part::SHAPE_DEFAULT) ? SHAPE_OLD : SHAPE_NEW;
+                                shape = (p->shape == Part::SHAPE_BALL_AND_STICK) ? SHAPE_BALL_AND_STICK : SHAPE_SOLIDS;
                         else if (shape != SHAPE_ILLEGAL)
                         {
-                                if ((p->shape == Part::SHAPE_DEFAULT) ^ (shape == SHAPE_OLD))
+                                if ((p->shape == Part::SHAPE_BALL_AND_STICK) ^ (shape == SHAPE_BALL_AND_STICK))
                                 {
                                         shape = SHAPE_ILLEGAL;
-                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent part shapes (mixed old and new shapes)%s", nameForErrors().c_str());
+                                        logPrintf("Model", "internalCheck", LOG_WARN, "Inconsistent part shapes (mixed ball-and-stick and solids shape types)%s", nameForErrors().c_str());
                                 }
                         }
@@ -1014 +1014 @@
                                 if (final)
                                 {
-                                        if (j->shape != Joint::SHAPE_SOLID)
+                                        if (j->shape != Joint::SHAPE_FIXED)
                                         {
                                                 if (j->d() > getMaxJoint().d.x)
@@ -1031 +1031 @@
                         if (shape != SHAPE_ILLEGAL)
                         {
-                                if ((j->shape == Joint::SHAPE_DEFAULT) ^ (shape == SHAPE_OLD))
+                                if ((j->shape == Joint::SHAPE_BALL_AND_STICK) ^ (shape == SHAPE_BALL_AND_STICK))
                                 {
                                         shape = SHAPE_ILLEGAL;
@@ -1363 +1363 @@
                                         if ((oj2->part1 == op) || (oj2->part2 == op))
                                         {
-                                                addNewJoint(getPart(j), getPart(j2), Joint::SHAPE_SOLID);
+                                                addNewJoint(getPart(j), getPart(j2), Joint::SHAPE_FIXED);
                                         }
                                 }

cpp/frams/model/model.h

@@ -119 +119 @@
 
 public:
-        enum Shape { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_OLD, SHAPE_NEW };
+        enum ShapeType { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_BALL_AND_STICK, SHAPE_SOLIDS };
 protected:
-        Shape shape;
+        ShapeType shape;
 
         void updateNeuroRefno(); // set Neuro::refno for all neurons
@@ -156 +156 @@
         int isValid() const { return buildstatus == valid; }
         int getErrorPosition(bool includingwarnings = false);
-        Shape getShape() { return shape; }
+        ShapeType getShapeType() const { return shape; }
 
         void updateRefno(); // set ::refno for all elements
@@ -359 +359 @@
 
         /** create new Part and add it to the model. @see addPart()  */
-        Part *addNewPart(Part::Shape shape = Part::SHAPE_DEFAULT) { return addPart(new Part(shape)); }
+        Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL_AND_STICK) { 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_DEFAULT) { 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_BALL_AND_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()); }

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();