YourWishes/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-02-17 03:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize project

Browse Source
This commit is contained in:
Recep Aslantas
2018-04-03 11:25:33 +03:00
parent 9f389ab8ec
commit eb527e39b4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/cglm/project.h
View File

@@ -67,7 +67,7 @@ glm_unprojecti(mat4 invMat, vec4 vp, vec3 coord, vec4 dest) {
* You probably want to map the coordinates into object space * You probably want to map the coordinates into object space
* so use MVP as m * so use MVP as m
* *
* Computing viewProj: * Computing viewProj and MVP:
* glm_mat4_mul(proj, view, viewProj); * glm_mat4_mul(proj, view, viewProj);
* glm_mat4_mul(viewProj, model, MVP); * glm_mat4_mul(viewProj, model, MVP);
* *
@@ -87,6 +87,10 @@ glm_unproject(mat4 m, vec4 vp, vec3 coord, vec4 dest) {
/*! /*!
* @brief map object coordinates to window coordinates * @brief map object coordinates to window coordinates
* *
* Computing MVP:
* glm_mat4_mul(proj, view, viewProj);
* glm_mat4_mul(viewProj, model, MVP);
*
* @param[in] pos object coordinates * @param[in] pos object coordinates
* @param[in] m MVP matrix * @param[in] m MVP matrix
* @param[in] vp viewport as [x, y, width, height] * @param[in] vp viewport as [x, y, width, height]
@@ -95,16 +99,18 @@ glm_unproject(mat4 m, vec4 vp, vec3 coord, vec4 dest) {
CGLM_INLINE CGLM_INLINE
void void
glm_project(vec3 pos, mat4 m, vec4 vp, vec3 dest) { glm_project(vec3 pos, mat4 m, vec4 vp, vec3 dest) {
vec4 pos4; vec4 pos4, vone = GLM_VEC4_ONE_INIT;
glm_vec4(pos, 1.0f, pos4); glm_vec4(pos, 1.0f, pos4);
glm_mat4_mulv(m, pos4, pos4); glm_mat4_mulv(m, pos4, pos4);
glm_vec4_scale(pos4, 1.0f / pos4[3], pos4); /* pos = pos / pos.w */ glm_vec4_scale(pos4, 1.0f / pos4[3], pos4); /* pos = pos / pos.w */
glm_vec4_add(pos4, vone, pos4);
glm_vec4_scale(pos4, 0.5f, pos4);
dest[0] = (pos4[0] + 1.0f) * 0.5f * vp[2] + vp[0]; dest[0] = pos4[0] * vp[2] + vp[0];
dest[1] = (pos4[1] + 1.0f) * 0.5f * vp[3] + vp[1]; dest[1] = pos4[1] * vp[3] + vp[1];
dest[2] = (pos4[2] + 1.0f) * 0.5f; dest[2] = pos4[2];
} }
#endif /* cglm_project_h */ #endif /* cglm_project_h */