Changeset 114 for cpp/frams

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

Location:

cpp/frams/model

Files:

• model.cpp (modified) (3 diffs)
• modelparts.cpp (modified) (2 diffs)
• modelparts.h (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);

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;

cpp/frams/model/modelparts.h

@@ -116 +116 @@
         {d=Pt3D(_d,0,0);}
 void defassign();
+void resetDeltaMarkers();
 public:
 // base properties:
@@ -146 +147 @@
     delta value is not changed.
  */
-void useDelta(int false_or_true);
-
-/** @return 1 if delta option is in effect.
+void useDelta(bool use);
+
+/** @return true if delta option is in effect.
     @see useDelta(), resetDelta(), useDelta()
 */
-int isDelta(); 
+bool isDelta(); 
 
 /// ParamInterface object is preferred way to get/set other properties.
@@ -164 +165 @@
 /** flag: generated f0 should include delta data.
     set by 'singlestep' if j: attributes use delta option */
-int usedelta;
+bool usedelta;
 Pt3D vcolor;