Commit b5ca65af authored by artificiel's avatar artificiel
Browse files

ajout d'une push/popStyle() pouir encadrer le GL

parent 7958a41c
......@@ -78,7 +78,7 @@ class Merger
scene_model_.disableMaterials();
scene_model_.disableTextures();
marqueurs_model_.disableColors();
marqueurs_model_.disableColors();
marqueurs_model_.disableMaterials();
marqueurs_model_.disableTextures();
......@@ -131,7 +131,7 @@ class Merger
ofPushStyle();
ofPushMatrix();
ofSetColor(128, 128, 128, 100);
ofRotateDeg(180, 1, 0, 0);
ofScale(1000);
......@@ -152,18 +152,18 @@ class Merger
}
if (draw_marqueurs_) {
// ofEnableLighting();
// light_jardin_.enable();
// light_court_.enable();
// ofEnableLighting();
// light_jardin_.enable();
// light_court_.enable();
ofPushStyle();
ofPushMatrix();
ofSetColor(100, 100, 100, 150);
ofRotateDeg(180, 1, 0, 0);
ofScale(1000);
if (wireframe_models_) {
ofRotateDeg(180, 1, 0, 0);
ofScale(1000);
if (wireframe_models_) {
marqueurs_model_.drawWireframe();
} else {
model_material_.begin();
......@@ -172,9 +172,9 @@ class Merger
}
ofPopStyle();
ofPopMatrix();
// light_jardin_.disable();
// light_court_.disable();
// ofDisableLighting();
// light_jardin_.disable();
// light_court_.disable();
// ofDisableLighting();
ofSetColor(255, 255, 255, 200);
ofEnableBlendMode(OF_BLENDMODE_ADD);
......@@ -190,6 +190,7 @@ class Merger
}
void draw()
{
ofPushStyle();
if (draw_cam_colors_) {
ofEnableBlendMode(OF_BLENDMODE_SCREEN); // était ADD
client_manager_.draw();
......@@ -222,6 +223,7 @@ class Merger
total_mesh_.drawWireframe();
// }
}
ofPopStyle();
}
void 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