Changeset 999 for cpp/frams/model/modelobj.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/model/modelobj.cpp (modified) (4 diffs)

cpp/frams/model/modelobj.cpp

@@ -58 +58 @@
 void ModelObj::p_newfromstring(ExtValue *args, ExtValue *ret)
 {
-        *ret = makeDynamicObject(new Model(Geno(args[0].getString()), Model::SHAPE_UNKNOWN));
+        *ret = makeDynamicObject(new Model(Geno(args[0].getString()), Model::SHAPETYPE_UNKNOWN));
 }
 
@@ -65 +65 @@
         Geno *g = GenoObj::fromObject(args[0].getObject());
         if (g)
-                *ret = makeDynamicObject(new Model(*g, Model::SHAPE_UNKNOWN));
+                *ret = makeDynamicObject(new Model(*g, Model::SHAPETYPE_UNKNOWN));
         else
                 ret->setEmpty();
@@ -74 +74 @@
         Model *m = NULL;
         if (args[0].getType() == TString)
-                m = new Model(Geno(args[0].getString()), Model::SHAPE_UNKNOWN, false, true);
+                m = new Model(Geno(args[0].getString()), Model::SHAPETYPE_UNKNOWN, false, true);
         else
         {
                 Geno *g = GenoObj::fromObject(args[0].getObject(), false);
                 if (g)
-                        m = new Model(*g, Model::SHAPE_UNKNOWN, false, true);
+                        m = new Model(*g, Model::SHAPETYPE_UNKNOWN, false, true);
                 else
                         logPrintf("Model", "newWithCheckpoints", LOG_ERROR, "Geno or string expected, %s found", args[0].typeDescription().c_str());
@@ -178 +178 @@
 void ModelObj::get_solid_model(ExtValue *ret)
 {
-        if (getShapeType() != Model::SHAPE_BALL_AND_STICK)
+        if (getShapeType() != Model::SHAPETYPE_BALL_AND_STICK)
                 ret->setEmpty();
         Model *m = new Model;