diff options
Diffstat (limited to 'gui/src/ofApp.cpp')
| -rw-r--r-- | gui/src/ofApp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp index a5c80ad..570dfb3 100644 --- a/gui/src/ofApp.cpp +++ b/gui/src/ofApp.cpp @@ -62,7 +62,7 @@ void ofApp::setup(){ } //-------------------------------------------------------------- -void ofApp::update(){ +void ofApp::updateGui(ofEventArgs & args){ std::stringstream strm; strm << "fps: " << ofGetFrameRate(); @@ -70,7 +70,7 @@ void ofApp::update(){ } -void ofApp::updateOutput(ofEventArgs & args){ +void ofApp::update(){ for (int i=0;i<sets.size();i++){ sets[i].updateOutput(); @@ -80,7 +80,7 @@ void ofApp::updateOutput(ofEventArgs & args){ //-------------------------------------------------------------- -void ofApp::draw(){ +void ofApp::drawGui(ofEventArgs & args){ ofBackground(0,0,0); for (int i=0;i<sets.size();i++){ @@ -89,7 +89,7 @@ void ofApp::draw(){ } -void ofApp::drawOutput(ofEventArgs & args){ +void ofApp::draw(){ // Clear with alpha, so we can capture via syphon and composite elsewhere should we want. @@ -281,7 +281,7 @@ void ofApp::newMidiMessage(ofxMidiMessage& msg) { } //-------------------------------------------------------------- -void ofApp::keyPressed(ofKeyEventArgs &args){ +void ofApp::guiKeyPressed(ofKeyEventArgs &args){ if (args.key==OF_KEY_COMMAND){ commandPressed=true; @@ -315,7 +315,7 @@ void ofApp::keyPressed(ofKeyEventArgs &args){ } -void ofApp::outputKeyPressed(ofKeyEventArgs &args){ +void ofApp::keyPressed(ofKeyEventArgs &args){ if(args.key == ' '){ outputFS=!outputFS; ofSetFullscreen(outputFS); @@ -370,14 +370,14 @@ void ofApp::mouseExited(int x, int y){ } //-------------------------------------------------------------- -void ofApp::windowResized(int w, int h){ +void ofApp::guiWindowResized(ofResizeEventArgs &resizeargs){ } -void ofApp::outputWindowResized(ofResizeEventArgs &resizeargs){ +void ofApp::windowResized(int w, int h){ //printf("Output window: %i,%i \n",resizeargs.width,resizeargs.height); for (int i=0;i<sets.size();i++){ - sets[i].outputSize=ofPoint(resizeargs.width,resizeargs.height); + sets[i].outputSize=ofPoint(w,h); } } @@ -387,7 +387,7 @@ void ofApp::gotMessage(ofMessage msg){ } //-------------------------------------------------------------- -void ofApp::dragEvent(ofDragInfo dragInfo){ +void ofApp::guiDragEvent(ofDragInfo &dragInfo){ //std::string filenames; //for (auto f = dragInfo.files.begin(); f != dragInfo.files.end(); f++){ |