sliders workingHEADmaster

1 files changed, 30 insertions, 119 deletions

diff --git a/src/testApp.cpp b/src/testApp.cpp
index 8e1bb77..65b637f 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -26,62 +26,18 @@ void testApp::setup(){
 
 	camera.setParent(target);
     camera.setPosition(0,0,200);
-	
-	vars=new keyVar[9];
-	
-	vars[0].set('w','s',17.25,1.0,1.0,2.0);
-	
-	/*
-	
-case 'w':
-	fov*=0.99;
-	break;
-case 's':
-	fov*=1.01;
-	break;
-	
-	//nav stuff
-case 'g':
-	target.move(1,0,0);
-	break;
-case 'd':
-	target.move(-1,0,0);
-	break;
-case 'r':
-	target.move(0,1,0);
-	break;
-case 'v':
-	target.move(0,-1,0);
-	break;
-case 'c':
-	target.move(0,0,1);
-	break;
-case 't':
-	target.move(0,0,-1);
-	break;
-	
-case 'h':
-	target.rotate(1,0,1,0);
-	break;
-case 'j':
-	target.rotate(-1,0,1,0);
-	break;
-case 'u':
-	target.rotate(1,1,0,0);
-	break;
-case 'n':
-	target.rotate(-1,1,0,0);
-	break;
-	
-case 'o':
-	camera.move(0,0,1);
-	break;
-case 'l':
-	camera.move(0,0,-1);
-	break;
-	 
-	 */
-    
+
+	vars=new keyVar[7];
+
+	//void set(char _keyInc,char _keyDec,float _val,float _speed,float _accel,float accelTime);
+	vars[0].set('w','s',17.25,0.5,2.0,3.0);
+	vars[1].set('g','d',0.0,0.2,3.0,3.0);
+	vars[2].set('r','v',0.0,0.2,3.0,3.0);
+	vars[3].set('t','c',0.0,0.2,3.0,3.0);
+	vars[4].set('u','n',0.0,1.0,3.0,3.0);
+    vars[5].set('j','h',0.0,1.0,3.0,3.0);
+    vars[6].set('o','l',0.0,0.2,3.0,3.0);
+
 }
 
 //--------------------------------------------------------------
@@ -107,11 +63,14 @@ void testApp::draw(){
     glMatrixMode(GL_MODELVIEW);
    // glLoadMatrixf(ofMatrix4x4::getInverseOf(getGlobalTransformMatrix()).getPtr());
    */
-	
+
     camera.begin();
 	camera.setFov(vars[0].getVal());
-	
-	
+	target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal());
+	target.rotate(vars[4].getInc(),1,0,0);
+	target.rotate(vars[5].getInc(),0,1,0);
+    camera.move(0,0,vars[6].getInc());
+
 		ofBackground(0);
 
 		ofSetColor(255,0,0);
@@ -264,77 +223,29 @@ void testApp::draw(){
     //renderFBO.getTextureReference().unbind();
     unbindTexture(renderFBO);
 
-    ofSetHexColor(0x000000);
+     // add polygons here
+    //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
+    */
+
+    ofSetHexColor(0xFFFFFF);
     ofDrawBitmapString("fps: "+ofToString(ofGetFrameRate(), 2), 10, 15);
+    //ofDrawBitmapString("segmentpow: "+ofToString(pow(vars[0].segment,vars[0].accel), 2), 10, 25);
+
+
+
 
 
- // add polygons here
-    //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-    */
 
 }
 
 //--------------------------------------------------------------
 void testApp::keyPressed(int key){
-	vars[0].keyPressed(key);
-    switch (key) {
-			/*
-       case 'w':
-            fov*=0.99;
-            break;
-        case 's':
-            fov*=1.01;
-            break;
-			 */
-			
-			//nav stuff
-        case 'g':
-            target.move(1,0,0);
-            break;
-        case 'd':
-            target.move(-1,0,0);
-            break;
-        case 'r':
-            target.move(0,1,0);
-            break;
-        case 'v':
-            target.move(0,-1,0);
-            break;
-        case 'c':
-            target.move(0,0,1);
-            break;
-        case 't':
-            target.move(0,0,-1);
-            break;
-			
-        case 'h':
-            target.rotate(1,0,1,0);
-            break;
-        case 'j':
-			target.rotate(-1,0,1,0);
-            break;
-        case 'u':
-            target.rotate(1,1,0,0);
-            break;
-        case 'n':
-			target.rotate(-1,1,0,0);
-            break;
-			
-        case 'o':
-            camera.move(0,0,1);
-            break;
-        case 'l':
-			camera.move(0,0,-1);
-            break;
-    }
-    //printf("xyx: %f,%f,%f rxry: %f,%f fov: %f\n",cx,cy,cz,crx,cry,fov);
-
-}
+    for (int i=0;i<7;i++) vars[i].keyPressed(key);
+ }
 
 //--------------------------------------------------------------
 void testApp::keyReleased(int key){
-	//printf("released %i\n",key);
-	vars[0].keyReleased(key);
+	for (int i=0;i<7;i++) vars[i].keyReleased(key);
 }
 
 //--------------------------------------------------------------