Changeset 1173 for cpp

Timestamp:

04/22/22 18:14:32 (3 years ago)

Author:

Maciej Komosinski

Message:

Fixed the descriptor distribution similarity measure: we don't want the Geometry's dummy "anchor" Part to be considered in similarity estimation

Location:

cpp/frams/model

Files:

• geometry/geometryutils.cpp (modified) (3 diffs)
• similarity/simil-measure-base.cpp (modified) (2 diffs)

cpp/frams/model/geometry/geometryutils.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -428 +428 @@
 void GeometryUtils::addPointToModel(const Pt3D &markerLocation, Model &model)
 {
-    Part *anchor = model.getPart(0);
     Part *part = model.addNewPart(Part::SHAPE_ELLIPSOID);
 
@@ -435 +434 @@
     part->vcolor = Pt3D(1.0, 1.0, 0.0);
 
-    model.addNewJoint(anchor, part, Joint::SHAPE_FIXED); //keep all Parts in the Model connected (just for Model validity)
+    if (model.getPartCount() > 1) // keep all Parts in the Model connected (just for Model validity)
+    {
+        Part* prevpart = model.getPart(model.getPartCount() - 2);
+        model.addNewJoint(prevpart, part, Joint::SHAPE_FIXED);
+    }
 }
 

cpp/frams/model/similarity/simil-measure-base.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -70 +70 @@
         Model resultModel;
         resultModel.open();
-        GeometryUtils::addAnchorToModel(resultModel);
 
         MeshBuilder::ModelSurface iterator(density);