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

QoL: Add auto perspective (#8312)

Browse Source 
* ImGuizmo: Comment out unused code

* 3DNav: Avoid gimbal lock by using polar coordinates

* 3DNav: Make sure top and bottom are oriented correctly

* Add auto perspective

* Add options

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
Noisyfox
2025-03-09 14:04:46 +08:00
committed by GitHub
parent 1558edf827
commit 345ab82f91
7 changed files with 173 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/slic3r/GUI/Camera.cpp
View File

@@ -37,6 +37,7 @@ void Camera::set_type(EType type)
{
if (m_type != type && (type == EType::Ortho || type == EType::Perspective)) {
m_type = type;
m_prevent_auto_type = true;
if (m_update_config_on_type_change_enabled) {
wxGetApp().app_config->set_bool("use_perspective_camera", m_type == EType::Perspective);
}
@@ -52,6 +53,20 @@ void Camera::select_next_type()
set_type((EType)next);
}
void Camera::auto_type(EType preferred_type)
{
if (!wxGetApp().app_config->get_bool("auto_perspective")) return;
if (preferred_type == EType::Perspective) {
if (!m_prevent_auto_type) {
set_type(preferred_type);
m_prevent_auto_type = false;
}
} else {
set_type(preferred_type);
m_prevent_auto_type = false;
}
}
void Camera::translate(const Vec3d& displacement) {
if (!displacement.isApprox(Vec3d::Zero())) {
m_view_matrix.translate(-displacement);
@@ -85,24 +100,41 @@ void Camera::set_zoom(double zoom)
void Camera::select_view(const std::string& direction)
{
if (direction == "iso")
if (direction == "iso") {
set_default_orientation();
else if (direction == "left")
auto_type(EType::Perspective);
}
else if (direction == "left") {
look_at(m_target - m_distance * Vec3d::UnitX(), m_target, Vec3d::UnitZ());
else if (direction == "right")
auto_type(EType::Ortho);
}
else if (direction == "right") {
look_at(m_target + m_distance * Vec3d::UnitX(), m_target, Vec3d::UnitZ());
else if (direction == "top")
auto_type(EType::Ortho);
}
else if (direction == "top") {
look_at(m_target + m_distance * Vec3d::UnitZ(), m_target, Vec3d::UnitY());
else if (direction == "bottom")
auto_type(EType::Ortho);
}
else if (direction == "bottom") {
look_at(m_target - m_distance * Vec3d::UnitZ(), m_target, -Vec3d::UnitY());
else if (direction == "front")
auto_type(EType::Ortho);
}
else if (direction == "front") {
look_at(m_target - m_distance * Vec3d::UnitY(), m_target, Vec3d::UnitZ());
else if (direction == "rear")
auto_type(EType::Ortho);
}
else if (direction == "rear") {
look_at(m_target + m_distance * Vec3d::UnitY(), m_target, Vec3d::UnitZ());
else if (direction == "topfront")
auto_type(EType::Ortho);
}
else if (direction == "topfront") {
look_at(m_target - 0.707 * m_distance * Vec3d::UnitY() + 0.707 * m_distance * Vec3d::UnitZ(), m_target, Vec3d::UnitY() + Vec3d::UnitZ());
auto_type(EType::Perspective);
}
else if (direction == "plate") {
look_at(m_target - 0.707 * m_distance * Vec3d::UnitY() + 0.707 * m_distance * Vec3d::UnitZ(), m_target, Vec3d::UnitY() + Vec3d::UnitZ());
auto_type(EType::Perspective);
}
}