diff options
Diffstat (limited to 'gui/src/ofApp.cpp')
| -rw-r--r-- | gui/src/ofApp.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp index 642ad6c..a2196c5 100644 --- a/gui/src/ofApp.cpp +++ b/gui/src/ofApp.cpp @@ -73,7 +73,7 @@ void ofApp::setup(){ onset_frame=0; chaosgui.setup("chaos","",460,820); - chaosgui.add(plugin_label.setup(plugin_name)); + chaosgui.add(plugin_label.setup(plotter.chaosloader.get_name())); chaosgui.add(plotter.usechaos.set("use",false)); chaosgui.add(plotter.chaosamount.set("amount", 0.0f, -0.1f, 0.1f)); chaosgui.add(plotter.chaosscale.set("scale", 100.0f, 1.0f, 1000.0f)); @@ -981,20 +981,7 @@ void ofApp::keyReleased(ofKeyEventArgs &args){ //-------------------------------------------------------------- void ofApp::mouseMoved(int x, int y ){ } -void ofApp::lMouseMoved(ofMouseEventArgs & args ){ - if (args.x>chaosgui.getPosition().x){ //&& - //x-chaosgui.getPosition().x<chaosgui.getWidth()&& - //(y>chaosgui.getPosition().y)&& - //((y-chaosgui.getPosition().y)<chaosgui.getHeight())){ - chaosgui.setFillColor(ofColor(128,64,0)); - ofLog()<<args.x<<","<<args.y<<" :"<<chaosgui.getPosition().x<<","<<chaosgui.getPosition().y<<" :"<<chaosgui.getWidth()<<","<<chaosgui.getHeight()<<" IN"; - } - else { - chaosgui.setFillColor(ofColor(0,0,0)); - ofLog()<<args.x<<","<<args.y<<" :"<<chaosgui.getPosition().x<<","<<chaosgui.getPosition().y<<" :"<<chaosgui.getWidth()<<","<<chaosgui.getHeight()<<" OUT"; - } -} - + //-------------------------------------------------------------- void ofApp::outputMouseDragged(ofMouseEventArgs & args){ if (select_warpframe>-1){ |