restore settings correctly

1 files changed, 10 insertions, 6 deletions

diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index 6a12c99..287cf26 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -3,8 +3,12 @@
 
 void viewpoint::setup(map<string,string>&settings){
     //setup(float w, float h, float x, float y) {
-    if (DEBUG) printf("window: %f,%f %fx%f n",ofGetWidth()*ofToFloat(settings["x"]),ofGetHeight()*ofToFloat(settings["y"]),ofGetWidth()*ofToFloat(settings["w"]),ofGetHeight()*ofToFloat(settings["h"]));
-	window=ofRectangle(ofGetWidth()*ofToFloat(settings["x"]),ofGetHeight()*ofToFloat(settings["y"]),ofGetWidth()*ofToFloat(settings["w"]),ofGetHeight()*ofToFloat(settings["h"]));
+    x=ofToFloat(settings["x"]);
+    y=ofToFloat(settings["y"]);
+    w=ofToFloat(settings["w"]);
+    h=ofToFloat(settings["h"]);
+    if (DEBUG) printf("window: %f,%f %fx%f n",ofGetWidth()*x,ofGetHeight()*y,ofGetWidth()*w,ofGetHeight()*h);
+	window=ofRectangle(ofGetWidth()*x,ofGetHeight()*y,ofGetWidth()*w,ofGetHeight()*h);
 	distortFactor=ofToFloat(settings["distort"]);
 	renderFBO.allocate(window.width,window.height,GL_RGB);
 
@@ -30,10 +34,10 @@ void viewpoint::setup(map<string,string>&settings){
 	light.setDirectional();
 }
 double viewpoint::getSetting(const string& setting){
-    if (setting=="x") return window.x/ofGetWidth();
-    if (setting=="y") return window.y/ofGetHeight();
-    if (setting=="w") return window.width/ofGetWidth();
-    if (setting=="h") return window.height/ofGetHeight();
+    if (setting=="x") return x;
+    if (setting=="y") return y;
+    if (setting=="w") return w;
+    if (setting=="h") return h;
 	if (setting=="fov") return vars[0].getVal();
     if (setting=="targX") return vars[1].getVal();
 	if (setting=="targY") return vars[2].getVal();