From 7c7ac8b82ed6904528da3fe5c4edfef18a374cf0 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sat, 22 Oct 2022 23:06:46 +0300 Subject: [PATCH] add missing impl for project_z --- include/cglm/call/clipspace/project_no.h | 4 ++++ include/cglm/call/clipspace/project_zo.h | 4 ++++ include/cglm/clipspace/project_no.h | 2 +- src/clipspace/project_no.c | 6 ++++++ src/clipspace/project_zo.c | 6 ++++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/cglm/call/clipspace/project_no.h b/include/cglm/call/clipspace/project_no.h index c62c37b..3cba860 100644 --- a/include/cglm/call/clipspace/project_no.h +++ b/include/cglm/call/clipspace/project_no.h @@ -21,6 +21,10 @@ CGLM_EXPORT void glmc_project_no(vec3 pos, mat4 m, vec4 vp, vec3 dest); +CGLM_EXPORT +float +glmc_project_z_no(vec3 pos, mat4 m); + #ifdef __cplusplus } #endif diff --git a/include/cglm/call/clipspace/project_zo.h b/include/cglm/call/clipspace/project_zo.h index a7137bd..d2a6c62 100644 --- a/include/cglm/call/clipspace/project_zo.h +++ b/include/cglm/call/clipspace/project_zo.h @@ -21,6 +21,10 @@ CGLM_EXPORT void glmc_project_zo(vec3 pos, mat4 m, vec4 vp, vec3 dest); +CGLM_EXPORT +float +glmc_project_z_zo(vec3 pos, mat4 m); + #ifdef __cplusplus } #endif diff --git a/include/cglm/clipspace/project_no.h b/include/cglm/clipspace/project_no.h index fc6d2ca..71fbc52 100644 --- a/include/cglm/clipspace/project_no.h +++ b/include/cglm/clipspace/project_no.h @@ -103,7 +103,7 @@ glm_project_z_no(vec3 v, mat4 m) { z = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2]; w = m[0][3] * v[0] + m[1][3] * v[1] + m[2][3] * v[2] + m[3][3]; - return 0.5f * (z / w) + 0.5; + return 0.5f * (z / w) + 0.5f; } #endif /* cglm_project_no_h */ diff --git a/src/clipspace/project_no.c b/src/clipspace/project_no.c index 8352cba..93b1453 100644 --- a/src/clipspace/project_no.c +++ b/src/clipspace/project_no.c @@ -19,3 +19,9 @@ void glmc_project_no(vec3 pos, mat4 m, vec4 vp, vec3 dest) { glm_project_no(pos, m, vp, dest); } + +CGLM_EXPORT +float +glmc_project_z_no(vec3 pos, mat4 m) { + return glm_project_z_no(pos, m); +} diff --git a/src/clipspace/project_zo.c b/src/clipspace/project_zo.c index bc480a0..6699be9 100644 --- a/src/clipspace/project_zo.c +++ b/src/clipspace/project_zo.c @@ -19,3 +19,9 @@ void glmc_project_zo(vec3 pos, mat4 m, vec4 vp, vec3 dest) { glm_project_zo(pos, m, vp, dest); } + +CGLM_EXPORT +float +glmc_project_z_zo(vec3 pos, mat4 m) { + return glm_project_z_zo(pos, m); +}