restored basic operationtim/apect

4 files changed, 19 insertions, 28 deletions

diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index f30677c..a6cde14 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -5,9 +5,9 @@ float distance(ofPoint p1,ofPoint p2){
 }
 
 void chainImage::init(ofPoint _linkPos,float _linkScale,float _linkRot){
-//#ifdef GPU_ALGORITHM
+#ifdef GPU_ALGORITHM
 	shader.load("shader");
-//#endif //GPU_ALGORITHM
+#endif //GPU_ALGORITHM
 	
 	linkPos=_linkPos;
 	linkScale=_linkScale;
@@ -34,7 +34,7 @@ void chainImage::start(bool reverse){
 	);
 	*/
 }
-
+/*
 void chainImage::gpu_drawImage(){
 
 	GLint internalTextureFormat=GL_TEXTURE_2D_ARRAY;
@@ -76,7 +76,7 @@ void chainImage::gpu_drawImage(){
 
 	shader.end();
 	*/
-}
+//}
 
 //rotation could be a lot smoother
 //atm we only do horizontal rotation splines
@@ -465,18 +465,10 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 			float zoomFactor=pow(zoomMultiplier,1.0f+transition);
 
 			glScalef(zoomFactor,zoomFactor,zoomFactor);
-
-			//ofSetColor(colour);
 			
-			float gamma=1.0f; //transition; //(startGamma*transition)+(1.0f*(1.0f-transition));
-			float pedestal=0.0f;
-			float clamp=1.0f; //-transition;
-			lut.load(makeLut(gamma,pedestal,clamp));
-			lut.setBlend(1.0f);
-			lut.begin();
 			//setAlpha(1.0f);
 			draw(0,0,getWidth(),getHeight());
-			lut.end();
+
 
 		glPopMatrix();
 
@@ -489,24 +481,22 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 		//ofEnableAlphaBlending();
 		glEnable(GL_BLEND);
 		 
-		//ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity);
+		ofSetColor(255,255,255,255*min(1.0,transition/fadeIn)*intensity);
 		//setting alpha here doesn't work with shader?
 		//possibly if you could set the alpha when drawing?
 
 		link->setAnchorPoint(link->getWidth()/2,link->getHeight()/2);
 
-			gamma=((1.0f-transition)*10.0f)+1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
-			pedestal=0.0f;
-			clamp=1.0f; //transition;
-			lut.load(makeLut(gamma,pedestal,clamp));
-			lut.setBlend(transition);
-			lut.begin();
+			//gamma=((1.0f-transition)*10.0f)+1.0f; //(startGamma*transition)+(1.0f*(1.0f-transition));
+			//pedestal=0.0f;
+			//clamp=1.0f; //transition;
+			//now aply these to the remap object
+			//doesn't work great anyway and work is lost??
 
 		//ofSetColor(link->colour);
 		//link->setAlpha(transition);
 		link->draw(0,0,link->getWidth(),link->getHeight());
 
-			lut.end();
 
 		glDisable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -514,6 +504,7 @@ void chainImage::drawChain(float fadeIn,bool additive,float intensity,float zoom
 	glPopMatrix();
 }
 
+/*
 void chainImage::gpu_drawChain(float fadeIn,bool additive,float intensity,float zoomMultiplier){	
 
 	ofSetColor(255);
@@ -539,7 +530,7 @@ void chainImage::gpu_drawChain(float fadeIn,bool additive,float intensity,float
 	//1. can we FILL THE SCREEN?
 
 }
-
+*/
 Json::Value chainImage::toJson(){
 	Json::Value json=Json::Value(Json::objectValue);
 	json["linkPos"]=Json::Value(Json::arrayValue);
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index 3763aab..75f290e 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxJSON.h"
 #include "ofxEasing.h"
-#include "ofxGpuLutBlend.h"
+#include "ofxGpuRemapBlend.h"
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define max(a,b) ((a) > (b) ? (a) : (b))
@@ -124,8 +124,8 @@ class chainImage : public ofImage{
 
 		bool isLoaded;
 
-		ofShader shader;
-		ofxGpuLutBlend lut;
+		//ofShader shader;
+		//ofxGpuRemapBlend map;
 
 		//int totalframes,framecount;
 
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp
index 0462de0..586194c 100644
--- a/gui/src/chainImageSet.cpp
+++ b/gui/src/chainImageSet.cpp
@@ -74,7 +74,7 @@ void chainImageSet::drawOutput(){
 	
 
 }
-
+/*
 void chainImageSet::drawGpu(){
 
 	ofSetColor(255);
@@ -93,7 +93,7 @@ void chainImageSet::drawGpu(){
 	}
 	*/
 
-}
+//}
 
 void chainImageSet::drawGui(int x,int y,bool is_selected){	
 
diff --git a/gui/src/chainImageSet.h b/gui/src/chainImageSet.h
index 7df4767..4a13c74 100644
--- a/gui/src/chainImageSet.h
+++ b/gui/src/chainImageSet.h
@@ -30,7 +30,7 @@ class chainImageSet{
 		}
 		void drawGui(int x,int y,bool is_selected);
 		void drawOutput();
-		void drawGpu();
+		//void drawGpu();
 		void updateOutput();
 		bool addfiles(std::vector<string> &filenames);
 		bool add(std::string filename,ofPoint pos=ofPoint(0,0),float ratio=0.3,float rotation=0.0);