threading working

1 files changed, 32 insertions, 2 deletions

diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index 78731ba..d91a633 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -15,11 +15,19 @@ void chainImage::init(ofPoint _linkPos,float _linkScale,float _linkRot){
 }
 
 void chainImage::start(bool reverse){
+
 	transition=reverse?1.0f:0.0f;
 	time=ofGetElapsedTimef();
 	setUseTexture(true);
 	scale=reverse?linkScale*link->linkScale:linkScale;
-
+	/*
+	printf("Started: %s: link %f current scale %f transition %f\n",
+		filename.c_str(),
+		linkScale,
+		scale,
+		transition
+	);
+	*/
 }
 
 int chainImage::updateOutput(float decayRatio){
@@ -62,6 +70,13 @@ int chainImage::updateOutput(float decayRatio){
 	transition=-(scale-linkScale)/(linkScale-(linkScale*link->linkScale));
 
 	//transition=min(1.0f,((float)framecount)/totalframes);
+/*
+	printf("ChainImage %f: scale %f linkscale %f transition %f \n",
+		decayRatio,
+		scale,
+		linkScale,
+		transition);
+		*/
 
 	if (scale>linkScale){
 		transition = 0.0f;
@@ -100,8 +115,11 @@ float chainImage::getRotation(){
 	return linkRot+(transition*link->linkRot); //linkRot+
 };
 void chainImage::makeThumbnail(){
+	thumbnail.setUseTexture(false);
 	thumbnail=(const ofImage)*this; //copy the ofImage itself
 
+	//	thumbnail.setFromPixels(this->getPixels());
+
 	float thumbheight=THUMB_SIZE; //ofGetWindowHeight()*THUMB_BORDER_RATIO;
 	float thumbwidth=(thumbnail.getWidth()/thumbnail.getHeight())*thumbheight;
 
@@ -114,6 +132,13 @@ void chainImage::makeThumbnail(){
 		borderwidth);
 
 	thumbnail.resize(thumbwidth,thumbheight);
+	thumbnail.update();
+
+	printf("Rescaled %s: %fx%f\n",
+		filename.c_str(),
+		thumbnail.getWidth(),
+		thumbnail.getHeight()
+		);
 
 	thumbnail.setAnchorPoint(thumbnail.getWidth()/2,thumbnail.getHeight()/2);
 }
@@ -186,4 +211,9 @@ bool chainImage::fromJson(Json::Value json){
 	}
 	return false;
 }
-
+void chainImage::setupTextures(){
+		setUseTexture(true);
+		update();
+		thumbnail.setUseTexture(true);
+		thumbnail.update();
+}