orbiting with light

1 files changed, 13 insertions, 9 deletions

diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 0c7fe8a..39e8d32 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -13,20 +13,20 @@ void viewpoint::setup(int ln,float w, float h, float x, float y) {
 	near=1;
 	far=20;
 
-	camera.setParent(target);
+	//camera.setParent(target);
 	vars=new keyVar[8];
 
 	//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,10,3.0,3.0);
-	vars[2].set('r','v',112,10,3.0,3.0);
-	vars[3].set('t','c',0.0,10,3.0,3.0);
+	vars[1].set('g','d',0.0,100,3.0,3.0);
+	vars[2].set('r','v',112,100,3.0,3.0);
+	vars[3].set('t','c',0.0,100,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',1000.0,10,3.0,3.0);
+	vars[6].set('o','l',1000.0,200,3.0,3.0);
 	vars[7].set('q','a',0,0.0001,2.0,3.0);
 	
-	camera.setPosition(0,0,vars[6].getVal());
+	//camera.setPosition(0,0,vars[6].getVal());
 }
 //--------------------------------------------------------------
 void viewpoint::setLight(){
@@ -37,10 +37,10 @@ void viewpoint::setLight(){
 	camera.setPosition(0,0,vars[6].getVal());
 	 */
 	
-	camera.orbit(vars[4].getVal(), vars[5].getVal(), vars[6].getVal(), target);
-	
+	camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[6].getVal(), target);
+	camera.lookAt(target,ofVec3f(0,1,0));	
 	ofVec3f lp=camera.getGlobalPosition();
-	GLfloat lightPosition[] = {lp.x, lp.y, lp.z};
+	GLfloat lightPosition[] = {lp.x, lp.y, lp.z,1};
 	GLfloat lightColour[] = {0.99, 0.99, 0.99, 0.5};
 	glLightfv(lightNum, GL_POSITION, lightPosition);
 	glLightfv(lightNum, GL_DIFFUSE, lightColour);
@@ -107,6 +107,10 @@ void viewpoint::end(){
 	unbindTexture(renderFBO);
 
 	ofPopMatrix();
+	
+	//ofSetHexColor(0xFFFFFF);
+    //ofDrawBitmapString("camera: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), 10, ofGetHeight()-30);
+	//ofDrawBitmapString("light: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), 10, ofGetHeight()-30);
 
 }
 //--------------------------------------------------------------