Commit abe9296c authored by alexandre burton's avatar alexandre burton
Browse files

Merge branch 'revision_baseclasses' into...

Merge branch 'revision_baseclasses' into '38-example_client-restaurer-la-possibilite-d-afficher-un-modele-pour-faciliter-la-calib-avec-le-world'

CloudLib: differents tweaks pour la connexion Artnet et TCP

See merge request !2
parents 7277380a 50f3b070
...@@ -152,7 +152,7 @@ void ClientConnector::update() ...@@ -152,7 +152,7 @@ void ClientConnector::update()
string str = receive(); string str = receive();
if (str.length() > 0) { if (str.length() > 0) {
std::cout << "PROCESSING TCP STREAM FROM " << client_name_ << ":" << str << std::endl; // std::cout << "PROCESSING TCP STREAM FROM " << client_name_ << ":" << str << std::endl;
boost::char_separator<char> sep(" "); boost::char_separator<char> sep(" ");
boost::tokenizer<boost::char_separator<char>> tokens(str, sep); boost::tokenizer<boost::char_separator<char>> tokens(str, sep);
...@@ -161,7 +161,7 @@ void ClientConnector::update() ...@@ -161,7 +161,7 @@ void ClientConnector::update()
for (const auto &t : tokens) { for (const auto &t : tokens) {
message.push_back(t); message.push_back(t);
std::cout << " tokens:" << t << std::endl; // std::cout << " tokens:" << t << std::endl;
} }
if (message.size() == 0) { if (message.size() == 0) {
std::cout << "TCP erreur: message vide" << std::endl; std::cout << "TCP erreur: message vide" << std::endl;
...@@ -220,7 +220,7 @@ void ClientConnector::update() ...@@ -220,7 +220,7 @@ void ClientConnector::update()
std::cout << "got TCP unknown msg from " << client_name_ << ":" << str std::cout << "got TCP unknown msg from " << client_name_ << ":" << str
<< std::endl; << std::endl;
} }
std::cout << "DONE PROCESSING TCP STREAM FROM " << client_name_ << std::endl; // std::cout << "DONE PROCESSING TCP STREAM FROM " << client_name_ << std::endl;
} }
} else { } else {
delta_time_ = ofGetElapsedTimeMillis() - connect_time_; delta_time_ = ofGetElapsedTimeMillis() - connect_time_;
......
...@@ -65,6 +65,8 @@ class CropFilter ...@@ -65,6 +65,8 @@ class CropFilter
{ {
index_ = i; index_ = i;
result_.reset(new pcl::PointCloud<pcl::PointXYZ>); result_.reset(new pcl::PointCloud<pcl::PointXYZ>);
color_.setHsb((i/16.0)*255, 255, 128, 100);
} }
void setup() void setup()
...@@ -82,16 +84,21 @@ class CropFilter ...@@ -82,16 +84,21 @@ class CropFilter
glm::vec3 fillsize = parameters_.dim_.get() * glm::vec3(1, get_fill(), 1); glm::vec3 fillsize = parameters_.dim_.get() * glm::vec3(1, get_fill(), 1);
glm::vec3 fillpos = parameters_.pos_.get() - glm::vec3(0, (size.y * (1.0 - get_fill())) / 2, 0); glm::vec3 fillpos = parameters_.pos_.get() - glm::vec3(0, (size.y * (1.0 - get_fill())) / 2, 0);
ofPushStyle(); ofPushStyle();
ofEnableBlendMode(OF_BLENDMODE_ADD);
ofDisableDepthTest();
if (parameters_.enabled_) { if (parameters_.enabled_) {
ofSetColor(0, 255, 0, 128); ofSetColor(color_);
ofNoFill(); ofNoFill();
ofDrawBox(parameters_.pos_, size.x, size.y, size.z); ofDrawBox(parameters_.pos_, size.x, size.y, size.z);
ofFill(); ofFill();
auto c = color_;
c.a = ofMap(get_fill(), 0, .25, 10, 50, true);
if (parameters_.count_ > 0) { if (parameters_.count_ > 0) {
glm::vec3 fillsize = parameters_.dim_.get() * glm::vec3(1, get_fill(), 1); glm::vec3 fillsize = parameters_.dim_.get() * glm::vec3(1, get_fill(), 1);
glm::vec3 fillpos = parameters_.pos_.get() - glm::vec3(0, (size.y * (1.0 - get_fill())) / 2, 0); glm::vec3 fillpos = parameters_.pos_.get() - glm::vec3(0, (size.y * (1.0 - get_fill())) / 2, 0);
ofSetColor(0, 255, 0, ofMap(get_fill(), 0, .25, 10, 50, true)); ofSetColor(c);
ofDrawBox(fillpos, fillsize.x, fillsize.y, fillsize.z); ofDrawBox(fillpos, fillsize.x, fillsize.y, fillsize.z);
} }
if (parameters_.rms_ > 0) { if (parameters_.rms_ > 0) {
...@@ -170,6 +177,7 @@ class CropFilter ...@@ -170,6 +177,7 @@ class CropFilter
pcl::PointCloud<pcl::PointXYZ>::Ptr result_; pcl::PointCloud<pcl::PointXYZ>::Ptr result_;
CropFilterParameterGroup parameters_; CropFilterParameterGroup parameters_;
glm::vec3 min_, max_; glm::vec3 min_, max_;
ofColor color_;
size_t index_; size_t index_;
// char * rgbw_[4]; // char * rgbw_[4];
...@@ -206,7 +214,9 @@ class FilterManager ...@@ -206,7 +214,9 @@ class FilterManager
{ {
sender_ = sender; sender_ = sender;
rgbw_.allocate(num_filters * 4, 1, OF_IMAGE_COLOR_ALPHA); rgbw_.allocate(num_filters * 4, 1, OF_IMAGE_COLOR_ALPHA);
artnet_.setup("192.168.94.62");
my_artnet_ip_= "192.168.94.62";
setup_artnet();
parameters_.setName("FilterManager"); parameters_.setName("FilterManager");
parameters_.add(enabled_.set("enabled", true)); parameters_.add(enabled_.set("enabled", true));
...@@ -217,6 +227,17 @@ class FilterManager ...@@ -217,6 +227,17 @@ class FilterManager
} }
} }
void setup_artnet() {
std::cout << "setting up artnet on " << my_artnet_ip_ << std::endl;
if (artnet_ != nullptr) {
std::cout << "...(stopping previous instance)..." << my_artnet_ip_ << std::endl;
artnet_->waitForThread();
artnet_.release();
}
artnet_=make_unique<ofxArtnet>();
artnet_->setup(my_artnet_ip_.c_str(),0,0);
}
void update(pcl::PointCloud<pcl::PointXYZ>::Ptr input_cloud) void update(pcl::PointCloud<pcl::PointXYZ>::Ptr input_cloud)
{ {
ofxOscMessage m, m_height; ofxOscMessage m, m_height;
...@@ -254,7 +275,9 @@ class FilterManager ...@@ -254,7 +275,9 @@ class FilterManager
rgbw_.getPixels().getData()[filter->index_ * 4 + 3] = int(ofMap(amp, 0, 1, 0, 255, true)); rgbw_.getPixels().getData()[filter->index_ * 4 + 3] = int(ofMap(amp, 0, 1, 0, 255, true));
} }
} }
artnet_.sendDmx("192.168.94.3", 0, 0, rgbw_.getPixels().getData(), 16); if (artnet_->sendDmx("192.168.94.244", 0, 0, rgbw_.getPixels().getData(), 16) == -3) {
setup_artnet();
}
sender_->sendMessage(m); sender_->sendMessage(m);
sender_->sendMessage(m_height); sender_->sendMessage(m_height);
...@@ -303,7 +326,8 @@ class FilterManager ...@@ -303,7 +326,8 @@ class FilterManager
ofImage rgbw_; ofImage rgbw_;
private: private:
ofxArtnet artnet_; std::string my_artnet_ip_;
std::unique_ptr<ofxArtnet> artnet_;
std::vector<CropFilter *> filters_; std::vector<CropFilter *> filters_;
ofxOscSender *sender_; ofxOscSender *sender_;
......
...@@ -27,7 +27,6 @@ class Cropper ...@@ -27,7 +27,6 @@ class Cropper
void draw() void draw()
{ {
ofSetColor(0, 255, 0, 100); ofSetColor(0, 255, 0, 100);
ofNoFill(); ofNoFill();
ofSetBoxResolution(2); ofSetBoxResolution(2);
......
...@@ -78,7 +78,6 @@ class Merger ...@@ -78,7 +78,6 @@ class Merger
scene_model_.disableMaterials(); scene_model_.disableMaterials();
scene_model_.disableTextures(); scene_model_.disableTextures();
if (marqueurs_model_.hasMeshes()) { if (marqueurs_model_.hasMeshes()) {
std::cout << "marqueurs_model_ #meshes: " << marqueurs_model_.getNumMeshes() << std::endl; std::cout << "marqueurs_model_ #meshes: " << marqueurs_model_.getNumMeshes() << std::endl;
} }
...@@ -129,7 +128,7 @@ class Merger ...@@ -129,7 +128,7 @@ class Merger
ofSetColor(255, 255, 255, 100); ofSetColor(255, 255, 255, 100);
ofRotateDeg(-180, 1, 0, 0); // ceci aaligne le modele avec le cloud ofRotateDeg(-180, 1, 0, 0); // ceci aaligne le modele avec le cloud
ofRotateYDeg(90); // ceci aaligne le modele avec le cloud ofRotateYDeg(90); // ceci aaligne le modele avec le cloud
// ofRotateXDeg(180); // ceci aaligne le modele avec le cloud //git pu ofRotateXDeg(180); // ceci aaligne le modele avec le cloud
ofScale(250); ofScale(250);
if (wireframe_models_) { if (wireframe_models_) {
......
...@@ -14,7 +14,7 @@ class ParsedParameterGroup : public ofParameterGroup ...@@ -14,7 +14,7 @@ class ParsedParameterGroup : public ofParameterGroup
{ {
string name = e->getName(); string name = e->getName();
boost::replace_all(name, " ", "&nbsp;"); boost::replace_all(name, " ", "&nbsp;");
std::cout << "stored " << name << std::endl; // std::cout << "stored " << name << std::endl;
parameter_to_string_mapping_[e] = name; parameter_to_string_mapping_[e] = name;
string_to_parameter_mapping_[name] = e; string_to_parameter_mapping_[name] = e;
} }
......
Supports Markdown
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