Commit 8cde156f authored by artificiel's avatar artificiel
Browse files

CloudServerApp: ajout de measurements et retrait du framerate

parent e2920269
......@@ -4,6 +4,7 @@
#include "ofMain.h"
#undef Success // X hack de #include de X
#include "ofxTimeMeasurements.h"
#include "ofxCameraSaveLoad.h"
#include "ofxGui.h"
#include "ofxPanel.h"
......@@ -55,12 +56,18 @@ class ofCloudServerApp : public ofBaseApp
cloudserver_will_update();
// merge elements are channel threaded
if (merger_.update()) {
TS_START("CloudServerApp::voxel and converter and get");
voxel_filter_.perform(mesh_converter_.perform(merger_.get_mesh()), voxel_resolution_);
TS_STOP("CloudServerApp::voxel and converter and get");
TS_START("CloudServerApp::euclidian");
euclidian_extractor_.send(voxel_filter_.get());
TS_STOP("CloudServerApp::euclidian");
}
// euclidian_extractor is channel threaded
if (euclidian_extractor_.receive()) {
TS_START("CloudServerApp::track()");
cluster_tracker_.track(euclidian_extractor_.get_clouds());
TS_STOP("CloudServerApp::track()");
}
cloudserver_did_update();
......@@ -107,7 +114,6 @@ class ofCloudServerApp : public ofBaseApp
ofSetColor(255, 255, 255, 255);
if (draw_gui_) {
ofDrawBitmapStringHighlight(ofToString(ofGetFrameRate()), 20, ofGetHeight() - 20);
gui_.draw();
merger_.draw_gui();
}
......
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