Skip to content

Commit

Permalink
fixed tendon wrapping error
Browse files Browse the repository at this point in the history
  • Loading branch information
mateiciocarlie committed Jul 8, 2020
1 parent afd30f1 commit 119c793
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/robots/humanHand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ bool Tendon::insPointInsideWrapper()
//convert them to world coordinates
Link *link = wrapper->getAttachedLink();
//position tmpPos = position(l1.toSbVec3f()) * (link->getTran());
l1 = link->getTran().affine() * l1;
l2 = link->getTran().affine() * l2;
l1 = link->getTran() * l1;
l2 = link->getTran() * l2;

double d = pointLineDistance(p0, l1, l2);
if (d < wrapper->radius)
Expand Down Expand Up @@ -307,8 +307,8 @@ inline bool wrapperIntersection(TendonWrapper *wrapper, QString tendonName,
//convert them to world coordinates
Link *link = wrapper->getAttachedLink();

P3 = link->getTran().affine() * P3;
P4 = link->getTran().affine() * P4;
P3 = link->getTran() * P3;
P4 = link->getTran() * P4;

vec3 Pa, Pb;
double mua = 0, mub = 0;
Expand Down Expand Up @@ -350,7 +350,7 @@ inline bool wrapperIntersection(TendonWrapper *wrapper, QString tendonName,
dPrev = dPrev.normalized();
vec3 dRes = Pb + (wrapper->radius) * dPrev;
// transform it to coordinate system of wrapper */
newInsPtPos = link->getTran().inverse().affine() * dRes;
newInsPtPos = link->getTran().inverse() * dRes;
return true;
}
return false;
Expand Down

0 comments on commit 119c793

Please sign in to comment.