Skip to content

Editor: Сamera movement improvements #1195 #1196

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

Merged
eprikazchikov merged 1 commit into from
Dec 18, 2025
Merged

Editor: Сamera movement improvements #1195 #1196

Show file tree
Hide file tree
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
19 changes: 14 additions & 5 deletions engine/src/editor/viewport/cameracontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
#include "editor/viewport/handles.h"
#include "editor/viewport/handletools.h"

#include <QMenu>

#include <float.h>

#include <engine.h>
Expand Down Expand Up @@ -99,6 +97,14 @@ void CameraController::update() {
if(Input::isKey(Input::KEY_D) || Input::isKey(Input::KEY_RIGHT)) {
m_cameraSpeed.x += 0.1f;
}

if(Input::isKey(Input::KEY_Q)) {
m_cameraSpeed.y -= 0.1f;
}

if(Input::isKey(Input::KEY_E)) {
m_cameraSpeed.y += 0.1f;
}
}

Vector4 pos(Input::mousePosition());
Expand Down Expand Up @@ -190,15 +196,18 @@ void CameraController::move() {
}
}

if(m_cameraSpeed.x != 0.0f || m_cameraSpeed.y != 0.0f || m_cameraSpeed.z != 0.0f) {
if(m_cameraSpeed.length() != 0.0f) {
Vector3 pos = t->position();
Vector3 dir = t->quaternion() * Vector3(0.0f, 0.0f, 1.0f);
dir.normalize();

Vector3 delta = (dir * m_cameraSpeed.z) + dir.cross(Vector3(0.0f, 1.0f, 0.0f)) * m_cameraSpeed.x;
Vector3 delta = (dir * m_cameraSpeed.z);
delta += dir.cross(Vector3(0.0f, 1.0f, 0.0f)) * m_cameraSpeed.x;
delta += Vector3(0.0f, 1.0f, 0.0f) * m_cameraSpeed.y;

t->setPosition(pos - delta * m_activeCamera->focalDistance() * 0.1f);

m_cameraSpeed -= m_cameraSpeed * 10.0f * DT;
m_cameraSpeed -= m_cameraSpeed * 3.0f * DT;
if(m_cameraSpeed.length() <= .01f) {
m_cameraSpeed = Vector3();
}
Expand Down
4 changes: 2 additions & 2 deletions engine/src/editor/viewport/viewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,12 +451,12 @@ bool Viewport::processEvent(QEvent *event) {
}
case QEvent::KeyPress: {
QKeyEvent *ev = static_cast<QKeyEvent *>(event);
EditorPlatform::instance().setKeys(ev->key(), ev->text(), false, ev->isAutoRepeat());
EditorPlatform::instance().setKeys(ev->nativeVirtualKey(), ev->text(), false, ev->isAutoRepeat());
return true;
}
case QEvent::KeyRelease: {
QKeyEvent *ev = static_cast<QKeyEvent *>(event);
EditorPlatform::instance().setKeys(ev->key(), "", true, ev->isAutoRepeat());
EditorPlatform::instance().setKeys(ev->nativeVirtualKey(), "", true, ev->isAutoRepeat());
return true;
}
case QEvent::Wheel: {
Expand Down
Loading