mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-05 08:16:49 +00:00
* Add runtime display backend detection for Wayland support Add LinuxDisplayBackend utility to detect X11 vs Wayland at runtime using GDK_IS_X11_DISPLAY / GDK_IS_WAYLAND_DISPLAY macros. This is the foundation for removing the forced GDK_BACKEND=x11 and enabling native Wayland support. - New files: LinuxDisplayBackend.hpp/.cpp with get_linux_display_backend(), is_running_on_wayland(), and is_running_on_x11() - Propagate wxHAVE_GDK_X11 / wxHAVE_GDK_WAYLAND from FindGTK3.cmake as compile definitions to libslic3r_gui - No-op on non-Linux platforms (returns Unknown / false) * Fix Phase 1 code quality: pragma once, source ordering, static cache * Make X11 initialization conditional for Wayland support Remove the unconditional GDK_BACKEND=x11 force that blocked native Wayland. Replace with conditional logic: - EGL safety fallback: re-force X11 only when wxUSE_GLCANVAS_EGL is off and WAYLAND_DISPLAY is set, with a warning log - XInitThreads() only called when DISPLAY is set (X11 in use) - __GLX_VENDOR_LIBRARY_NAME only set when DISPLAY is present (GLX-specific) - WEBKIT_DISABLE_COMPOSITING_MODE only set under XWayland (both DISPLAY and WAYLAND_DISPLAY present) - Guard X11/Xlib.h include with __has_include for robustness - Restore display validation to accept either DISPLAY or WAYLAND_DISPLAY This is Phase 2 of the Wayland support plan. * Fix Phase 2: safer EGL macro check, add clarifying comments * Add GLAD2 library and replace GLEW linkage in build system Set up GLAD2 as a static library to replace GLEW for OpenGL loading. GLAD2 supports both GLX and EGL, which is required for Wayland support. - Create src/glad/ with pre-generated GLAD2 sources (GL 4.6 compat) - Add src/glad/CMakeLists.txt building glad as a static library - Wire glad into src/CMakeLists.txt before libvgcode - Modify libvgcode to use shared glad for GL path (keeps local copy only for GLES2/Emscripten) to avoid duplicate symbol conflicts - Replace GLEW::GLEW with glad in libslic3r_gui link libraries Note: GLEW is kept in deps for OpenCSG. Code migration from GL/glew.h to glad/gl.h headers will follow in Phase 3B+3C. * Fix Phase 3A+3D: libvgcode GLAD include, dead files, dlopen dep, OpenGL link var * Migrate from GLEW to GLAD: replace headers and API calls across codebase Replace all #include <GL/glew.h> with <glad/gl.h> across 49 source files. Migrate GLEW API calls to GLAD equivalents: - glewInit/glewExperimental -> gladLoaderLoadGL() - GLEW_EXT_* / GLEW_ARB_* extension checks -> GLAD_GL_EXT_* / GLAD_GL_ARB_* - Remove GLEW-specific EGL/GLX mismatch #error guards (not needed with GLAD) - Replace unavailable EXT symbols with core GL equivalents in GLCanvas3D.cpp (GL_MAX_SAMPLES, glRenderbufferStorageMultisample, glBlitFramebuffer, GL_READ/DRAW_FRAMEBUFFER) - Update log messages from glewInit to gladLoadGL * Fix Phase 3B+3C: remove GLEW find, clean EXT symbols, update attribution - Remove find_package(GLEW) block from root CMakeLists.txt since GLEW is no longer linked by any main application code - Remove "glew" from SLIC3R_STATIC option description - Replace all remaining EXT framebuffer symbols with core equivalents in render_thumbnail_framebuffer_ext and _rectangular_selection_picking_pass - Update AboutDialog credits from GLEW to GLAD * Enable EGL in wxWidgets and add runtime GLX/EGL selection for Wayland - Set wxUSE_GLCANVAS_EGL=ON in wxWidgets build and Flatpak manifest - Add PreferGLX() call on X11 sessions for driver compatibility - Remove Phase 2 safety fallback (EGL is now always compiled in) - Guard SwapBuffers against hidden canvases to prevent Wayland stalls * Fix Phase 4: move PreferGLX to app startup, fix FPS counter guard Move wxGLCanvas::PreferGLX() from OpenGLManager::create_wxglcanvas() (static initializer) to GUI_App::on_init_inner() before any wxGLCanvas is constructed. This prevents a race where SkipPartCanvas could trigger wxGLBackend::Init() before the GLX preference is set. The new location also adds explicit is_running_on_wayland() detection with a warning for unknown backends. Move increment_fps_counter() inside the IsShownOnScreen() guard so FPS is only counted when a frame is actually swapped. * Update GLFW from 3.3.7 to 3.4 for runtime Wayland/X11 backend selection Replace the compile-time GLFW_USE_WAYLAND flag (which locked to a single backend) with GLFW 3.4's GLFW_BUILD_WAYLAND + GLFW_BUILD_X11 flags that build both backends and auto-select at runtime based on the available display server. This enables the CLI thumbnail renderer to work on both Wayland and X11 sessions without separate builds. * wayland: Fix UI call sites that rely on global screen coordinates On Wayland, wxGetMousePosition() returns (0,0) and SetPosition() is a no-op for top-level windows. Fix the highest-impact call sites: - GLCanvas3D: Use cached m_mouse.position from event handlers instead of wxGetMousePosition() + ScreenToClient() in get_local_mouse_position() - Plater: Use event-relative coords via ClientToScreen(e.GetPosition()) instead of wxGetMousePosition() in 3 leave-window handlers - BBLTopbar: Use event.GetPosition() and FindToolByPosition() directly in mouse handlers instead of wxGetMousePosition()/FindToolByCurrentPosition() - Search: Use focus-based dismiss logic on Wayland instead of wxGetMousePosition()-based rect checks in SearchDialog and SearchObjectDialog - GUI_App: Skip SetPosition() in window_pos_restore() on Wayland where it is a no-op; still restore size and maximize state - Button: Position tooltip relative to button widget via ClientToScreen instead of wxGetMousePosition() * Fix SearchDialog Wayland dismiss: guard against search_line focus * flatpak: Add Wayland socket permission for native Wayland support * spec * Fix crash on Wayland when wxWidgets lacks EGL support Restore the safety fallback that forces GDK_BACKEND=x11 when wxWidgets was not built with wxUSE_GLCANVAS_EGL=ON. Without this, the GLX backend tries to access a non-existent X11 display on native Wayland, crashing in wxGLCanvas::IsDisplaySupported() with SIGSEGV at offset 0xe4. Also add a defense-in-depth guard in detect_multisample() that skips the IsDisplaySupported call entirely on Wayland without EGL. Root cause: deps/wxWidgets must be rebuilt after enabling EGL. The compile-time check in OrcaSlicer.cpp detects the mismatch and falls back safely. * Fix EGL detection: use wxHAS_EGL instead of wxUSE_GLCANVAS_EGL wxUSE_GLCANVAS_EGL is a CMake build option, NOT a C++ preprocessor macro. The actual macro defined in wxWidgets setup.h is wxHAS_EGL. All compile-time EGL checks were using the wrong macro, causing the safety fallback to always trigger even with a properly built EGL-enabled wxWidgets. * Fix GL function pointers invalidated on Wayland/EGL gladLoaderLoadGL() dlopen's libGL.so.1 to resolve GL function pointers via dlsym, then immediately dlclose's the handle. On X11/GLX this is fine because the GLX context keeps libGL.so mapped. On Wayland/EGL, nothing else holds libGL.so open, so dlclose unmaps it and all function pointers become dangling — causing SIGSEGV on the first GL call. Fix: on Wayland, use gladLoadGL(eglGetProcAddress) which resolves function pointers through the EGL loader without opening/closing libGL.so. * fix crash on start and various rendering issues * fix crash on close * small refactor * move GPU selection to desktop file * clean up a bit * clean up more * fix appimage error
346 lines
12 KiB
C++
346 lines
12 KiB
C++
#include "GLGizmoMove.hpp"
|
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
//BBS: GUI refactor
|
|
#include "slic3r/GUI/Plater.hpp"
|
|
#include "libslic3r/AppConfig.hpp"
|
|
|
|
|
|
#include <glad/gl.h>
|
|
|
|
#include <wx/utils.h>
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
#if ENABLE_FIXED_GRABBER
|
|
const double GLGizmoMove3D::Offset = 50.0;
|
|
#else
|
|
const double GLGizmoMove3D::Offset = 10.0;
|
|
#endif
|
|
|
|
//BBS: GUI refactor: add obj manipulation
|
|
GLGizmoMove3D::GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id, GizmoObjectManipulation* obj_manipulation)
|
|
: GLGizmoBase(parent, icon_filename, sprite_id)
|
|
//BBS: GUI refactor: add obj manipulation
|
|
, m_object_manipulation(obj_manipulation)
|
|
{}
|
|
|
|
std::string GLGizmoMove3D::get_tooltip() const
|
|
{
|
|
const Selection& selection = m_parent.get_selection();
|
|
bool show_position = selection.is_single_full_instance();
|
|
const Vec3d& position = selection.get_bounding_box().center();
|
|
|
|
if (m_hover_id == 0 || m_grabbers[0].dragging)
|
|
return "X: " + format(show_position ? position(0) : m_displacement(0), 2);
|
|
else if (m_hover_id == 1 || m_grabbers[1].dragging)
|
|
return "Y: " + format(show_position ? position(1) : m_displacement(1), 2);
|
|
else if (m_hover_id == 2 || m_grabbers[2].dragging)
|
|
return "Z: " + format(show_position ? position(2) : m_displacement(2), 2);
|
|
else
|
|
return "";
|
|
}
|
|
|
|
bool GLGizmoMove3D::on_mouse(const wxMouseEvent &mouse_event) {
|
|
return use_grabbers(mouse_event);
|
|
}
|
|
|
|
void GLGizmoMove3D::data_changed(bool is_serializing) {
|
|
m_grabbers[2].enabled = !m_parent.get_selection().is_wipe_tower();
|
|
change_cs_by_selection();
|
|
}
|
|
|
|
bool GLGizmoMove3D::on_init()
|
|
{
|
|
for (int i = 0; i < 3; ++i) {
|
|
m_grabbers.push_back(Grabber());
|
|
m_grabbers.back().extensions = GLGizmoBase::EGrabberExtension::PosZ;
|
|
}
|
|
|
|
m_grabbers[0].angles = { 0.0, 0.5 * double(PI), 0.0 };
|
|
m_grabbers[1].angles = { -0.5 * double(PI), 0.0, 0.0 };
|
|
|
|
m_shortcut_key = WXK_CONTROL_M;
|
|
|
|
return true;
|
|
}
|
|
|
|
std::string GLGizmoMove3D::on_get_name() const
|
|
{
|
|
if (!on_is_activable() && m_state == EState::Off) {
|
|
return _u8L("Move") + ":\n" + _u8L("Please select at least one object.");
|
|
} else {
|
|
return _u8L("Move");
|
|
}
|
|
}
|
|
|
|
bool GLGizmoMove3D::on_is_activable() const
|
|
{
|
|
return !m_parent.get_selection().is_empty();
|
|
}
|
|
|
|
void GLGizmoMove3D::on_set_state() {
|
|
if (get_state() == On) {
|
|
m_last_selected_obejct_idx = -1;
|
|
m_last_selected_volume_idx = -1;
|
|
change_cs_by_selection();
|
|
}
|
|
}
|
|
|
|
void GLGizmoMove3D::on_start_dragging()
|
|
{
|
|
assert(m_hover_id != -1);
|
|
|
|
m_displacement = Vec3d::Zero();
|
|
const BoundingBoxf3& box = m_parent.get_selection().get_bounding_box();
|
|
m_starting_drag_position = m_grabbers[m_hover_id].matrix * m_grabbers[m_hover_id].center;
|
|
m_starting_box_center = box.center();
|
|
m_starting_box_bottom_center = box.center();
|
|
m_starting_box_bottom_center(2) = box.min(2);
|
|
}
|
|
|
|
void GLGizmoMove3D::on_stop_dragging()
|
|
{
|
|
m_parent.do_move(L("Gizmo-Move"));
|
|
m_displacement = Vec3d::Zero();
|
|
}
|
|
|
|
void GLGizmoMove3D::on_dragging(const UpdateData& data)
|
|
{
|
|
if (m_hover_id == 0)
|
|
m_displacement.x() = calc_projection(data);
|
|
else if (m_hover_id == 1)
|
|
m_displacement.y() = calc_projection(data);
|
|
else if (m_hover_id == 2)
|
|
m_displacement.z() = calc_projection(data);
|
|
|
|
Selection &selection = m_parent.get_selection();
|
|
TransformationType trafo_type;
|
|
trafo_type.set_relative();
|
|
switch (wxGetApp().obj_manipul()->get_coordinates_type())
|
|
{
|
|
case ECoordinatesType::Instance: { trafo_type.set_instance(); break; }
|
|
case ECoordinatesType::Local: { trafo_type.set_local(); break; }
|
|
default: { break; }
|
|
}
|
|
selection.translate(m_displacement, trafo_type);
|
|
}
|
|
|
|
void GLGizmoMove3D::on_render()
|
|
{
|
|
const Selection& selection = m_parent.get_selection();
|
|
|
|
glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
|
|
glsafe(::glEnable(GL_DEPTH_TEST));
|
|
|
|
const auto &[box, box_trafo] = selection.get_bounding_box_in_current_reference_system();
|
|
m_bounding_box = box;
|
|
m_center = box_trafo.translation();
|
|
if (m_object_manipulation) {
|
|
m_object_manipulation->cs_center = box_trafo.translation();
|
|
}
|
|
const Transform3d base_matrix = box_trafo;
|
|
float space_size = 20.f *INV_ZOOM;
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
m_grabbers[i].matrix = base_matrix;
|
|
}
|
|
|
|
const Vec3d zero = Vec3d::Zero();
|
|
|
|
// x axis
|
|
m_grabbers[0].center = {m_bounding_box.max.x() + space_size, 0, 0};
|
|
// y axis
|
|
m_grabbers[1].center = {0, m_bounding_box.max.y() + space_size,0};
|
|
// z axis
|
|
m_grabbers[2].center = {0,0, m_bounding_box.max.z() + space_size};
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
m_grabbers[i].color = AXES_COLOR[i];
|
|
m_grabbers[i].hover_color = AXES_HOVER_COLOR[i];
|
|
}
|
|
|
|
#if !SLIC3R_OPENGL_ES
|
|
if (!OpenGLManager::get_gl_info().is_core_profile())
|
|
glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
|
|
auto render_grabber_connection = [this, &zero](unsigned int id) {
|
|
if (m_grabbers[id].enabled) {
|
|
//if (!m_grabber_connections[id].model.is_initialized() || !m_grabber_connections[id].old_center.isApprox(center)) {
|
|
m_grabber_connections[id].old_center = m_grabbers[id].center;
|
|
m_grabber_connections[id].model.reset();
|
|
|
|
GLModel::Geometry init_data;
|
|
init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P3 };
|
|
init_data.color = AXES_COLOR[id];
|
|
init_data.reserve_vertices(2);
|
|
init_data.reserve_indices(2);
|
|
|
|
// vertices
|
|
init_data.add_vertex((Vec3f)zero.cast<float>());
|
|
init_data.add_vertex((Vec3f)m_grabbers[id].center.cast<float>());
|
|
|
|
// indices
|
|
init_data.add_line(0, 1);
|
|
|
|
m_grabber_connections[id].model.init_from(std::move(init_data));
|
|
//}
|
|
|
|
// ORCA: OpenGL Core Profile
|
|
#if !SLIC3R_OPENGL_ES
|
|
if (!OpenGLManager::get_gl_info().is_core_profile()) {
|
|
glLineStipple(1, 0x0FFF);
|
|
glEnable(GL_LINE_STIPPLE);
|
|
}
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
m_grabber_connections[id].model.render();
|
|
#if !SLIC3R_OPENGL_ES
|
|
if (!OpenGLManager::get_gl_info().is_core_profile())
|
|
glDisable(GL_LINE_STIPPLE);
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
}
|
|
};
|
|
|
|
#if SLIC3R_OPENGL_ES
|
|
GLShaderProgram* shader = wxGetApp().get_shader("dashed_lines");
|
|
#else
|
|
GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
|
|
#endif // SLIC3R_OPENGL_ES
|
|
if (shader != nullptr) {
|
|
shader->start_using();
|
|
const Camera& camera = wxGetApp().plater()->get_camera();
|
|
shader->set_uniform("view_model_matrix", camera.get_view_matrix() * base_matrix);
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
#if !SLIC3R_OPENGL_ES
|
|
if (OpenGLManager::get_gl_info().is_core_profile()) {
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
const std::array<int, 4>& viewport = camera.get_viewport();
|
|
shader->set_uniform("viewport_size", Vec2d(double(viewport[2]), double(viewport[3])));
|
|
shader->set_uniform("width", 0.25f);
|
|
shader->set_uniform("gap_size", 0.0f);
|
|
#if !SLIC3R_OPENGL_ES
|
|
}
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
|
|
// draw axes
|
|
for (unsigned int i = 0; i < 3; ++i) {
|
|
render_grabber_connection(i);
|
|
}
|
|
|
|
shader->stop_using();
|
|
}
|
|
|
|
// draw grabbers
|
|
render_grabbers(box);
|
|
|
|
if (m_object_manipulation->is_instance_coordinates()) {
|
|
#if SLIC3R_OPENGL_ES
|
|
GLShaderProgram* shader = wxGetApp().get_shader("dashed_lines");
|
|
#else
|
|
GLShaderProgram* shader = OpenGLManager::get_gl_info().is_core_profile() ? wxGetApp().get_shader("dashed_thick_lines") : wxGetApp().get_shader("flat");
|
|
#endif // SLIC3R_OPENGL_ES
|
|
if (shader != nullptr) {
|
|
shader->start_using();
|
|
const Camera& camera = wxGetApp().plater()->get_camera();
|
|
|
|
Geometry::Transformation cur_tran;
|
|
if (auto mi = m_parent.get_selection().get_selected_single_intance()) {
|
|
cur_tran = mi->get_transformation();
|
|
} else {
|
|
cur_tran = selection.get_first_volume()->get_instance_transformation();
|
|
}
|
|
|
|
shader->set_uniform("view_model_matrix", camera.get_view_matrix() * cur_tran.get_matrix());
|
|
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
|
|
#if !SLIC3R_OPENGL_ES
|
|
if (OpenGLManager::get_gl_info().is_core_profile()) {
|
|
#endif /// !SLIC3R_OPENGL_ES
|
|
const std::array<int, 4>& viewport = camera.get_viewport();
|
|
shader->set_uniform("viewport_size", Vec2d(double(viewport[2]), double(viewport[3])));
|
|
shader->set_uniform("width", 0.5f);
|
|
shader->set_uniform("gap_size", 0.0f);
|
|
#if !SLIC3R_OPENGL_ES
|
|
}
|
|
#endif // !SLIC3R_OPENGL_ES
|
|
|
|
render_cross_mark(Vec3f::Zero(), true);
|
|
|
|
shader->stop_using();
|
|
}
|
|
}
|
|
}
|
|
|
|
void GLGizmoMove3D::on_register_raycasters_for_picking()
|
|
{
|
|
// the gizmo grabbers are rendered on top of the scene, so the raytraced picker should take it into account
|
|
m_parent.set_raycaster_gizmos_on_top(true);
|
|
}
|
|
|
|
void GLGizmoMove3D::on_unregister_raycasters_for_picking()
|
|
{
|
|
m_parent.set_raycaster_gizmos_on_top(false);
|
|
}
|
|
|
|
//BBS: add input window for move
|
|
void GLGizmoMove3D::on_render_input_window(float x, float y, float bottom_limit)
|
|
{
|
|
if (m_object_manipulation)
|
|
m_object_manipulation->do_render_move_window(m_imgui, "Move", x, y, bottom_limit);
|
|
}
|
|
|
|
|
|
double GLGizmoMove3D::calc_projection(const UpdateData& data) const
|
|
{
|
|
double projection = 0.0;
|
|
|
|
const Vec3d starting_vec = m_starting_drag_position - m_starting_box_center;
|
|
const double len_starting_vec = starting_vec.norm();
|
|
if (len_starting_vec != 0.0) {
|
|
const Vec3d mouse_dir = data.mouse_ray.unit_vector();
|
|
// finds the intersection of the mouse ray with the plane parallel to the camera viewport and passing throught the starting position
|
|
// use ray-plane intersection see i.e. https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection algebric form
|
|
// in our case plane normal and ray direction are the same (orthogonal view)
|
|
// when moving to perspective camera the negative z unit axis of the camera needs to be transformed in world space and used as plane normal
|
|
const Vec3d inters = data.mouse_ray.a + (m_starting_drag_position - data.mouse_ray.a).dot(mouse_dir) * mouse_dir;
|
|
// vector from the starting position to the found intersection
|
|
const Vec3d inters_vec = inters - m_starting_drag_position;
|
|
|
|
// finds projection of the vector along the staring direction
|
|
projection = inters_vec.dot(starting_vec.normalized());
|
|
}
|
|
|
|
if (wxGetKeyState(WXK_SHIFT))
|
|
projection = m_snap_step * (double)std::round(projection / m_snap_step);
|
|
|
|
return projection;
|
|
}
|
|
|
|
void GLGizmoMove3D::change_cs_by_selection() {
|
|
int obejct_idx, volume_idx;
|
|
ModelVolume *model_volume = m_parent.get_selection().get_selected_single_volume(obejct_idx, volume_idx);
|
|
if (m_last_selected_obejct_idx == obejct_idx && m_last_selected_volume_idx == volume_idx) {
|
|
return;
|
|
}
|
|
m_last_selected_obejct_idx = obejct_idx;
|
|
m_last_selected_volume_idx = volume_idx;
|
|
if (m_parent.get_selection().is_multiple_full_object()) {
|
|
m_object_manipulation->set_use_object_cs(false);
|
|
}
|
|
else if (model_volume) {
|
|
m_object_manipulation->set_use_object_cs(true);
|
|
} else {
|
|
m_object_manipulation->set_use_object_cs(false);
|
|
}
|
|
if (m_object_manipulation->get_use_object_cs()) {
|
|
m_object_manipulation->set_coordinates_type(ECoordinatesType::Instance);
|
|
} else {
|
|
m_object_manipulation->set_coordinates_type(ECoordinatesType::World);
|
|
}
|
|
}
|
|
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|