From 746cf395f21451c41af6ac97e318e84dc4dcf3e2 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Oct 2017 16:54:01 +0000 Subject: temp rotation fix --- gui/src/chainImage.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp index f712e71..3db0e7d 100644 --- a/gui/src/chainImage.cpp +++ b/gui/src/chainImage.cpp @@ -60,23 +60,23 @@ void chainImage::updateRotationTimeline(){ ofPoint cp1,cp2,p; - if(linked->getLinkRot()==0.0f){ //hmm, shouldn't use float equality + //if(linked->getLinkRot()==0.0f){ //if this is where the rotation starts cp1=ofPoint(ROTATION_BEZIER_FRACTION, 0); - } - else { - float slope=link->getLinkRot()-linked->getLinkRot(); - cp1=ofPoint(ROTATION_BEZIER_FRACTION,slope/ROTATION_BEZIER_FRACTION); - } + //} + //else { + // float slope=link->getLinkRot()-linked->getLinkRot(); + // cp1=ofPoint(ROTATION_BEZIER_FRACTION,slope/ROTATION_BEZIER_FRACTION); + //} - if(link->getLinkRot()==link->link->getLinkRot()){ //hmm, shouldn't use float equality + //if(link->link->getLinkRot()==0.0f){ //hmm, shouldn't use float equality cp2=ofPoint(1.0f-ROTATION_BEZIER_FRACTION, link->getLinkRot()); - } - else { - float slope=link->link->getLinkRot()-getLinkRot(); - cp2=ofPoint(1.0f-ROTATION_BEZIER_FRACTION, link->getLinkRot()); - } + //} + //else { + // float slope=link->link->getLinkRot()-getLinkRot(); + // cp2=ofPoint(1.0f-ROTATION_BEZIER_FRACTION, link->getLinkRot()); + //} - p=ofPoint(1.0f, link->getLinkRot() ); + p=ofPoint(1.0f, link->getLinkRot()); rotationTimeline.bezierTo(cp1,cp2,p); -- cgit v1.2.3