Changeset 544 for cpp/frams/_demos

Timestamp:

07/28/16 01:09:29 (9 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/_demos

Files:

• geometry/geometrytestutils.cpp (modified) (5 diffs)
• part_shapes.cpp (modified) (2 diffs)
• shapeconvert.cpp (modified) (1 diff)

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