Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VIDEO: fixed Camera::screenRay for corrected corners

master
Martin Gerhardy 2022-04-04 09:04:54 +02:00
parent 78e07a908e
commit d6e92091ca
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/video/Camera.cpp
View File

@ -8,6 +8,7 @@
#include "core/Singleton.h"
#include <glm/gtc/epsilon.hpp>
#include "core/Var.h"
#include <glm/ext/matrix_projection.hpp>
#include "math/AABB.h"
#include "core/GLM.h"
#include "math/Ray.h"
@ -383,15 +384,13 @@ math::Ray Camera::screenRay(const glm::vec2& screenPos) const {
// to bring them into homogeneous clip coordinates
core_assert(glm::all(glm::lessThanEqual(screenPos, glm::vec2(1.0f))));
core_assert(glm::all(glm::greaterThanEqual(screenPos, glm::vec2(0.0f))));
const float x = (2.0f * screenPos.x) - 1.0f;
const float y = 1.0f - (2.0f * screenPos.y);
const glm::vec4 rayClipSpace(x, y, -1.0f, 1.0f);
const float z = 1.0f;
glm::vec4 clipSpacePosition(screenPos * 2.0f - 1.0f, z, 1.0f);
glm::vec4 rayEyeSpace = inverseProjectionMatrix() * rayClipSpace;
rayEyeSpace.z = -1.0f;
rayEyeSpace.w = 0.0f;
glm::vec4 worldSpacePosition = glm::inverse(viewProjectionMatrix()) * clipSpacePosition;
worldSpacePosition /= worldSpacePosition.w;
const glm::vec3& rayDirection = glm::normalize(glm::vec3(inverseViewMatrix() * rayEyeSpace));
const glm::vec3& rayDirection = glm::normalize(worldSpacePosition);
return math::Ray(eye(), rayDirection);
}