several fies

1 files changed, 9 insertions, 3 deletions

diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp
index 7952d7c..963333a 100644
--- a/gui/src/chainImageSet.cpp
+++ b/gui/src/chainImageSet.cpp
@@ -6,7 +6,7 @@ void chainImageSet::drawOutput(){
 
 	float camera_throw= (float)outputSize.y/(float)outputSize.x; //the ratio of z distance to x width
 
-	camera_throw*=fitFactor; //fudge factor to allow tweening
+	camera_throw*=fitFactor; //fudge factor to allow tweening, 
 
 	//printf("Drawing chain: %i images\n",images.size());
 
@@ -19,6 +19,7 @@ void chainImageSet::drawOutput(){
 */
 		glMatrixMode ( GL_MODELVIEW );
 		glLoadIdentity ( );
+		/* is not what we want
 		glOrtho(
 				0,
 				(*currentImage)->getTransform().x*2,
@@ -27,6 +28,9 @@ void chainImageSet::drawOutput(){
 			 	-100,
 			 	(*currentImage)->getTransform().x*4
 		 	);
+		*/
+		glScalef(8,8,8); //easy way to avoid camera cutoff
+
 		gluLookAt( (*currentImage)->getTransform().x,
 					(*currentImage)->getTransform().y, //	 i1.linkPos.y+(xform.y*intervalpoint),
 					(*currentImage)->getWidth()*camera_throw*(*currentImage)->getScale(), 
@@ -37,6 +41,8 @@ void chainImageSet::drawOutput(){
 					cos(-(*currentImage)->getRotation()*(PI/180)),
 					0);	
 
+
+
 		
 		(*currentImage)->drawChain(DEFAULT_FADEIN,additive,intensity);
 
@@ -461,7 +467,7 @@ void chainImageSet::updateOutput(){
 				ofLogNotice() << "Switched image forward to " << (*currentImage)->filename;
 				
 								
-				(*currentImage)->start();
+				(*currentImage)->start(false);
 				(*currentImage)->updateOutput(decayFactor);
 
 				break;
@@ -476,7 +482,7 @@ void chainImageSet::updateOutput(){
 				
 				currentImage--;
 
-				(*currentImage)->start();
+				(*currentImage)->start(true);
 				ofLogNotice() << "Switched images backward to " << (*currentImage)->filename;
 				(*currentImage)->updateOutput(decayFactor);
 				break;