Changeset 114 for cpp/frams/model/model.cpp

Timestamp:

01/26/14 05:53:23 (11 years ago)

Author:

sz

Message:

improved/bug fixed: delta joint mode (in f0 genotypes) is now triggered by any of dx/dy/dz fields, not just dx

File:

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

cpp/frams/model/model.cpp

@@ -594 +594 @@
                 {
                 addJoint(j);
-                if (j->d.x < (JOINT_DELTA_MARKER-1.0))
+                if ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER))
+                        {
                         j->useDelta(1);
+                        j->resetDeltaMarkers();
+                        }
                 j->attachToParts(j->p1_refno,j->p2_refno);
                 if (srcrange) j->setMapping(*srcrange);
@@ -914 +917 @@
                         j->part2->mass+=1.0;
                         }
-                if ((j->usedelta)&&(j->d.x < (JOINT_DELTA_MARKER-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.
                         if (j->part2->flags & LINKFLAG)
@@ -923 +926 @@
                                          i,(const char*)geno.getName());
                                 }
+                        j->resetDeltaMarkers();
                         j->o=j->rot;
                         j->part1->o.transform(j->part2->o,j->o);