Changeset 999 for cpp/frams/_demos/genomanipulation.cpp

Timestamp:

07/13/20 13:51:43 (4 years ago)

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/_demos/genomanipulation.cpp (modified) (3 diffs)

cpp/frams/_demos/genomanipulation.cpp

@@ -196 +196 @@
                         printf(cl->getPreferredOutput() ? "and provides meaningful output signal (getPreferredOutput()==1).\n" : "and doesn't provide useful output signal (getPreferredOutput()==0).\n");
                         printf("Instances of '%s' can be used in models having ", cl->getName().c_str());
-                        if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPE_ALL)
+                        if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPETYPE_ALL)
                                 printf("any shape types.\n");
                         else
                         {
                                 printf("shape types:");
-                                for (int i = Model::SHAPE_FIRST; i <= Model::SHAPE_LAST; i++)
+                                for (int i = Model::SHAPETYPE_FIRST; i <= Model::SHAPETYPE_LAST; i++)
                                         if (cl->isShapeTypeSupported((Model::ShapeType)i))
                                                 printf(" '%s'", Model::getShapeTypeName((Model::ShapeType)i));
@@ -209 +209 @@
                         {
                                 printf("Instances of '%s' can be attached to Joints having ", cl->getName().c_str());
-                                if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINT_ALL)
+                                if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINTSHAPE_ALL)
                                         printf("any shapes");
                                 else
@@ -311 +311 @@
                 g.getFormat().c_str(), g.getComment().c_str());
 
-        Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
+        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
 
         if (!m.isValid())