Changeset 1111 for cpp/frams/model/geometry/modelgeoclass.cpp

Timestamp:

03/16/21 23:59:15 (3 years ago)

Author:

Maciej Komosinski

Message:

Added a function to get voxels of sampled Model geometry from script

File:

• cpp/frams/model/geometry/modelgeoclass.cpp (modified) (7 diffs)

cpp/frams/model/geometry/modelgeoclass.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -11 +11 @@
 static ParamEntry modelgeo_paramtab[] =
 {
-        { "Creature: Geometry", 1, 5, "ModelGeometry",
+        { "Creature: Geometry", 1, 6, "ModelGeometry",
         "Approximately estimates sizes, volume, and area of a Model based on the geometry of its parts.\n"
         "Example usage:\n"
@@ -22 +22 @@
         { "volume", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "volume", "p f()", PROCEDURE(p_volume), },
         { "area", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "area", "p f()", PROCEDURE(p_area), },
+        { "voxels", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "voxels", "p oVector()", PROCEDURE(p_voxels), },
         { "sizesAndAxes", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "sizesAndAxes", "p oVector()", PROCEDURE(p_sizesandaxes), "The returned vector contains XYZ (sizes) and Orient (axes) objects." },
         { 0, 0, 0, },
@@ -33 +34 @@
 
 ModelGeometry::ModelGeometry(ModelObj *mo)
-:par(modelgeo_paramtab, this)
+        :par(modelgeo_paramtab, this)
 {
         cached_for_density = -1; //invalid value, will be updated on first request
@@ -56 +57 @@
         cached_area = -1;
         cached_sizes.x = -1;
+        cached_voxels.setEmpty();
 }
 
@@ -74 +76 @@
         if (m != NULL)
         {
-                if (m->getShapeType() == Model::SHAPETYPE_BALL_AND_STICK)
-                        {
+                if (m->getShapeType() == Model::SHAPETYPE_BALL_AND_STICK)
+                {
                         Model *converted = new Model;
                         converted->open();
                         converted->buildUsingSolidShapeTypes(*m, Part::SHAPE_CYLINDER, 0.2);
                         converted->close();
-                        m=converted;
-                        }
+                        m = converted;
+                }
                 ModelGeometry *mg = new ModelGeometry((ModelObj*)m);
                 mg->density = density;
@@ -106 +108 @@
 }
 
+void ModelGeometry::p_voxels(ExtValue *args, ExtValue *ret)
+{
+        onDensityChanged();
+        if (cached_voxels.isEmpty()) //calculate if invalid
+                cached_voxels = ModelGeometryInfo::getVoxels(*model, density);
+        ret->setObject(cached_voxels);
+}
+
 void ModelGeometry::p_sizesandaxes(ExtValue *args, ExtValue *ret)
 {