Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 17:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for planes not at the origin.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-22 14:33:47 -08:00
parent e552134cf5
commit e545cfe406
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/MetavoxelEditor.cpp
View file

@ -211,13 +211,13 @@ void MetavoxelEditor::render() {
glLineWidth(4.0f); glLineWidth(4.0f);
glm::vec3 eyePosition = rotation * Application::getInstance()->getViewFrustum()->getOffsetPosition(); glm::vec3 eyePosition = rotation * Application::getInstance()->getViewFrustum()->getOffsetPosition();
glm::vec3 mousePoint = glm::vec3(_mousePosition, position); glm::vec3 mousePoint = glm::vec3(_mousePosition, position);
glm::vec3 right = glm::cross(glm::vec3(0.0f, 0.0f, 1.0f), mousePoint - eyePosition); glm::vec3 right = glm::cross(glm::vec3(0.0f, 0.0f, 1.0f), eyePosition - mousePoint);
glm::vec3 normal = glm::cross(right, glm::vec3(0.0f, 0.0f, 1.0f)); glm::vec3 normal = glm::cross(right, glm::vec3(0.0f, 0.0f, 1.0f));
float divisor = glm::dot(normal, rayDirection); float divisor = glm::dot(normal, rayDirection);
if (fabs(divisor) > EPSILON) { if (fabs(divisor) > EPSILON) {
float distance = (glm::dot(normal, mousePoint) - glm::dot(normal, rayOrigin)) / divisor; float distance = (glm::dot(normal, mousePoint) - glm::dot(normal, rayOrigin)) / divisor;
float projection = rayOrigin.z + distance * rayDirection.z; float projection = rayOrigin.z + distance * rayDirection.z;
_height = spacing * roundf(projection / spacing); _height = spacing * roundf(projection / spacing) - position;
} }
} else if (fabs(rayDirection.z) > EPSILON) { } else if (fabs(rayDirection.z) > EPSILON) {
// find the intersection of the rotated mouse ray with the plane // find the intersection of the rotated mouse ray with the plane