Changeset 114 for cpp/frams/model/model.cpp
- Timestamp:
- 01/26/14 05:53:23 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/model/model.cpp
r109 r114 594 594 { 595 595 addJoint(j); 596 if (j->d.x < (JOINT_DELTA_MARKER-1.0)) 596 if ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER)) 597 { 597 598 j->useDelta(1); 599 j->resetDeltaMarkers(); 600 } 598 601 j->attachToParts(j->p1_refno,j->p2_refno); 599 602 if (srcrange) j->setMapping(*srcrange); … … 914 917 j->part2->mass+=1.0; 915 918 } 916 if ((j->usedelta)&&( j->d.x < (JOINT_DELTA_MARKER-1.0)))919 if ((j->usedelta)&&((j->d.x!=JOINT_DELTA_MARKER)||(j->d.y!=JOINT_DELTA_MARKER)||(j->d.z!=JOINT_DELTA_MARKER))) 917 920 { // delta positioning -> calc. orient. 918 921 if (j->part2->flags & LINKFLAG) … … 923 926 i,(const char*)geno.getName()); 924 927 } 928 j->resetDeltaMarkers(); 925 929 j->o=j->rot; 926 930 j->part1->o.transform(j->part2->o,j->o);
Note: See TracChangeset
for help on using the changeset viewer.