Changeset 1118 for cpp/frams

Timestamp:

03/31/21 03:05:28 (4 years ago)

Author:

Maciej Komosinski

Message:

Introduced a common constant for default stick thickness when converting "ball-and-stick" models to "solid-shape" models

Location:

cpp/frams

Files:

• _demos/shapeconvert.cpp (modified) (2 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-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -38 +38 @@
         PreconfiguredGenetics genetics;
         Part::Shape shape = Part::SHAPE_CYLINDER;
-        float thickness = 0.1;
+        float thickness = Part::DEFAULT_STICK_RADIUS;
 
         char* gen_arg = 0;

cpp/frams/model/model.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -389 +389 @@
 
         /// 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 = 0.1);
+        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = Part::DEFAULT_STICK_RADIUS);
 
 protected:
@@ -442 +442 @@
         Model *converted_model;
         Model *using_model;
-        SolidsShapeTypeModel(Model &m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
+        SolidsShapeTypeModel(Model &m, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = Part::DEFAULT_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-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  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.1; //used in SHAPETYPE_BALL_AND_STICK to SHAPETYPE_SOLIDS Model conversion
 
         double mass, size, density, friction, ingest, assim, hollow;