olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: move vec3_t_to_glm() to mathlib.hh

This commit is contained in:
Eric Wasylishen 2017-02-08 15:01:03 -07:00
parent bc2d734e9a
commit 90bf0134de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/bsputils.cc
View File

@ -261,10 +261,6 @@ EdgePlanes_PointInside(const bsp2_dface_t *face, const plane_t *edgeplanes, cons
using namespace glm; using namespace glm;
static glm::vec3 vec3_t_to_glm(const vec3_t vec) {
return glm::vec3(vec[0], vec[1], vec[2]);
}
glm::vec4 Face_Plane_E(const bsp2_t *bsp, const bsp2_dface_t *f) glm::vec4 Face_Plane_E(const bsp2_t *bsp, const bsp2_dface_t *f)
{ {
const vec3 p0 = Face_PointAtIndex_E(bsp, f, 0); const vec3 p0 = Face_PointAtIndex_E(bsp, f, 0);

4
include/common/mathlib.hh
View File

@ -307,6 +307,10 @@ float Lanczos2D(float x, float y, float a);
// glm geometry // glm geometry
static inline glm::vec3 vec3_t_to_glm(const vec3_t vec) {
return glm::vec3(vec[0], vec[1], vec[2]);
}
glm::vec3 GLM_FaceNormal(std::vector<glm::vec3> points); glm::vec3 GLM_FaceNormal(std::vector<glm::vec3> points);
std::vector<glm::vec4> GLM_MakeInwardFacingEdgePlanes(std::vector<glm::vec3> points); std::vector<glm::vec4> GLM_MakeInwardFacingEdgePlanes(std::vector<glm::vec3> points);
bool GLM_EdgePlanes_PointInside(const std::vector<glm::vec4> &edgeplanes, const glm::vec3 &point); bool GLM_EdgePlanes_PointInside(const std::vector<glm::vec4> &edgeplanes, const glm::vec3 &point);