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

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/model.cpp (modified) (4 diffs)

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