summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/data/settings.xml4
-rw-r--r--map4.layout14
-rw-r--r--src/main.cpp4
-rw-r--r--src/testApp.cpp5
-rw-r--r--src/viewpoint.cpp35
-rw-r--r--src/viewpoint.h2
6 files changed, 35 insertions, 29 deletions
diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index a358289..3ef31a3 100644
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<map4>
<view>
- <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="0.000000" />
+ <settings x="0.000000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="550.0" />
</view>
<view>
- <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="0.000000" />
+ <settings x="0.500000" y="0.000000" w="0.500000" h="1.000000" distort="0.000000" fov="17.250000" roll="90.000000" targX="0.000000" targY="112.000000" targZ="0.000000" lat="0.000000" lng="0.000000" dolly="550.0" />
</view>
</map4>
diff --git a/map4.layout b/map4.layout
index 1a5625d..406cfcd 100644
--- a/map4.layout
+++ b/map4.layout
@@ -7,28 +7,28 @@
<File name="config.make" open="0" top="0" tabpos="3">
<Cursor position="548" topLine="0" />
</File>
- <File name="src/keyVar.h" open="1" top="0" tabpos="8">
+ <File name="src/keyVar.h" open="0" top="0" tabpos="8">
<Cursor position="0" topLine="0" />
</File>
<File name="src/main.cpp" open="1" top="0" tabpos="3">
- <Cursor position="176" topLine="0" />
+ <Cursor position="865" topLine="0" />
</File>
- <File name="src/mapUtils.cpp" open="1" top="0" tabpos="7">
+ <File name="src/mapUtils.cpp" open="0" top="0" tabpos="7">
<Cursor position="0" topLine="8" />
</File>
- <File name="src/mapUtils.h" open="1" top="0" tabpos="6">
+ <File name="src/mapUtils.h" open="0" top="0" tabpos="6">
<Cursor position="165" topLine="0" />
</File>
<File name="src/testApp.cpp" open="1" top="0" tabpos="2">
- <Cursor position="85" topLine="0" />
+ <Cursor position="1528" topLine="35" />
</File>
<File name="src/testApp.h" open="1" top="0" tabpos="1">
<Cursor position="787" topLine="15" />
</File>
<File name="src/viewpoint.cpp" open="1" top="1" tabpos="5">
- <Cursor position="1289" topLine="0" />
+ <Cursor position="2288" topLine="33" />
</File>
<File name="src/viewpoint.h" open="1" top="0" tabpos="4">
- <Cursor position="207" topLine="0" />
+ <Cursor position="426" topLine="7" />
</File>
</CodeBlocks_layout_file>
diff --git a/src/main.cpp b/src/main.cpp
index e9b2ef4..a0adc83 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,8 @@
int main( ){
ofAppGlutWindow window;
- ofSetupOpenGL(&window, 2048,768, OF_FULLSCREEN); // <-------- setup the GL context
- //ofSetupOpenGL(&window, 800,400, OF_WINDOW);
+ //ofSetupOpenGL(&window, 2048,768, OF_FULLSCREEN); // <-------- setup the GL context
+ ofSetupOpenGL(&window, 1024,300, OF_WINDOW);
glutIgnoreKeyRepeat(1);
glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF); //these don't work!!!
printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
diff --git a/src/testApp.cpp b/src/testApp.cpp
index e7921d4..ab0987b 100644
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -23,7 +23,7 @@ void testApp::setup(){
//ofDisableArbTex();
- texture.loadMovie("stripey2.mov");
+ texture.loadMovie("gradblend01.mov");
texture.play();
mode=CALIBRATE;
@@ -63,7 +63,7 @@ void testApp::draw(){
glPopMatrix();
break;
}
- views[i].end();
+ views[i].end(mode==CALIBRATE);
}
if (mode==CALIBRATE) {
ofSetHexColor(0xFFFFFF);
@@ -125,6 +125,7 @@ void testApp::loadSettings(){
}
XML.popTag();
}
+ printf("loaded settings: %i views\n",numViews);
}
//numViews=2;
diff --git a/src/viewpoint.cpp b/src/viewpoint.cpp
index d354edd..1635cfd 100644
--- a/src/viewpoint.cpp
+++ b/src/viewpoint.cpp
@@ -14,7 +14,7 @@ void viewpoint::setup(map<string,string>&settings){
near=1;
far=20;
- vars=new keyVar[8];
+ vars=new keyVar[9];
vars[0].set('w','s',ofToFloat(settings["fov"]),0.2,1.0,3.0);
vars[1].set('g','d',ofToFloat(settings["targX"]),1,1.0,3.0);
@@ -22,8 +22,9 @@ void viewpoint::setup(map<string,string>&settings){
vars[3].set('t','c',ofToFloat(settings["targZ"]),1,1.0,3.0);
vars[4].set('u','n',ofToFloat(settings["lat"]),1,1.0,3.0);
vars[5].set('j','h',ofToFloat(settings["lng"]),1,1.0,3.0);
- vars[6].set('o','l',ofToFloat(settings["dolly"]),1,1.0,3.0);
- vars[7].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0);
+ vars[6].set(',','m',ofToFloat(settings["roll"]),1,1.0,3.0);
+ vars[7].set('o','l',ofToFloat(settings["dolly"]),1,1.0,3.0);
+ vars[8].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0);
light.enable();
light.setDirectional();
@@ -39,15 +40,16 @@ double viewpoint::getSetting(const string& setting){
if (setting=="targZ") return vars[3].getVal();
if (setting=="lat") return vars[4].getVal();
if (setting=="lng") return vars[5].getVal();
+ if (setting=="roll") return vars[6].getVal();
if (setting=="dolly") return vars[7].getVal();
- if (setting=="distort") return vars[7].getVal();
+ if (setting=="distort") return vars[8].getVal();
return 0.0;
}
//--------------------------------------------------------------
void viewpoint::setLight(){
target.setPosition(vars[1].getVal(),vars[2].getVal(),vars[3].getVal());
- camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[6].getVal(), target);
- camera.lookAt(target,ofVec3f(0,1,0));
+ camera.orbit(vars[5].getVal(), vars[4].getVal(), vars[7].getVal(), target);
+ camera.lookAt(target,ofVec3f(0,1,0).rotate(vars[6].getVal(),ofVec3f(0,0,1)));
light.setPosition(camera.getGlobalPosition());
}
void viewpoint::setDefaults(){
@@ -57,8 +59,9 @@ void viewpoint::setDefaults(){
vars[3].setVal(0.0);
vars[4].setVal(0.0);
vars[5].setVal(0.0);
- vars[6].setVal(1000.0);
- vars[7].setVal(0.0);
+ vars[6].setVal(0.0);
+ vars[7].setVal(1000.0);
+ vars[8].setVal(0.0);
}
//--------------------------------------------------------------
void viewpoint::begin(){
@@ -69,9 +72,9 @@ void viewpoint::begin(){
camera.setFov(vars[0].getVal());
}
//--------------------------------------------------------------
-void viewpoint::end(){
- camera.end();
+void viewpoint::end(bool showStats){
+ camera.end();
renderFBO.end();
ofPushMatrix();
@@ -92,8 +95,8 @@ void viewpoint::end(){
ofPoint p0;
ofPoint p1;
for (float j = -1; j < 1.001; j+=(2.0f/gridX)){
- p0=distort(ofPoint(j,i-(2.0f/gridY)),vars[7].getVal());
- p1=distort(ofPoint(j,i),vars[7].getVal());
+ p0=distort(ofPoint(j,i-(2.0f/gridY)),vars[8].getVal());
+ p1=distort(ofPoint(j,i),vars[8].getVal());
glTexCoord2f((j+1)*0.5,((i-(2.0f/gridY))+1)*0.5);
glVertex3f(p0.x*xStep,p0.y*yStep,-0.1);
glTexCoord2f((j+1)*0.5,(i+1)*0.5);
@@ -106,9 +109,11 @@ void viewpoint::end(){
unbindTexture(renderFBO);
ofPopMatrix();
- ofSetHexColor(0xFFFFFF);
- ofDrawBitmapString("camera: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), window.x+10, window.y+window.height-30);
- ofDrawBitmapString("light: "+ofToString(light.getX(), 2)+","+ofToString(light.getY(), 2)+","+ofToString(light.getZ(), 2), window.x+10, window.y+window.height-18);
+ if (showStats) {
+ ofSetHexColor(0xFFFFFF);
+ ofDrawBitmapString("camera: "+ofToString(camera.getX(), 2)+","+ofToString(camera.getY(), 2)+","+ofToString(camera.getZ(), 2), window.x+10, window.y+window.height-30);
+ ofDrawBitmapString("light: "+ofToString(light.getX(), 2)+","+ofToString(light.getY(), 2)+","+ofToString(light.getZ(), 2), window.x+10, window.y+window.height-18);
+ }
}
//--------------------------------------------------------------
void viewpoint::keyPressed(int key){
diff --git a/src/viewpoint.h b/src/viewpoint.h
index 2b42756..b5923bd 100644
--- a/src/viewpoint.h
+++ b/src/viewpoint.h
@@ -19,7 +19,7 @@ class viewpoint {
double getSetting(const string& setting);
void begin();
- void end();
+ void end(bool showStats);
void setDefaults();
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 10:57:02 +0000