Changeset 1318 for cpp

Timestamp:

07/11/24 17:59:38 (6 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp

Files:

• common/nonstd_math.h (modified) (1 diff)
• frams/config/version.h (modified) (1 diff)
• frams/model/modelparts.h (modified) (1 diff)

cpp/common/nonstd_math.h

@@ -25 +25 @@
 inline double rndDouble(double limit_exclusive) { return rndGetInstance().getDouble() * limit_exclusive; }
 inline unsigned int rndUint(unsigned int limit_exclusive) { return (unsigned int)(rndGetInstance().getDouble() * limit_exclusive); } //returns random from 0..limit_exclusive-1
-#ifndef __BORLANDC__ //for embarcadero 11u3, unsigned int and size_t are duplicates
-inline unsigned int rndUint(size_t limit_exclusive) {return rndUint((unsigned int)limit_exclusive);} //just an overload with size_t argument
+#if !defined __BORLANDC__ && !defined __ARM_ARCH_7A__ //for 32-bit compilations (embarcadero 11u3 and clang android), unsigned int and size_t function variants are duplicates. Using templates to define an additional function variant only when size_t is different from unsigned int is such a hassle... especially that some variants are inline, some are not. Another approach would be to create a template for all types (or all integer types?) and potentially getting an overflow for longer int types when casting the result of getDouble()*limit_exclusive to unsigned int.
+inline unsigned int rndUint(size_t limit_exclusive) {return rndUint((unsigned int)limit_exclusive);} //just an overload with size_t argument to avoid compiler warnings and avoid hundreds of casts. May limit the range if size_t is larger than unsigned int and somebody would intentionally use such a huge limit_exclusive value.
 #endif
 unsigned int rndUint(int limit_exclusive); //just an overload with int argument

cpp/frams/config/version.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#define MAIN_REL_ID "5.0rc30"
-#define VERSION_INT 22
+#define MAIN_REL_ID "5.0"
+#define VERSION_INT 23
 
 
 #ifdef IPHONE
-        // make the version displayed in the "About" window compatible with Apple's ideas about versioning
-        #define IOS_VERSION "5.0.5" //can't be arbitrary text as in some other platforms, so let's make it "Framsticks version (disregarding rc)" + dot + "number increased on each release"
+        // in the "About" window, display both MAIN_REL_ID and the version compatible with Apple's ideas about versioning
+        #define IOS_VERSION "5.0.7" //for Apple, this can't be arbitrary text (like MAIN_REL_ID could be) as in some other platforms, so let's make it "Framsticks version (disregarding "rc", "beta" etc.)" + dot + "number increased on each release"
         #define VERSION_FOR_MOBI_ABOUT IOS_VERSION "<br><small>(Framsticks " MAIN_REL_ID ")</small>" //...but still display the true internal Framsticks version
 #else

cpp/frams/model/modelparts.h

@@ -99 +99 @@
         enum Shape {
                 SHAPE_BALL = 0, ///<  for "ball and stick" shape type model only.
-                SHAPE_ELLIPSOID = 1, SHAPE_CUBOID = 2, SHAPE_CYLINDER = 3,
+                SHAPE_ELLIPSOID = 1, SHAPE_CUBOID = 2 /* rectangular cuboid */, SHAPE_CYLINDER = 3,
                 SHAPE_FIRST = SHAPE_BALL, SHAPE_LAST = SHAPE_CYLINDER // for iteration
         };
         static const char* getShapeName(Shape sh);
-        static constexpr double DEFAULT_STICK_RADIUS = 0.15; //used in odesim and in SHAPETYPE_BALL_AND_STICK to SHAPETYPE_SOLIDS Model conversion
+        static constexpr double DEFAULT_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;