Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve viewport controls for laptop trackpads #181

Merged
merged 1 commit into from
Feb 19, 2024
Merged

improve viewport controls for laptop trackpads #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions libs/anari_viewer/windows/Viewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,19 +308,23 @@ void Viewport::ui_handleInput()
{
ImGuiIO &io = ImGui::GetIO();

const bool leftDown = ImGui::IsMouseDown(ImGuiMouseButton_Left);
const bool rightDown = ImGui::IsMouseDown(ImGuiMouseButton_Right);
const bool middleDown = ImGui::IsMouseDown(ImGuiMouseButton_Middle);
const bool dolly = ImGui::IsMouseDown(ImGuiMouseButton_Right)
|| (ImGui::IsMouseDown(ImGuiMouseButton_Left)
&& io.KeysDown[GLFW_KEY_LEFT_SHIFT]);
const bool pan = ImGui::IsMouseDown(ImGuiMouseButton_Middle)
|| (ImGui::IsMouseDown(ImGuiMouseButton_Left)
&& io.KeysDown[GLFW_KEY_LEFT_ALT]);
const bool orbit = ImGui::IsMouseDown(ImGuiMouseButton_Left);

const bool anyDown = leftDown || rightDown || middleDown;
const bool anyMovement = dolly || pan || orbit;

if (!anyDown) {
if (!anyMovement) {
m_manipulating = false;
m_previousMouse = anari::math::float2(-1);
} else if (ImGui::IsItemHovered() && !m_manipulating)
m_manipulating = true;

if (m_mouseRotating && !leftDown)
if (m_mouseRotating && !orbit)
m_mouseRotating = false;

if (m_manipulating) {
Expand All @@ -329,7 +333,7 @@ void Viewport::ui_handleInput()

const anari::math::float2 mouse(position.x, position.y);

if (anyDown && m_previousMouse != anari::math::float2(-1)) {
if (anyMovement && m_previousMouse != anari::math::float2(-1)) {
const anari::math::float2 prev = m_previousMouse;

const anari::math::float2 mouseFrom =
Expand All @@ -340,17 +344,18 @@ void Viewport::ui_handleInput()
const anari::math::float2 mouseDelta = mouseTo - mouseFrom;

if (mouseDelta != anari::math::float2(0.f)) {
if (leftDown) {
if (dolly)
m_arcball->zoom(mouseDelta.y);
else if (pan)
m_arcball->pan(mouseDelta);
else if (orbit && !(pan || dolly)) {
if (!m_mouseRotating) {
m_arcball->startNewRotation();
m_mouseRotating = true;
}

m_arcball->rotate(mouseDelta);
} else if (rightDown)
m_arcball->zoom(mouseDelta.y);
else if (middleDown)
m_arcball->pan(mouseDelta);
}
}
}

Expand Down
Loading