Changeset 1323 for cpp/frams

Timestamp:

08/12/24 03:48:20 (3 months ago)

Author:

Maciej Komosinski

Message:

Field rename for less ambiguity

Location:

cpp/frams

Files:

• _demos/shapeconvert.cpp (modified) (5 diffs)
• model/model.cpp (modified) (6 diffs)
• model/model.h (modified) (3 diffs)
• model/modelparts.h (modified) (2 diffs)

cpp/frams/_demos/shapeconvert.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -15 +15 @@
  @file
  Sample code: Convert old-style shapes (sticks are Joints) to new style (sticks are Parts)
- Usage: shapeconvert [-sSHAPE] [-tTHICKNESS] [genotype_or_stdin]
+ Usage: shapeconvert [-sSHAPE] [-rRADIUS] [genotype_or_stdin]
 
  Calling examples:
@@ -38 +38 @@
         PreconfiguredGenetics genetics;
         Part::Shape shape = Part::SHAPE_CYLINDER;
-        float thickness = Part::DEFAULT_STICK_RADIUS;
+        float radius = Part::BALL_AND_STICK_RADIUS;
 
         char* gen_arg = 0;
@@ -54 +54 @@
                                 }
                                 break;
-                        case 't': thickness = atof(ar + 2); break;
-                        case 'h': puts("Usage: shapeconvert [-sSHAPE] [-tTHICKNESS] [genotype_or_stdin]\n\tSHAPE: 1=ellipsoid, 2=cuboid, 3(default)=cylinder\n\tTHICKNESS: used for Part.sy/sz (default=0.2)"); break;
+                        case 'r': radius = atof(ar + 2); break;
+                        case 'h': puts("Usage: shapeconvert [-sSHAPE] [-rRADIUS] [genotype_or_stdin]\n\tSHAPE: 1=ellipsoid, 2=cuboid, 3(default)=cylinder\n\tRADIUS: used for Part.sy/sz (default=0.2)"); break;
                         }
                 else
@@ -83 +83 @@
         Model newmodel;
         newmodel.open();
-        newmodel.buildUsingSolidShapeTypes(m, shape, thickness);
+        newmodel.buildUsingSolidShapeTypes(m, shape, radius);
         newmodel.close();
 

cpp/frams/model/model.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -1289 +1289 @@
 }
 
-void Model::buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape, double thickness)
+void Model::buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape, double radius)
 {
         for (int i = 0; i < src_ballandstick_shapes.getJointCount(); i++)
@@ -1300 +1300 @@
                 p->setRot(o.getAngles());
                 p->scale.x = oj->part1->p.distanceTo(oj->part2->p) / 2;
-                p->scale.y = thickness;
-                p->scale.z = thickness;
+                p->scale.y = radius;
+                p->scale.z = radius;
         }
         if (src_ballandstick_shapes.getJointCount() == 0) //single part "ball-and-stick" models are valid so let's make a valid solid shape model
@@ -1310 +1310 @@
                         p->p = op->p;
                         p->rot = op->rot;
-                        p->scale.x = p->scale.y = p->scale.z = thickness;
+                        p->scale.x = p->scale.y = p->scale.z = radius;
                 }
         for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
@@ -1334 +1334 @@
 }
 
-SolidsShapeTypeModel::SolidsShapeTypeModel(Model &m, Part::Shape use_shape, double thickness)
+SolidsShapeTypeModel::SolidsShapeTypeModel(Model &m, Part::Shape use_shape, double radius)
 {
         using_model = converted_model = NULL;
@@ -1341 +1341 @@
                 converted_model = new Model;
                 converted_model->open();
-                converted_model->buildUsingSolidShapeTypes(m, use_shape, thickness);
+                converted_model->buildUsingSolidShapeTypes(m, use_shape, radius);
                 converted_model->close();
                 using_model = converted_model;

cpp/frams/model/model.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -390 +390 @@
 
         /// build this model using solid shape types, based on the provided ball-and-stick model. See also shapeconvert.cpp.
-        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = Part::DEFAULT_STICK_RADIUS);
+        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double radius = Part::BALL_AND_STICK_RADIUS);
 
 protected:
@@ -443 +443 @@
         Model *converted_model;
         Model *using_model;
-        SolidsShapeTypeModel(Model &m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = Part::DEFAULT_STICK_RADIUS);
+        SolidsShapeTypeModel(Model &m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double radius = Part::BALL_AND_STICK_RADIUS);
         operator Model &() { return *using_model; }
         Model &getModel() { return *using_model; }

cpp/frams/model/modelparts.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -103 +103 @@
         };
         static const char* getShapeName(Shape sh);
-        static constexpr double DEFAULT_STICK_RADIUS = 0.15; //used in odesim, VisualModel, CreatureObj3D, and SHAPETYPE_BALL_AND_STICK to SHAPETYPE_SOLIDS Model conversion
+        static constexpr double BALL_AND_STICK_RADIUS = 0.15; //used in odesim, VisualModel, CreatureObj3D, and SHAPETYPE_BALL_AND_STICK to SHAPETYPE_SOLIDS Model conversion
 
         double mass, size, density, friction, ingest, assim, hollow;