Changeset 1125

Timestamp:

04/11/21 02:09:28 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp

Files:

• common/util-string.h (modified) (2 diffs)
• frams/model/geometry/geometryutils.cpp (modified) (2 diffs)
• frams/model/similarity/measure-distribution.cpp (modified) (1 diff)

cpp/common/util-string.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.
 
@@ -13 +13 @@
 char* strmove(char *a, char *b); //strcpy that works well for overlapping strings ("Source and destination overlap")
 bool str_starts_with(const char *str, const char *prefix);
-inline bool starts_with(string& str, const char *prefix) { return str_starts_with(str.c_str(),prefix); } //std::string.starts_with(...) since c++20
+inline bool starts_with(const string& str, const char *prefix) { return str_starts_with(str.c_str(),prefix); } //std::string.starts_with(...) since c++20
 
 string ssprintf(const char* format, ...);

cpp/frams/model/geometry/geometryutils.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.
 
 #include "geometryutils.h"
 #include <math.h>
+
+#define POINT_AS_BALL_SCALE 0.05 //scale (i.e., size) of balls (Part::SHAPE_ELLIPSOID). This is only used when building a Model that visualizes sampling points in another Model.
+
 
 double GeometryUtils::pointPosition(const int pointIndex, const int numberOfPoints)
@@ -429 +432 @@
 
     part->p = Pt3D(markerLocation);
-    part->scale = Pt3D(0.05);
+    part->scale = Pt3D(POINT_AS_BALL_SCALE);
     part->vcolor = Pt3D(1.0, 1.0, 0.0);
 
-    model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
+    model.addNewJoint(anchor, part, Joint::SHAPE_FIXED); //keep all Parts in the Model connected (just for Model validity)
 }
 

cpp/frams/model/similarity/measure-distribution.cpp

@@ -72 +72 @@
         int samples_taken = samples_num;
 
-        //Check if total number of point pairs is smaller than samples number (just to avoid the calculation of the same stats for the same pairs of Parts)
+        //Check if total number of point pairs is smaller than samples number (just to avoid the calculation of the same stats for the same pairs of points).
         //This optimization turned out to have a minor effect, only present for very high simil_samples_num, and was not perfect anyway:
         //- samples are selected randomly so there are no guarantees that they will be repeated,