mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-04 04:24:47 +02:00
add back Util code blown away in merge
This commit is contained in:
parent
b8bfe325a0
commit
b5a641d60f
1 changed files with 33 additions and 1 deletions
|
@ -9,6 +9,38 @@
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
#include <cstring>
|
||||||
|
#include <time.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/noise.hpp>
|
||||||
|
#include <glm/gtx/quaternion.hpp>
|
||||||
|
#include <glm/detail/func_common.hpp>
|
||||||
|
|
||||||
|
#include <SharedUtil.h>
|
||||||
|
|
||||||
|
#include "InterfaceConfig.h"
|
||||||
|
#include "ui/TextRenderer.h"
|
||||||
|
#include "VoxelConstants.h"
|
||||||
|
#include "world.h"
|
||||||
|
|
||||||
|
#include "Util.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
// no clue which versions are affected...
|
||||||
|
#define WORKAROUND_BROKEN_GLUT_STROKES
|
||||||
|
// see http://www.opengl.org/resources/libraries/glut/spec3/node78.html
|
||||||
|
|
||||||
|
void eulerToOrthonormals(glm::vec3 * angles, glm::vec3 * front, glm::vec3 * right, glm::vec3 * up) {
|
||||||
|
//
|
||||||
|
// Converts from three euler angles to the associated orthonormal vectors
|
||||||
|
//
|
||||||
|
// Angles contains (pitch, yaw, roll) in radians
|
||||||
|
//
|
||||||
|
|
||||||
// First, create the quaternion associated with these euler angles
|
// First, create the quaternion associated with these euler angles
|
||||||
glm::quat q(glm::vec3(angles->x, -(angles->y), angles->z));
|
glm::quat q(glm::vec3(angles->x, -(angles->y), angles->z));
|
||||||
|
|
||||||
|
@ -597,4 +629,4 @@ bool pointInSphere(glm::vec3& point, glm::vec3& sphereCenter, double sphereRadiu
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
Loading…
Reference in a new issue