Changeset 653 for cpp/frams

Timestamp:

04/20/17 21:06:47 (8 years ago)

Author:

Maciej Komosinski

Message:

Model::buildUsingSolidShapeTypes() can now handle single-Part models (affects SolidsShapeTypeModel?, ModelGeometryInfo?)

File:

• cpp/frams/model/model.cpp (modified) (3 diffs)

cpp/frams/model/model.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-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -681 +681 @@
                 // attach to part/joint
                 if (nu->part_refno >= 0)
+                {
+                        nu->attachToPart(nu->part_refno);
+                        if (nu->part == NULL)
                         {
-                        nu->attachToPart(nu->part_refno);
-                        if (nu->part==NULL)
-                                { error_message = SString::sprintf("Invalid reference to Part #%d", nu->part_refno); delete nu; return -1; }
+                                error_message = SString::sprintf("Invalid reference to Part #%d", nu->part_refno); delete nu; return -1;
                         }
+                }
                 if (nu->joint_refno >= 0)
+                {
+                        nu->attachToJoint(nu->joint_refno);
+                        if (nu->joint == NULL)
                         {
-                        nu->attachToJoint(nu->joint_refno);
-                        if (nu->joint==NULL)
-                                { error_message = SString::sprintf("Invalid reference to Joint #%d", nu->joint_refno); delete nu; return -1; }
+                                error_message = SString::sprintf("Invalid reference to Joint #%d", nu->joint_refno); delete nu; return -1;
                         }
+                }
                 if (srcrange) nu->setMapping(*srcrange);
                 // todo: check part/joint ref# 
@@ -1358 +1362 @@
                 p->scale.z = thickness;
         }
+        if (src_ballandstick_shapes.getJointCount() == 0) //single part "ball-and-stick" models are valid so let's make a valid solid shape model
+                for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
+                {
+                Part *op = src_ballandstick_shapes.getPart(i);
+                Part *p = addNewPart(Part::SHAPE_ELLIPSOID); //always using spherical shape regardless of the 'use_shape' parameter - 'use shape' is meant for sticks!
+                p->p = op->p;
+                p->rot = op->rot;
+                p->scale.x = p->scale.y = p->scale.z = thickness;
+                }
         for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
         {