External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-12-25 04:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unproject

Browse Source
This commit is contained in:
Recep Aslantas
2018-03-08 22:29:10 +03:00
parent c148eacdc2
commit 780179ff0d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/cglm/call/project.h
View File

@@ -19,7 +19,7 @@ glmc_unprojecti(mat4 invMat, vec4 vp, vec3 coord, vec3 dest);
CGLM_EXPORT
void
glmc_unproject(mat4 m, vec2 vp, vec3 coord, vec3 dest);
glmc_unproject(mat4 m, vec4 vp, vec3 coord, vec3 dest);
#ifdef __cplusplus
}

5
include/cglm/project.h
View File

@@ -9,6 +9,8 @@
#define cglm_project_h
#include "mat4.h"
#include "vec3.h"
#include "vec4.h"
/*!
* @brief maps the specified viewport coordinates into specified space [1]
@@ -46,7 +48,8 @@ glm_unprojecti(mat4 invMat, vec4 vp, vec3 coord, vec4 dest) {
v[2] = 2.0f * coord[2] - 1.0f;
v[3] = 1.0f;
glm_mat4_mulv(invMat, v, dest);
glm_mat4_mulv(invMat, v, v);
glm_vec4_scale(v, 1.0f / v[3], dest);
}
/*!

2
src/project.c
View File

@@ -16,6 +16,6 @@ glmc_unprojecti(mat4 invMat, vec4 vp, vec3 coord, vec3 dest) {
CGLM_EXPORT
void
glmc_unproject(mat4 m, vec2 vp, vec3 coord, vec3 dest) {
glmc_unproject(mat4 m, vec4 vp, vec3 coord, vec3 dest) {
glm_unproject(m, vp, coord, dest);
}