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

Jump to bottom

Clean camera shitmountain 4 #1329

Merged
merged 2 commits into from
Aug 9, 2023
Merged

Clean camera shitmountain 4 #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b263830
clean-camera-shitmountain-4
zhouhang95 Jul 15, 2023
05d19be
fix and improve
zhouhang95 Jul 15, 2023
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
161 changes: 104 additions & 57 deletions ui/zenoedit/viewport/cameracontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ CameraControl::CameraControl(
, m_zenovis(pZenovis)
, m_transformer(transformer)
, m_picker(picker)
, m_theta(0.)
, m_phi(0.)
, m_ortho_mode(false)
, m_radius(5.0)
, m_res(1, 1)
{
updatePerspective();
Expand All @@ -34,6 +30,47 @@ void CameraControl::setRes(QVector2D res) {
m_res = res;
}

float CameraControl::getTheta() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_theta;
}
void CameraControl::setTheta(float theta) {
auto *scene = m_zenovis->getSession()->get_scene();
scene->camera->m_theta = theta;
}
float CameraControl::getPhi() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_phi;
}
void CameraControl::setPhi(float phi) {
auto *scene = m_zenovis->getSession()->get_scene();
scene->camera->m_phi = phi;
}
zeno::vec3f CameraControl::getCenter() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_center;
}
void CameraControl::setCenter(zeno::vec3f center) {
auto *scene = m_zenovis->getSession()->get_scene();
scene->camera->m_center = center;
}
bool CameraControl::getOrthoMode() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_ortho_mode;
}
void CameraControl::setOrthoMode(bool orthoMode) {
auto *scene = m_zenovis->getSession()->get_scene();
scene->camera->m_ortho_mode = orthoMode;
}
float CameraControl::getRadius() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_radius;
}
void CameraControl::setRadius(float radius) {
auto *scene = m_zenovis->getSession()->get_scene();
scene->camera->m_radius = radius;
}

