diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-08-22 16:53:32 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-08-22 16:53:32 +0100 |
| commit | e64bc72d2f9b66cd91f9514348ac33081504b618 (patch) | |
| tree | 64f83e3a90c28ddedf5418d617fc05b41fe0d173 /gaunt01 | |
| parent | 621674d6e9fb0024645cd0020c6afb51e4b4a7e9 (diff) | |
Diffstat (limited to 'gaunt01')
| -rw-r--r-- | gaunt01/bin/data/settings.xml | 2 | ||||
| -rw-r--r-- | gaunt01/src/main.cpp | 2 | ||||
| -rw-r--r-- | gaunt01/src/testApp.cpp | 14 | ||||
| -rw-r--r-- | gaunt01/src/testApp.h | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/gaunt01/bin/data/settings.xml b/gaunt01/bin/data/settings.xml index 3ef506a..867b22d 100644 --- a/gaunt01/bin/data/settings.xml +++ b/gaunt01/bin/data/settings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<gauntlet cam_angle="-55" threshold="16" keyChannel="6" learningRate="0.01" remove_shadows="0" testmovie="camoutput.mov"/> +<gauntlet cam_angle="-55" threshold="35" keyChannel="6" learningRate="0.01" remove_shadows="0" testmovie="street_shadows.mov"/> <bounds> <vertex x="664.309" y="866.4"></vertex> <vertex x="844.015" y="425.757"></vertex> diff --git a/gaunt01/src/main.cpp b/gaunt01/src/main.cpp index 1f3ac12..d8ec5c8 100644 --- a/gaunt01/src/main.cpp +++ b/gaunt01/src/main.cpp @@ -6,7 +6,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_FULLSCREEN ); // <-------- setup the GL context + ofSetupOpenGL(&window, 1024,768, OF_WINDOW ); // <-------- setup the GL context printf("%ix%i on screen %ix%i\n",ofGetWidth(),ofGetHeight(),ofGetScreenWidth(),ofGetScreenHeight()); // this kicks off the running of my app // can be OF_WINDOW or OF_FULLSCREEN diff --git a/gaunt01/src/testApp.cpp b/gaunt01/src/testApp.cpp index beefce0..fa0a879 100644 --- a/gaunt01/src/testApp.cpp +++ b/gaunt01/src/testApp.cpp @@ -127,6 +127,8 @@ void testApp::setup(){ light.enable(); drawingborder=false; + + composite=true; billboards=new ofImage[4]; billboards[0].loadImage("GUI_title.png"); @@ -770,10 +772,10 @@ void testApp::draw(){ //should be in front with holes being recreated for activated trapdoors ofSetHexColor(0xffffff); - if (mode==CALIBRATE) bindTexture(colorImg); + if (mode==CALIBRATE||!composite) bindTexture(colorImg); else bindTexture(background); ground.draw(); - if (mode==CALIBRATE) unbindTexture(colorImg); + if (mode==CALIBRATE||!composite) unbindTexture(colorImg); else unbindTexture(background); ofPushMatrix(); @@ -801,8 +803,7 @@ void testApp::draw(){ bindTexture(colorImg); //colorImg.getTextureReference().bind(); map<int,player>::iterator it; for(int i=0;i<blobsManager.blobs.size();i++){ - //if(players[blobsManager.blobs.at(i).id].active) - players[blobsManager.blobs.at(i).id].draw(); + if(players[blobsManager.blobs.at(i).id].active) players[blobsManager.blobs.at(i).id].draw(); } unbindTexture(colorImg); } @@ -1088,6 +1089,11 @@ void testApp::keyPressed(int key){ removeShadows=!removeShadows; printf(removeShadows?"removing shadows\n":"not removing shadows\n"); break; + + case 'c': + case 'C': + composite=!composite; + break; /* case '1': diff --git a/gaunt01/src/testApp.h b/gaunt01/src/testApp.h index 82f75fe..7740e73 100644 --- a/gaunt01/src/testApp.h +++ b/gaunt01/src/testApp.h @@ -159,6 +159,8 @@ class testApp : public ofBaseApp{ bool drawStats; bool drawInstructions; + + bool composite; //turn off for 'dumb compositing' bool firstframe; //for background removal float bgnum; |