Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:01:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use a clearer function

Browse source
This commit is contained in:
Atlante45 2015-11-11 17:24:50 -08:00
parent e4897a8de7
commit 118d05d824
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/shared/src/GLMHelpers.cpp
View file

@ -201,7 +201,7 @@ float angleBetween(const glm::vec3& v1, const glm::vec3& v2) {
// Helper function return the rotation from the first vector onto the second // Helper function return the rotation from the first vector onto the second
glm::quat rotationBetween(const glm::vec3& v1, const glm::vec3& v2) { glm::quat rotationBetween(const glm::vec3& v1, const glm::vec3& v2) {
return glm::quat(glm::normalize(v1), glm::normalize(v2)); return glm::rotation(glm::normalize(v1), glm::normalize(v2));
} }
bool isPointBehindTrianglesPlane(glm::vec3 point, glm::vec3 p0, glm::vec3 p1, glm::vec3 p2) { bool isPointBehindTrianglesPlane(glm::vec3 point, glm::vec3 p0, glm::vec3 p1, glm::vec3 p2) {

1
libraries/shared/src/GLMHelpers.h
View file

@ -16,6 +16,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <glm/gtx/quaternion.hpp>
// Bring the most commonly used GLM types into the default namespace // Bring the most commonly used GLM types into the default namespace
using glm::ivec2; using glm::ivec2;