Changeset 536 for cpp/frams

Timestamp:

07/20/16 14:57:42 (8 years ago)

Author:

Maciej Komosinski

Message:

"Shaped" models use the same p.mass calculation as "old" models (influences simulation stability)

File:

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

cpp/frams/model/model.cpp

@@ -918 +918 @@
                         p->owner = this;
                         p->refno = i;
-                        if (p->shape == 0)
-                        {
-                                if (checklevel > 0)
-                                        p->mass = 0.0;
-                        }
+                        if (checklevel > 0)
+                                p->mass = 0.0;
                         //VALIDMINMAX(p,part,mass);//mass is very special
                         // VALIDMINMAX are managed manually when adding part properties in f0-def!
@@ -976 +973 @@
                                 j->p2_refno = j->part2->refno;
                                 if (checklevel > 0)
-                                {
-                                        if (j->part1->shape == 0)
-                                                j->part1->mass += 1.0;
-                                        if (j->part2->shape == 0)
-                                                j->part2->mass += 1.0;
-                                }
+                                        {
+                                        j->part1->mass += 1.0;
+                                        j->part2->mass += 1.0;
+                                        }
                                 if ((j->usedelta) && ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER)))
                                 { // delta positioning -> calc. orient.
@@ -1071 +1066 @@
                 {
                         p = (Part*)parts(i);
-                        if (p->shape == 0)
-                                if (p->mass <= 0.001)
-                                        p->mass = 1.0;
+                        if (p->mass <= 0.001)
+                                p->mass = 1.0;
                         p->flags &= ~LINKFLAG;
                 }