Changeset 658 for cpp

Timestamp:

04/24/17 03:14:21 (8 years ago)

Author:

Maciej Komosinski

Message:

• One function name made shorter
• Fixed some typos
• Predictable behavior for empty (zero-Part) Models (that should never happen)

Location:

cpp/frams

Files:

• _demos/geometry/info_test.cpp (modified) (2 diffs)
• model/geometry/geometryutils.cpp (modified) (1 diff)
• model/geometry/modelgeoclass.cpp (modified) (1 diff)
• model/geometry/modelgeometryinfo.cpp (modified) (3 diffs)

cpp/frams/_demos/geometry/info_test.cpp

@@ -30 +30 @@
         Orient axes;
         // Calculating approximate sizes and axes of model. These values are calculated together because
-        // they depends on each other. Sizes are distances between furthest points on model surface
+        // they depend on each other. Sizes are distances between furthest points on model surface
         // measured along corresponding axes. Fields sizes.x and axes.x describes the 'length' of 3D
         // model. Fields sizes.y and axes.y desctibes 'width' of 2D model created by projecting original
@@ -37 +37 @@
         // points created for each unit of length. It means, that for each square unit of surface area
         // of parts of model, at least density^2 points will be created.
-        ModelGeometryInfo::findSizesAndAxesOfModel(model, density, sizes, axes);
+        ModelGeometryInfo::findSizesAndAxes(model, density, sizes, axes);
         
         
         // Creating output variables.
         Pt3D lowerBoundary, upperBoundary;
-        // Calculationg bounding box of model. Result is stored in variables lowerBoundary and
+        // Calculating bounding box of model. Result is stored in variables lowerBoundary and
         // upperBoundary.
         ModelGeometryInfo::boundingBox(model, lowerBoundary, upperBoundary);

cpp/frams/model/geometry/geometryutils.cpp

@@ -9 +9 @@
 double GeometryUtils::pointPosition(const int pointIndex, const int numberOfPoints)
 {
-        return pointIndex / (numberOfPoints-1.0);
+        if (numberOfPoints == 1)
+                return 0;
+        else
+                return pointIndex / (numberOfPoints-1.0);
 }
 

cpp/frams/model/geometry/modelgeoclass.cpp

@@ -102 +102 @@
         onDensityChanged();
         if (cached_sizes.x < 0) //calculate if invalid
-                ModelGeometryInfo::findSizesAndAxesOfModel(*model, density, cached_sizes, cached_axes);
+                ModelGeometryInfo::findSizesAndAxes(*model, density, cached_sizes, cached_axes);
 
         VectorObject* n = new VectorObject;

cpp/frams/model/geometry/modelgeometryinfo.cpp

@@ -7 +7 @@
 #include <frams/model/geometry/meshbuilder.h>
 
-void ModelGeometryInfo::findSizesAndAxesOfModel(const Model &input_model, const double density,
+void ModelGeometryInfo::findSizesAndAxes(const Model &input_model, const double density,
         Pt3D &sizes, Orient &axes)
 {
@@ -25 +25 @@
 }
 
-bool ModelGeometryInfo::boundingBox(const Model &model, Pt3D &lowerBoundary, Pt3D &upperBoundary)
+void ModelGeometryInfo::boundingBox(const Model &model, Pt3D &lowerBoundary, Pt3D &upperBoundary)
 {
-        if (model.getPartCount() == 0)
+        if (model.getPartCount() == 0) //should never happen. Invalid model provided?
         {
-                return false;
+                lowerBoundary = Pt3D_0;
+                upperBoundary = Pt3D_0;
+                return;
         }
         
@@ -42 +44 @@
                 upperBoundary.getMax(partUpperBoundary);
         }
-        
-        return true;
 }