Changeset 1023 for cpp

Timestamp:

08/05/20 14:24:31 (4 years ago)

Author:

Maciej Komosinski

Message:

Added GenoOperators::calculateSolidVolume(Part)

Location:

cpp/frams/genetics

Files:

• genooperators.cpp (modified) (1 diff)
• genooperators.h (modified) (1 diff)

cpp/frams/genetics/genooperators.cpp

@@ -455 +455 @@
         return isupper(firstchar) || firstchar == '|' || firstchar == '@' || firstchar == '*';
 }
+
+double GenoOperators::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("GenoOperators", "calculateSolidVolume", LOG_ERROR, "Unsupported part shape");
+                return -1;
+        }
+}

cpp/frams/genetics/genooperators.h

@@ -214 +214 @@
         static char* strchrn0(const char *str, char ch); ///<like strchr, but does not find zero char in \e str.
         static bool canStartNeuroClassName(const char firstchar); ///<determines if \e firstchar may start NeuroClass name. If not, it might start NeuroClass' (or Neuro's) property name.
+
+        static double calculateSolidVolume(Part *part);
+
         //@}
 };