Commit 36d96136 authored by artificiel's avatar artificiel
Browse files

CloudServerApp: passe les evenents de souris aux derivees

parent b0903e6d
......@@ -4,11 +4,11 @@
#include "ofMain.h"
#undef Success // X hack de #include de X
#include "ofxTimeMeasurements.h"
#include "ofxCameraSaveLoad.h"
#include "ofxGui.h"
#include "ofxPanel.h"
#include "ofxPublishableParameterGroup.h"
#include "ofxTimeMeasurements.h"
#include "ofxCloudLib/Common.hpp"
#include "ofxCloudLib/EuclidianExtractor.hpp"
......@@ -40,7 +40,7 @@ class ofCloudServerApp : public ofBaseApp
cloudserver_parameters_.add(draw_clusters_.set("<s> draw segmentation", false));
cloudserver_parameters_.add(euclidian_extractor_.parameters);
// setup_after_merger();
// setup_after_merger();
gui_.setup(cloudserver_parameters_);
......@@ -94,7 +94,7 @@ class ofCloudServerApp : public ofBaseApp
ofPushMatrix();
ofScale(100, 100, 100); // somehow seems reasonable
merger_.draw();
if (draw_clusters_) euclidian_extractor_.draw();
if (draw_clusters_) euclidian_extractor_.draw();
ofPopMatrix();
draw_in_camera_after_cloud();
......@@ -135,8 +135,17 @@ class ofCloudServerApp : public ofBaseApp
void keyReleased(int key) { key_released(key); }
void mouseMoved(int x, int y) {}
void mouseDragged(int x, int y, int button) {}
void mousePressed(int x, int y, int button) {}
void mouseReleased(int x, int y, int button) {}
void mousePressed(int x, int y, int button)
{
mouse_pressed(x, y, button);
}
void mouseReleased(int x, int y, int button)
{
mouse_released(x, y, button);
}
void mouseEntered(int x, int y) {}
void mouseExited(int x, int y) {}
void windowResized(int w, int h) {}
......@@ -152,13 +161,11 @@ class ofCloudServerApp : public ofBaseApp
void save_gui_params_to_file(int i)
{
gui_.saveToFile("presets/cloudserver_" + ofToString(i) + ".json");
// ofxSaveCamera(cam_, "cameras/current.txt");
}
void load_gui_params_from_file(int i)
{
gui_.loadFromFile("presets/cloudserver_" + ofToString(i) + ".json");
// ofxLoadCamera(cam_, "cameras/current.txt");
save_gui_params_to_file(0);
}
......@@ -192,6 +199,9 @@ class ofCloudServerApp : public ofBaseApp
virtual void exit_before_app(){};
virtual void key_pressed(int key){};
virtual void key_released(int key){};
virtual void mouse_pressed(int x, int y, int button) {};
virtual void mouse_released(int x, int y, int button) {};
};
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment