juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/h2d

Browse Source 
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-09-16 11:27:44 +08:00
parent e7e6405ad3 1e87666487
commit 2375ab860a
6267 changed files with 210560 additions and 178856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/3DBed.cpp
View File

@@ -230,20 +230,17 @@ void Bed3D::Axes::render()
shader->start_using();
//shader->set_uniform("emission_factor", 0.0f);
// ORCA show axes on current plate
Vec3d plate_origin = wxGetApp().plater()->get_partplate_list().get_selected_plate()->get_origin();
// x axis
m_arrow.set_color(AXIS_X_COLOR);
render_axis(shader, Geometry::assemble_transform(plate_origin, { 0.0, 0.5 * M_PI, 0.0 }));
render_axis(shader, Geometry::assemble_transform(m_origin, { 0.0, 0.5 * M_PI, 0.0 }));
// y axis
m_arrow.set_color(AXIS_Y_COLOR);
render_axis(shader, Geometry::assemble_transform(plate_origin, { -0.5 * M_PI, 0.0, 0.0 }));
render_axis(shader, Geometry::assemble_transform(m_origin, { -0.5 * M_PI, 0.0, 0.0 }));
// z axis
m_arrow.set_color(AXIS_Z_COLOR);
render_axis(shader, Geometry::assemble_transform(plate_origin));
render_axis(shader, Geometry::assemble_transform(m_origin));
shader->stop_using();