3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always use batched models to render options in preview

Browse Source
This commit is contained in:
enricoturri1966 2021-12-13 09:50:13 +01:00
parent 23284b61ea
commit 0d68a534ab
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -581,14 +581,14 @@ void GCodeViewer::init()
case EMoveType::Retract: case EMoveType::Retract:
case EMoveType::Unretract: case EMoveType::Unretract:
case EMoveType::Seam: { case EMoveType::Seam: {
if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) { // if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel; // buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
buffer.shader = "gouraud_light_instanced"; // buffer.shader = "gouraud_light_instanced";
buffer.model.model.init_from(diamond(16)); // buffer.model.model.init_from(diamond(16));
buffer.model.color = option_color(type); // buffer.model.color = option_color(type);
buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel; // buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
} // }
else { // else {
buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel; buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel;
buffer.vertices.format = VBuffer::EFormat::PositionNormal3; buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
buffer.shader = "gouraud_light"; buffer.shader = "gouraud_light";
@ -596,7 +596,7 @@ void GCodeViewer::init()
buffer.model.data = diamond(16); buffer.model.data = diamond(16);
buffer.model.color = option_color(type); buffer.model.color = option_color(type);
buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel; buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel;
} // }
break; break;
} }
case EMoveType::Wipe: case EMoveType::Wipe: