diff options
| -rw-r--r-- | gui/.DS_Store | bin | 8196 -> 8196 bytes | |||
| -rw-r--r-- | gui/addons.make | 3 | ||||
| -rw-r--r-- | gui/src/chainImage.cpp | 16 | ||||
| -rw-r--r-- | gui/src/chainImage.h | 5 | ||||
| -rw-r--r-- | gui/src/chainImageSet.cpp | 5 |
5 files changed, 21 insertions, 8 deletions
diff --git a/gui/.DS_Store b/gui/.DS_Store Binary files differindex 58bdd7b..2dd3893 100644 --- a/gui/.DS_Store +++ b/gui/.DS_Store diff --git a/gui/addons.make b/gui/addons.make index ad9d6b0..401342a 100644 --- a/gui/addons.make +++ b/gui/addons.make @@ -3,4 +3,5 @@ ofxDMX ofxMidi ofxArtnet ofxThreadedImageLoader -ofxSyphon
\ No newline at end of file +ofxSyphon +ofxEasing
\ No newline at end of file diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp index 1fbcc73..d362b0c 100644 --- a/gui/src/chainImage.cpp +++ b/gui/src/chainImage.cpp @@ -237,14 +237,24 @@ float chainImage::getRotation(){ } ofxSweepLine crashes - */ + float transitionInterpolated=pow(transition,ROTATION_EASE_POWER); - //printf("rotation: %f at point %f\n",transitionInterpolated,transition); - + printf("rotation: %f of %f at point %f (%f)\n", + transitionInterpolated*link->getLinkRot(), + link->getLinkRot(), + transition, + transitionInterpolated + ); + + return getLinkRot()+(transitionInterpolated*link->getLinkRot()); + */ + + return ofxeasing::map_clamp(transition, 0, 1, getLinkRot(), getLinkRot()+link->getLinkRot(), ofxeasing::cubic::easeInOut); + }; ofPoint chainImage::getLinkPos(){ diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h index 9bfc70c..034d0a4 100644 --- a/gui/src/chainImage.h +++ b/gui/src/chainImage.h @@ -2,6 +2,7 @@ #include "ofMain.h" #include "ofxJSON.h" +#include "ofxEasing.h" #define min(a,b) ((a) < (b) ? (a) : (b)) #define max(a,b) ((a) > (b) ? (a) : (b)) @@ -9,8 +10,8 @@ #define THUMB_BORDER_RATIO 0.8 #define THUMB_SIZE 160 #define DEFAULT_FADEIN 1.0 -#define BEZIER_OUT 0.5 -#define BEZIER_IN 0.5 +#define BEZIER_OUT 0.25 +#define BEZIER_IN 0.25 #define ROTATION_BEZIER_FRACTION 0.0 #define ROTATION_EASE_POWER 4.0 diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp index 569ab0e..d3d363f 100644 --- a/gui/src/chainImageSet.cpp +++ b/gui/src/chainImageSet.cpp @@ -40,6 +40,7 @@ void chainImageSet::drawOutput(){ glScalef(ZOOM_FUDGE_FACTOR,ZOOM_FUDGE_FACTOR,ZOOM_FUDGE_FACTOR); //easy way to limit camera cutoff //printf("drawing rotation %f for transition %f\n",(*currentImage)->getRotation(),(*currentImage)->transition); + float rot=(*currentImage)->getRotation(); gluLookAt( (*currentImage)->getTransform().x, (*currentImage)->getTransform().y, // i1.linkPos.y+(xform.y*intervalpoint), @@ -47,8 +48,8 @@ void chainImageSet::drawOutput(){ (*currentImage)->getTransform().x, (*currentImage)->getTransform().y, // i1.linkPos.y+(xform.y*intervalpoint), 0, - sin(-(*currentImage)->getRotation()*(PI/180)), - cos(-(*currentImage)->getRotation()*(PI/180)), + sin(-rot*(PI/180)), + cos(-rot*(PI/180)), 0); |