Changeset 114 for cpp/frams/model/modelparts.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/modelparts.cpp (modified) (2 diffs)

cpp/frams/model/modelparts.cpp

@@ -696 +696 @@
 defassign();
 d.x=JOINT_DELTA_MARKER;
+d.y=JOINT_DELTA_MARKER;
+d.z=JOINT_DELTA_MARKER;
 part1=0; part2=0;
 flags=0;
@@ -736 +738 @@
 void Joint::resetDelta()
 {
-d=Pt3D(JOINT_DELTA_MARKER,0,0);
-}
-
-void Joint::useDelta(int false_or_true)
-{
-usedelta=false_or_true;
-}
-
-int Joint::isDelta()
+d=Pt3D(JOINT_DELTA_MARKER,JOINT_DELTA_MARKER,JOINT_DELTA_MARKER);
+}
+
+void Joint::resetDeltaMarkers()
+{
+if (d.x==JOINT_DELTA_MARKER) d.x=0;
+if (d.y==JOINT_DELTA_MARKER) d.y=0;
+if (d.z==JOINT_DELTA_MARKER) d.z=0;
+}
+
+void Joint::useDelta(bool use)
+{
+usedelta=use;
+}
+
+bool Joint::isDelta()
 {
 return usedelta;