Commit 4472954a authored by alexandre burton's avatar alexandre burton
Browse files

Merger: ajustement au dessin

parent 7e6a3d38
......@@ -78,6 +78,11 @@ class Merger
scene_model_.disableMaterials();
scene_model_.disableTextures();
marqueurs_model_.disableColors();
marqueurs_model_.disableMaterials();
marqueurs_model_.disableTextures();
if (marqueurs_model_.hasMeshes()) {
std::cout << "marqueurs_model_ #meshes: " << marqueurs_model_.getNumMeshes() << std::endl;
}
......@@ -125,13 +130,13 @@ class Merger
// light_court_.enable();
ofPushStyle();
ofPushMatrix();
ofSetColor(255, 255, 255, 100);
ofSetColor(128, 128, 128, 100);
ofRotateDeg(180, 1, 0, 0);
ofScale(1000);
ofRotateDeg(180, 1, 0, 0);
ofScale(1000);
if (wireframe_models_) {
if (wireframe_models_) {
scene_model_.drawWireframe();
} else {
// model_material_.begin();
......@@ -171,7 +176,7 @@ class Merger
// light_court_.disable();
// ofDisableLighting();
ofSetColor(255, 255, 255, 150);
ofSetColor(255, 255, 255, 200);
ofEnableBlendMode(OF_BLENDMODE_ADD);
marqueurs_model_.drawWireframe();
}
......
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