GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 18:19:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added tech DISABLE_GCODEVIEWER_INSTANCED_MODELS to easily turn on/off instanced models to render options in gcode preview

Browse Source
This commit is contained in:
enricoturri1966 2022-01-31 15:36:40 +01:00
parent c2258dead7
commit 383f6509a9
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Technologies.hpp
View File

@ -26,6 +26,8 @@
#define ENABLE_GCODE_VIEWER_DATA_CHECKING 0 #define ENABLE_GCODE_VIEWER_DATA_CHECKING 0
// Enable project dirty state manager debug window // Enable project dirty state manager debug window
#define ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW 0 #define ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW 0
// Disable using instanced models to render options in gcode preview
#define DISABLE_GCODEVIEWER_INSTANCED_MODELS 1
// Enable rendering of objects using environment map // Enable rendering of objects using environment map

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

@ -584,14 +584,16 @@ 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 !DISABLE_GCODEVIEWER_INSTANCED_MODELS
// buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel; if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
// buffer.shader = "gouraud_light_instanced"; buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
// buffer.model.model.init_from(diamond(16)); buffer.shader = "gouraud_light_instanced";
// buffer.model.color = option_color(type); buffer.model.model.init_from(diamond(16));
// buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel; buffer.model.color = option_color(type);
// } buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
// else { }
else {
#endif // !DISABLE_GCODEVIEWER_INSTANCED_MODELS
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";
@ -599,8 +601,10 @@ 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;
// } #if !DISABLE_GCODEVIEWER_INSTANCED_MODELS
break; }
#endif // !DISABLE_GCODEVIEWER_INSTANCED_MODELS
break;
} }
case EMoveType::Wipe: case EMoveType::Wipe:
case EMoveType::Extrude: { case EMoveType::Extrude: {