MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2024-09-21 12:35:36 +02:00
Code Issues Projects Releases Wiki Activity

add camera view dir helper

Browse Source
This commit is contained in:
Green Sky 2022-02-15 17:21:45 +01:00
parent 49ed05dfd6
commit f5eb0e0dfa
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
framework/opengl_renderer/src/mm/opengl/camera_3d.cpp
View File

@ -51,20 +51,7 @@ void Camera3D::updateView(void) {
pitch = glm::clamp(pitch, -(glm::pi<float>()/2 - 0.00001f), glm::pi<float>()/2 - 0.00001f);
yaw = glm::mod(yaw, 2*glm::pi<float>());
glm::vec3 front {0,0,0};
{ // TODO: optimize
// if y up/down
front.x += up.y * glm::cos(pitch) * glm::cos(-yaw); // TODO: y is yaw inverted??
front.y += up.y * glm::sin(pitch);
front.z += up.y * glm::cos(pitch) * glm::sin(-yaw);
// if z up/down
front.x += up.z * glm::cos(pitch) * glm::cos(yaw);
front.y += up.z * glm::cos(pitch) * glm::sin(yaw);
front.z += up.z * glm::sin(pitch);
}
front = glm::normalize(front);
glm::vec3 front = getViewDir();
_view = glm::lookAt(translation, translation + front, up);
}
@ -82,6 +69,27 @@ glm::mat4 Camera3D::getProjection() const {
return _projection;
}
glm::vec3 Camera3D::getViewDir(void) const {
glm::vec3 front {0,0,0};
{ // TODO: optimize
#if 0
// if y up/down
front.x += up.y * glm::cos(pitch) * glm::cos(-yaw); // TODO: y is yaw inverted??
front.y += up.y * glm::sin(pitch);
front.z += up.y * glm::cos(pitch) * glm::sin(-yaw);
#else
// if z up/down
front.x += up.z * glm::cos(pitch) * glm::cos(yaw);
front.y += up.z * glm::cos(pitch) * glm::sin(yaw);
front.z += up.z * glm::sin(pitch);
#endif
}
front = glm::normalize(front);
return front;
}
std::array<glm::vec4, 6> Camera3D::getFrustumPlanes(void) const {
ZoneScopedN("Camera3D::getFrustumPlanes")

2
framework/opengl_renderer/src/mm/opengl/camera_3d.hpp
View File

@ -47,6 +47,8 @@ namespace MM::OpenGL {
glm::mat4 getView(void) const;
glm::mat4 getProjection(void) const;
glm::vec3 getViewDir(void) const;
// call updateView beforehand, does not cache
std::array<glm::vec4, 6> getFrustumPlanes(void) const;