From bcd1f1c6dc0f00ceba617bce755c4680dac9f0ff Mon Sep 17 00:00:00 2001 From: Jildert Viet Date: Fri, 20 Nov 2020 23:08:17 +0100 Subject: [PATCH 1/5] Created ofApp.cpp and testing git workflow --- src/ofApp.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/ofApp.cpp diff --git a/src/ofApp.cpp b/src/ofApp.cpp new file mode 100644 index 0000000..e69de29 From 7716dadf78bf36d29fff0e4673f8c1ce44dff996 Mon Sep 17 00:00:00 2001 From: Jildert Viet Date: Fri, 20 Nov 2020 23:13:03 +0100 Subject: [PATCH 2/5] Moved ofApp.cpp to right folder (of the example) --- {src => ofxQuadTreeExample/src}/ofApp.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src => ofxQuadTreeExample/src}/ofApp.cpp (100%) diff --git a/src/ofApp.cpp b/ofxQuadTreeExample/src/ofApp.cpp similarity index 100% rename from src/ofApp.cpp rename to ofxQuadTreeExample/src/ofApp.cpp From 889885920ead8a06b35fcfd47e2e1904793651e6 Mon Sep 17 00:00:00 2001 From: Jildert Viet Date: Fri, 20 Nov 2020 23:18:36 +0100 Subject: [PATCH 3/5] Placed inline code of ofApp.h to ofApp.cpp --- ofxQuadTreeExample/src/ofApp.cpp | 59 ++++++++++++++++++++++++++++++++ ofxQuadTreeExample/src/ofApp.h | 58 +++---------------------------- 2 files changed, 63 insertions(+), 54 deletions(-) diff --git a/ofxQuadTreeExample/src/ofApp.cpp b/ofxQuadTreeExample/src/ofApp.cpp index e69de29..e1988d5 100644 --- a/ofxQuadTreeExample/src/ofApp.cpp +++ b/ofxQuadTreeExample/src/ofApp.cpp @@ -0,0 +1,59 @@ +#include "ofApp.h" + +void ofApp::setup() { + bWire = true; + bPlane = false; + bOriginal = false; + grabber.initGrabber(1280, 720); + tree.setup(); + level = 7; +} + +void ofApp::update() { + grabber.update(); + if(grabber.isFrameNew()) { + tree.setTexture(grabber.getTextureReference(), level); + } +} + +void ofApp::draw() { + ofBackground(ofColor::black); + if(bOriginal) { + ofSetColor(ofColor::white); + grabber.draw(0, 0); + } + if(bPlane) { + tree.draw(); + } + if(bWire) { + tree.drawWire(ofColor::white); + } + + ofSetColor(ofColor::red); + ofDrawBitmapString(string("threashold : ") + ofToString(tree.getThreashold()), 40, 40); + ofDrawBitmapString(string("split level : ") + ofToString(level), 40, 60); +} + +void ofApp::keyPressed(int key) { + if(key == 'w') { + bWire ^= true; + } + if(key == 'p') { + bPlane ^= true; + } + if(key == 't') { + bOriginal ^= true; + } + if(key == OF_KEY_LEFT) { + level = max(1, level -1); + } + if(key == OF_KEY_RIGHT) { + level = min(10, level + 1); + } + if(key == OF_KEY_UP) { + tree.setThreashold(max(tree.getThreashold() - 0.1f, 4.0f)); + } + if(key == OF_KEY_DOWN) { + tree.setThreashold(min(tree.getThreashold() + 0.1f, 64.0f)); + } +} diff --git a/ofxQuadTreeExample/src/ofApp.h b/ofxQuadTreeExample/src/ofApp.h index 691f4ad..9c1e84c 100644 --- a/ofxQuadTreeExample/src/ofApp.h +++ b/ofxQuadTreeExample/src/ofApp.h @@ -5,61 +5,11 @@ class ofApp : public ofBaseApp{ public: - void setup() { - bWire = true; - bPlane = false; - bOriginal = false; - grabber.initGrabber(1280, 720); - tree.setup(); - level = 7; - } - void update() { - grabber.update(); - if(grabber.isFrameNew()) { - tree.setTexture(grabber.getTextureReference(), level); - } - } - void draw() { - ofBackground(ofColor::black); - if(bOriginal) { - ofSetColor(ofColor::white); - grabber.draw(0, 0); - } - if(bPlane) { - tree.draw(); - } - if(bWire) { - tree.drawWire(ofColor::white); - } - - ofSetColor(ofColor::red); - ofDrawBitmapString(string("threashold : ") + ofToString(tree.getThreashold()), 40, 40); - ofDrawBitmapString(string("split level : ") + ofToString(level), 40, 60); - } + void setup(); + void update(); + void draw(); - void keyPressed(int key) { - if(key == 'w') { - bWire ^= true; - } - if(key == 'p') { - bPlane ^= true; - } - if(key == 't') { - bOriginal ^= true; - } - if(key == OF_KEY_LEFT) { - level = max(1, level -1); - } - if(key == OF_KEY_RIGHT) { - level = min(10, level + 1); - } - if(key == OF_KEY_UP) { - tree.setThreashold(max(tree.getThreashold() - 0.1f, 4.0f)); - } - if(key == OF_KEY_DOWN) { - tree.setThreashold(min(tree.getThreashold() + 0.1f, 64.0f)); - } - } + void keyPressed(int key); private: ofVideoGrabber grabber; From a3569bf20cf6ea2e71476376abe7d34375fe4543 Mon Sep 17 00:00:00 2001 From: Jildert Viet Date: Fri, 20 Nov 2020 23:20:41 +0100 Subject: [PATCH 4/5] Changed getTexture(), OF 0.11 --- ofxQuadTreeExample/src/ofApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofxQuadTreeExample/src/ofApp.cpp b/ofxQuadTreeExample/src/ofApp.cpp index e1988d5..4301aea 100644 --- a/ofxQuadTreeExample/src/ofApp.cpp +++ b/ofxQuadTreeExample/src/ofApp.cpp @@ -12,7 +12,7 @@ void ofApp::setup() { void ofApp::update() { grabber.update(); if(grabber.isFrameNew()) { - tree.setTexture(grabber.getTextureReference(), level); + tree.setTexture(grabber.getTexture(), level); } } From 6f38506e6ab059002472f016ef262fea85435917 Mon Sep 17 00:00:00 2001 From: Jildert Viet Date: Fri, 20 Nov 2020 23:22:56 +0100 Subject: [PATCH 5/5] Use switch statement in keyPressed() --- ofxQuadTreeExample/src/ofApp.cpp | 42 +++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/ofxQuadTreeExample/src/ofApp.cpp b/ofxQuadTreeExample/src/ofApp.cpp index 4301aea..ffdf1d9 100644 --- a/ofxQuadTreeExample/src/ofApp.cpp +++ b/ofxQuadTreeExample/src/ofApp.cpp @@ -35,25 +35,27 @@ void ofApp::draw() { } void ofApp::keyPressed(int key) { - if(key == 'w') { - bWire ^= true; - } - if(key == 'p') { - bPlane ^= true; - } - if(key == 't') { - bOriginal ^= true; - } - if(key == OF_KEY_LEFT) { - level = max(1, level -1); - } - if(key == OF_KEY_RIGHT) { - level = min(10, level + 1); - } - if(key == OF_KEY_UP) { - tree.setThreashold(max(tree.getThreashold() - 0.1f, 4.0f)); - } - if(key == OF_KEY_DOWN) { - tree.setThreashold(min(tree.getThreashold() + 0.1f, 64.0f)); + switch(key){ + case 'w': + bWire ^= true; + break; + case 'p': + bPlane ^= true; + break; + case 't': + bOriginal ^= true; + break; + case OF_KEY_LEFT: + level = max(1, level -1); + break; + case OF_KEY_RIGHT: + level = min(10, level + 1); + break; + case OF_KEY_UP: + tree.setThreashold(max(tree.getThreashold() - 0.1f, 4.0f)); + break; + case OF_KEY_DOWN: + tree.setThreashold(min(tree.getThreashold() + 0.1f, 64.0f)); + break; } }