Changeset 1032 for cpp/frams/model

Timestamp:

11/27/20 20:54:50 (3 years ago)

Author:

Maciej Komosinski

Message:

• fS: comma as an intuitive separator in genotype instead of weird symbols ^;'
• other minor refactorizations

Location:

cpp/frams/model/geometry

Files:

• geometryutils.cpp (modified) (2 diffs)
• geometryutils.h (modified) (2 diffs)
• part_distance_estimator.h (moved) (moved from cpp/frams/genetics/fS/part_distance_estimator.h) (1 diff)

cpp/frams/model/geometry/geometryutils.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -369 +369 @@
         return M_PI * ((3 * (a+b)) - sqrt((3*a + b) * (a + 3*b)));
 }
+
+double GeometryUtils::calculateSolidVolume(Part * part)
+{
+        double radiiProduct = part->scale.x * part->scale.y * part->scale.z;
+        switch (part->shape)
+        {
+                case Part::Shape::SHAPE_CUBOID:
+                        return 8.0 * radiiProduct;
+                case Part::Shape::SHAPE_CYLINDER:
+                        return  2.0 * M_PI * radiiProduct;
+                case Part::Shape::SHAPE_ELLIPSOID:
+                        return  (4.0 / 3.0) * M_PI * radiiProduct;
+                default:
+                        logMessage("GeometryUtils", "calculateSolidVolume", LOG_ERROR, "Unsupported part shape");
+                        return -1;
+        }
+}
+
+bool GeometryUtils::isSolidPartScaleValid(const Part::Shape &partShape, const Pt3D &scale)
+{
+        Part *tmpPart = new Part(partShape);
+        tmpPart->scale = scale;
+        double volume = GeometryUtils::calculateSolidVolume(tmpPart);
+
+        Part_MinMaxDef minP = Model::getMinPart();
+        Part_MinMaxDef maxP = Model::getMaxPart();
+
+        if (volume > maxP.volume || minP.volume > volume)
+                return false;
+        if (scale.x < minP.scale.x || scale.y < minP.scale.y || scale.z < minP.scale.z)
+                return false;
+        if (scale.x > maxP.scale.x || scale.y > maxP.scale.y || scale.z > maxP.scale.z)
+                return false;
+
+        if (partShape == Part::Shape::SHAPE_ELLIPSOID && scale.maxComponentValue() != scale.minComponentValue()) // When any radius has a different value than the others
+                return false;
+        if (partShape == Part::Shape::SHAPE_CYLINDER && scale.y != scale.z) // If base radii have different values
+                return false;
+        return true;
+}

cpp/frams/model/geometry/geometryutils.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -177 +177 @@
         double ellipsoidArea(const double a, const double b, const double c);
         double ellipsePerimeter(const double a, const double b);
+
+        double calculateSolidVolume(Part *part);
+        bool isSolidPartScaleValid(const Part::Shape &partShape, const Pt3D &scale);
 }
 

cpp/frams/model/geometry/part_distance_estimator.h

@@ -56 +56 @@
                 /// tmpPart1 and tmpPart2 are copied for purpose and should not be passed as reference
                 /// This function can change some of the properties of those parts
+                /// tmpPart1 will be approximated by surface points.
+                /// The collision between the parts is detected when any of those points is inside tmpPart2
+                /// If tmpPart1 and tmpPart2 are swapped, the calculated distance may slightly differ
                 Pt3D directionVersor = tmpPart1.p - tmpPart2.p;
                 directionVersor.normalize();
 
-                tmpPart1.p = Pt3D(0);
-                tmpPart2.p = Pt3D(0);
+                tmpPart1.p = Pt3D_0;
+                tmpPart2.p = Pt3D_0;
 
                 static double CBRT_3 = std::cbrt(3);