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

Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2022-12-19 13:27:18 +01:00
commit 1845a8d104
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/CameraUtils.cpp
View File

@ -110,12 +110,8 @@ void CameraUtils::ray_from_persp_screen_pos(const Camera &camera, const Vec2d &p
Matrix4d modelview = camera.get_view_matrix().matrix();
Matrix4d projection = camera.get_projection_matrix().matrix();
Vec4i viewport(camera.get_viewport().data());
Vec3d unprojected_point;
igl::unproject(screen_point(camera, position), modelview, projection, viewport, unprojected_point);
point = camera.get_position();
direction = unprojected_point - point;
igl::unproject(screen_point(camera, position), modelview, projection, viewport, point);
direction = point - camera.get_position();
}
Vec2d CameraUtils::get_z0_position(const Camera &camera, const Vec2d & coor)

1
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -1426,6 +1426,7 @@ void GLGizmoCut3D::on_render()
void GLGizmoCut3D::render_debug_input_window(float x)
{
return;
m_imgui->begin(wxString("DEBUG"));
ImVec2 pos = ImGui::GetWindowPos();

2
src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
View File

@ -97,7 +97,7 @@ class GLGizmoCut3D : public GLGizmoBase
bool m_hide_cut_plane{ false };
bool m_connectors_editing{ false };
bool m_cut_plane_as_circle{ true };
bool m_cut_plane_as_circle{ false };
float m_connector_depth_ratio{ 3.f };
float m_connector_size{ 2.5f };