mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-16 20:15:55 +08:00
Removed tech ENABLE_RENDER_PICKING_PASS
This commit is contained in:
parent
7926781ac1
commit
f45711e7e5
@ -12,8 +12,6 @@
|
|||||||
#define ENABLE_RENDER_SELECTION_CENTER 0
|
#define ENABLE_RENDER_SELECTION_CENTER 0
|
||||||
// Shows an imgui dialog with camera related data
|
// Shows an imgui dialog with camera related data
|
||||||
#define ENABLE_CAMERA_STATISTICS 0
|
#define ENABLE_CAMERA_STATISTICS 0
|
||||||
// Render the picking pass instead of the main scene (use [T] key to toggle between regular rendering and picking pass only rendering)
|
|
||||||
#define ENABLE_RENDER_PICKING_PASS 0
|
|
||||||
// Enable extracting thumbnails from selected gcode and save them as png files
|
// Enable extracting thumbnails from selected gcode and save them as png files
|
||||||
#define ENABLE_THUMBNAIL_GENERATOR_DEBUG 0
|
#define ENABLE_THUMBNAIL_GENERATOR_DEBUG 0
|
||||||
// Disable synchronization of unselected instances
|
// Disable synchronization of unselected instances
|
||||||
|
@ -1177,9 +1177,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed)
|
|||||||
, m_tab_down(false)
|
, m_tab_down(false)
|
||||||
, m_cursor_type(Standard)
|
, m_cursor_type(Standard)
|
||||||
, m_reload_delayed(false)
|
, m_reload_delayed(false)
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
, m_show_picking_texture(false)
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
, m_render_sla_auxiliaries(true)
|
, m_render_sla_auxiliaries(true)
|
||||||
, m_labels(*this)
|
, m_labels(*this)
|
||||||
, m_slope(m_volumes)
|
, m_slope(m_volumes)
|
||||||
@ -1674,10 +1671,6 @@ void GLCanvas3D::render()
|
|||||||
#endif // ENABLE_RAYCAST_PICKING_DEBUG
|
#endif // ENABLE_RAYCAST_PICKING_DEBUG
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
if (!m_picking_enabled || !m_show_picking_texture) {
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
|
|
||||||
const bool is_looking_downward = camera.is_looking_downward();
|
const bool is_looking_downward = camera.is_looking_downward();
|
||||||
|
|
||||||
// draw scene
|
// draw scene
|
||||||
@ -1722,9 +1715,6 @@ void GLCanvas3D::render()
|
|||||||
#else
|
#else
|
||||||
_render_bed(true, true);
|
_render_bed(true, true);
|
||||||
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
|
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
}
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
|
|
||||||
#if ENABLE_RAYCAST_PICKING_DEBUG
|
#if ENABLE_RAYCAST_PICKING_DEBUG
|
||||||
if (m_picking_enabled && !m_mouse.dragging)
|
if (m_picking_enabled && !m_mouse.dragging)
|
||||||
@ -2790,14 +2780,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
|
|||||||
}
|
}
|
||||||
case 'O':
|
case 'O':
|
||||||
case 'o': { _update_camera_zoom(-1.0); break; }
|
case 'o': { _update_camera_zoom(-1.0); break; }
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
case 'T':
|
|
||||||
case 't': {
|
|
||||||
m_show_picking_texture = !m_show_picking_texture;
|
|
||||||
m_dirty = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
case 'Z':
|
case 'Z':
|
||||||
case 'z': {
|
case 'z': {
|
||||||
if (!m_selection.is_empty())
|
if (!m_selection.is_empty())
|
||||||
|
@ -539,10 +539,6 @@ private:
|
|||||||
|
|
||||||
bool m_reload_delayed;
|
bool m_reload_delayed;
|
||||||
|
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
bool m_show_picking_texture;
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
|
|
||||||
RenderStats m_render_stats;
|
RenderStats m_render_stats;
|
||||||
|
|
||||||
int m_imgui_undo_redo_hovered_pos{ -1 };
|
int m_imgui_undo_redo_hovered_pos{ -1 };
|
||||||
|
@ -133,10 +133,6 @@ void GLGizmoHollow::on_unregister_raycasters_for_picking()
|
|||||||
void GLGizmoHollow::on_render_for_picking()
|
void GLGizmoHollow::on_render_for_picking()
|
||||||
{
|
{
|
||||||
const Selection& selection = m_parent.get_selection();
|
const Selection& selection = m_parent.get_selection();
|
||||||
//#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
// m_z_shift = selection.get_first_volume()->get_sla_shift_z();
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
glsafe(::glEnable(GL_DEPTH_TEST));
|
glsafe(::glEnable(GL_DEPTH_TEST));
|
||||||
render_points(selection, true);
|
render_points(selection, true);
|
||||||
}
|
}
|
||||||
|
@ -172,10 +172,6 @@ void KBShortcutsDialog::fill_shortcuts()
|
|||||||
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
|
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
|
||||||
#endif // __APPLE__
|
#endif // __APPLE__
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
#if ENABLE_RENDER_PICKING_PASS
|
|
||||||
// Don't localize debugging texts.
|
|
||||||
{ "P", "Toggle picking pass texture rendering on/off" },
|
|
||||||
#endif // ENABLE_RENDER_PICKING_PASS
|
|
||||||
};
|
};
|
||||||
|
|
||||||
m_full_shortcuts.push_back({ { _L("Plater"), "" }, plater_shortcuts });
|
m_full_shortcuts.push_back({ { _L("Plater"), "" }, plater_shortcuts });
|
||||||
|
Loading…
x
Reference in New Issue
Block a user