float CameraControl::getFOV() const {
auto *scene = m_zenovis->getSession()->get_scene();
return scene->camera->m_fov;
Expand Down Expand Up @@ -66,10 +103,10 @@ void CameraControl::fakeMousePressEvent(QMouseEvent *event)
ZASSERT_EXIT(m_zenovis);
auto scene = m_zenovis->getSession()->get_scene();
if (scene->camera->m_need_sync) {
m_center = {scene->camera->m_zxx_in.cx, scene->camera->m_zxx_in.cy, scene->camera->m_zxx_in.cz};
m_theta = scene->camera->m_zxx_in.theta;
m_phi = scene->camera->m_zxx_in.phi;
m_radius = scene->camera->m_zxx_in.radius;
setCenter({scene->camera->m_zxx_in.cx, scene->camera->m_zxx_in.cy, scene->camera->m_zxx_in.cz});
setTheta(scene->camera->m_zxx_in.theta);
setPhi(scene->camera->m_zxx_in.phi);
setRadius(scene->camera->m_zxx_in.radius);
scene->camera->m_need_sync = false;
if (bool(m_picker) && scene->camera->m_auto_radius) {
this->m_picker->set_picked_depth_callback([&] (float depth, int x, int y) {
Expand All @@ -81,8 +118,8 @@ void CameraControl::fakeMousePressEvent(QMouseEvent *event)
glm::vec4 posVS = posCS / posCS.w;
glm::vec4 pWS = glm::inverse(scene->camera->m_view) * posVS;
glm::vec3 p3WS = glm::vec3(pWS.x, pWS.y, pWS.z);
m_radius = glm::length(scene->camera->m_lodcenter - p3WS);
m_center = {p3WS.x, p3WS.y, p3WS.z};
setRadius(glm::length(scene->camera->m_lodcenter - p3WS));
setCenter({p3WS.x, p3WS.y, p3WS.z});
});
int mid_x = int(this->res().x() * 0.5);
int mid_y = int(this->res().y() * 0.5);
Expand Down Expand Up @@ -116,56 +153,59 @@ void CameraControl::lookTo(int dir) {
auto z_axis = QVector3D(0, 0, 1);

ZASSERT_EXIT(m_zenovis);
auto c = getCenter();
QVector3D center = {c[0], c[1], c[2]};
auto radius = getRadius();

switch (dir) {
case 0:
// front view
m_theta = 0.f;
m_phi = 0.f;
m_zenovis->updateCameraFront(m_center + z_axis * m_radius, -z_axis, y_axis);
setTheta(0);
setPhi(0);
m_zenovis->updateCameraFront(center + z_axis * radius, -z_axis, y_axis);
break;
case 1:
// right view
m_theta = 0.0f;
m_phi = -glm::pi<float>() / 2.f;
m_zenovis->updateCameraFront(m_center + x_axis * m_radius, -x_axis, y_axis);
setTheta(0);
setPhi(-glm::pi<float>() / 2);
m_zenovis->updateCameraFront(center + x_axis * radius, -x_axis, y_axis);
break;
case 2:
// top view
m_theta = -glm::pi<float>() / 2;
m_phi = 0.f;
m_zenovis->updateCameraFront(m_center + y_axis * m_radius, -z_axis, y_axis);
setTheta(-glm::pi<float>() / 2);
setPhi(0);
m_zenovis->updateCameraFront(center + y_axis * radius, -z_axis, y_axis);
break;
case 3:
// back view
m_theta = 0.f;
m_phi = glm::pi<float>();
m_zenovis->updateCameraFront(m_center - z_axis * m_radius, z_axis, y_axis);
setTheta(0);
setPhi(glm::pi<float>());
m_zenovis->updateCameraFront(center - z_axis * radius, z_axis, y_axis);
break;
case 4:
// left view
m_theta = 0.f;
m_phi = glm::pi<float>() / 2.f;
m_zenovis->updateCameraFront(m_center - x_axis * m_radius, x_axis, y_axis);
setTheta(0);
setPhi(glm::pi<float>() / 2);
m_zenovis->updateCameraFront(center - x_axis * radius, x_axis, y_axis);
break;
case 5:
// bottom view
m_theta = glm::pi<float>() / 2;
m_phi = 0.f;
m_zenovis->updateCameraFront(m_center - y_axis * m_radius, y_axis, z_axis);
setTheta(glm::pi<float>() / 2);
setPhi(0);
m_zenovis->updateCameraFront(center - y_axis * radius, y_axis, z_axis);
break;
case 6:
// back to origin
m_center = {0, 0, 0};
m_radius = 5.f;
m_theta = 0.f;
m_phi = 0.f;
m_zenovis->updateCameraFront(m_center, -z_axis, y_axis);
setCenter({0, 0, 0});
setRadius(5);
setTheta(0);
setPhi(0);
m_zenovis->updateCameraFront(center, -z_axis, y_axis);
default: break;
}
m_ortho_mode = true;
setOrthoMode(true);
updatePerspective();
m_ortho_mode = false;
setOrthoMode(false);
zenoApp->getMainWindow()->updateViewport();
}

Expand Down Expand Up @@ -240,21 +280,24 @@ void CameraControl::fakeMouseMoveEvent(QMouseEvent *event)
dy *= ratio / m_res[1];
bool shift_pressed = event->modifiers() & Qt::ShiftModifier;
if (shift_pressed) {
float cos_t = cos(m_theta);
float sin_t = sin(m_theta);
float cos_p = cos(m_phi);
float sin_p = sin(m_phi);
float cos_t = cos(getTheta());
float sin_t = sin(getTheta());
float cos_p = cos(getPhi());
float sin_p = sin(getPhi());
QVector3D back(cos_t * sin_p, sin_t, -cos_t * cos_p);
QVector3D up(-sin_t * sin_p, cos_t, sin_t * cos_p);
QVector3D right = QVector3D::crossProduct(up, back);
up = QVector3D::crossProduct(back, right);
right.normalize();
up.normalize();
QVector3D delta = right * dx + up * dy;
m_center += delta * m_radius;
auto c = getCenter();
QVector3D center = {c[0], c[1], c[2]};
center += delta * getRadius();
setCenter({float(center.x()), float(center.y()), float(center.z())});
} else {
m_theta -= dy * M_PI;
m_phi += dx * M_PI;
setTheta(getTheta() - dy * M_PI);
setPhi(getPhi() + dx * M_PI);
}
m_lastPos = QPointF(xpos, ypos);
} else if (event->buttons() & Qt::LeftButton) {
Expand Down Expand Up @@ -288,8 +331,8 @@ void CameraControl::updatePerspective() {
if (session == nullptr) {
return;
}
float cx = m_center[0], cy = m_center[1], cz = m_center[2];
m_zenovis->updatePerspective(m_res, PerspectiveInfo(cx, cy, cz, m_theta, m_phi, m_radius, getFOV(), m_ortho_mode,
float cx = getCenter()[0], cy = getCenter()[1], cz = getCenter()[2];
m_zenovis->updatePerspective(m_res, PerspectiveInfo(cx, cy, cz, getTheta(), getPhi(), getRadius(), getFOV(), getOrthoMode(),
getAperture(), getDisPlane()));
}

Expand All @@ -313,7 +356,7 @@ void CameraControl::fakeWheelEvent(QWheelEvent *event) {
float temp = getDisPlane() + delta * 0.05;
setDisPlane(temp >= 0.05 ? temp : 0.05);
} else {
m_radius *= scale;
setRadius(getRadius() * scale);
}
updatePerspective();

Expand Down Expand Up @@ -355,28 +398,30 @@ void CameraControl::setKeyFrame() {
}

void CameraControl::focus(QVector3D center, float radius) {
m_center = center;
setCenter({float(center.x()), float(center.y()), float(center.z())});
if (getFOV() >= 1e-6)
radius /= (getFOV() / 45.0f);
m_radius = radius;
setRadius(radius);
updatePerspective();
}

QVector3D CameraControl::realPos() const {
float cos_t = std::cos(m_theta);
float sin_t = std::sin(m_theta);
float cos_p = std::cos(m_phi);
float sin_p = std::sin(m_phi);
float cos_t = cos(getTheta());
float sin_t = sin(getTheta());
float cos_p = cos(getPhi());
float sin_p = sin(getPhi());
QVector3D back(cos_t * sin_p, sin_t, -cos_t * cos_p);
return m_center - back * m_radius;
auto c = getCenter();
QVector3D center = {c[0], c[1], c[2]};
return center - back * getRadius();
}

// x, y from [0, 1]
QVector3D CameraControl::screenToWorldRay(float x, float y) const {
float cos_t = cos(m_theta);
float sin_t = sin(m_theta);
float cos_p = cos(m_phi);
float sin_p = sin(m_phi);
float cos_t = cos(getTheta());
float sin_t = sin(getTheta());
float cos_p = cos(getPhi());
float sin_p = sin(getPhi());
QVector3D back(cos_t * sin_p, sin_t, -cos_t * cos_p);
QVector3D up(-sin_t * sin_p, cos_t, sin_t * cos_p);
QVector3D right = QVector3D::crossProduct(up, back);
Expand All @@ -385,7 +430,9 @@ QVector3D CameraControl::screenToWorldRay(float x, float y) const {
up.normalize();
QMatrix4x4 view;
view.setToIdentity();
view.lookAt(realPos(), m_center, up);
auto c = getCenter();
QVector3D center = {c[0], c[1], c[2]};
view.lookAt(realPos(), center, up);
x = (x - 0.5) * 2;
y = (y - 0.5) * (-2);
float v = std::tan(glm::radians(getFOV()) * 0.5f);
Expand Down
16 changes: 11 additions & 5 deletions ui/zenoedit/viewport/cameracontrol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ class CameraControl : public QObject
QObject* parent = nullptr);
void setRes(QVector2D res);
QVector2D res() const { return m_res; }

float getTheta() const;
void setTheta(float theta);
float getPhi() const;
void setPhi(float phi);
zeno::vec3f getCenter() const;
void setCenter(zeno::vec3f center);
bool getOrthoMode() const;
void setOrthoMode(bool OrthoMode);
float getRadius() const;
void setRadius(float radius);
float getFOV() const;
void setFOV(float fov);
float getAperture() const;
Expand All @@ -44,13 +55,8 @@ class CameraControl : public QObject
void resizeTransformHandler(int dir);

private:
float m_theta;
float m_phi;
QPointF m_lastPos;
QPoint m_boundRectStartPos;
QVector3D m_center;
bool m_ortho_mode;
float m_radius;
QVector2D m_res;
QSet<int> m_pressedKeys;

Expand Down
6 changes: 6 additions & 0 deletions zenovis/include/zenovis/Camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ struct Camera {
bool m_block_window = false;
bool m_auto_radius = false;

float m_theta = 0;
float m_phi = 0;
zeno::vec3f m_center = {};
bool m_ortho_mode = false;
float m_radius = 5;

zeno::vec2i viewport_offset = {};

struct ZxxHappyLookParam {
Expand Down
Loading