Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ofxaddons
ofxCloudLib
Commits
fab5f431
Commit
fab5f431
authored
Jan 05, 2018
by
artificiel
Browse files
Merger: ajout de timing
parent
4288b209
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ofxCloudLib/Merger.hpp
View file @
fab5f431
...
...
@@ -2,6 +2,7 @@
#define CLOUDLIB_MERGER_HPP_
#include "ofxAssimpModelLoader.h"
#include "ofxTimeMeasurements.h"
#include "ofxCloudLib/ClientsManager.hpp"
#include "ofxCloudLib/ClusterTracker.hpp"
...
...
@@ -96,12 +97,15 @@ class Merger
return
total_mesh_
;
}
bool
update
()
{
cloud_new_
=
false
;
TS_START
(
"Merger::client_manager_.update()"
);
client_manager_
.
update
();
TS_STOP
(
"Merger::client_manager_.update()"
);
TS_START
(
"Merger::client_manager_.receive_mesh()"
);
if
(
client_manager_
.
receive_mesh
(
total_mesh_
))
cloud_new_
=
true
;
TS_STOP
(
"Merger::client_manager_.receive_mesh()"
);
return
cloud_new_
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment