Changeset 165 for cpp/frams/model

Timestamp:

03/11/14 14:32:44 (11 years ago)

Author:

sz

Message:

Model object does not enforce p.m when new style shape is used

File:

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

cpp/frams/model/model.cpp

@@ -883 +883 @@
         p->owner=this;
         p->refno=i;
-        if (checklevel>0)
-                p->mass=0.0;
+        if (p->shape==0)
+                {
+                if (checklevel>0)
+                        p->mass=0.0;
+                }
 //      VALIDMINMAX(p,part,mass);
         VALIDMINMAX(p,Part,size);
@@ -914 +917 @@
                 if (checklevel>0)
                         {
-                        j->part1->mass+=1.0;
-                        j->part2->mass+=1.0;
+                        if (j->part1->shape==0)
+                                j->part1->mass+=1.0;
+                        if (j->part2->shape==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)))
@@ -1007 +1012 @@
                 {
                 p=(Part*)parts(i);
-                if (p->mass<=0.001)
-                        p->mass=1.0;
+                if (p->shape==0)
+                        if (p->mass<=0.001)
+                                p->mass=1.0;
                 p->flags&=~LINKFLAG;
                 }