External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-03 16:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve minv and maxv

Browse Source
This commit is contained in:
Recep Aslantas
2018-01-18 16:24:30 +03:00
parent 4a7cd2eb26
commit da8bbc6536
2 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/cglm/vec3.h
View File

@@ -436,20 +436,9 @@ glm_vec_distance(vec3 v1, vec3 v2) {
CGLM_INLINE CGLM_INLINE
void void
glm_vec_maxv(vec3 v1, vec3 v2, vec3 dest) { glm_vec_maxv(vec3 v1, vec3 v2, vec3 dest) {
if (v1[0] > v2[0]) dest[0] = glm_max(v1[0], v2[0]);
dest[0] = v1[0]; dest[1] = glm_max(v1[1], v2[1]);
else dest[2] = glm_max(v1[2], v2[2]);
dest[0] = v2[0];
if (v1[1] > v2[1])
dest[1] = v1[1];
else
dest[1] = v2[1];
if (v1[2] > v2[2])
dest[2] = v1[2];
else
dest[2] = v2[2];
} }
/*! /*!
@@ -462,20 +451,9 @@ glm_vec_maxv(vec3 v1, vec3 v2, vec3 dest) {
CGLM_INLINE CGLM_INLINE
void void
glm_vec_minv(vec3 v1, vec3 v2, vec3 dest) { glm_vec_minv(vec3 v1, vec3 v2, vec3 dest) {
if (v1[0] < v2[0]) dest[0] = glm_min(v1[0], v2[0]);
dest[0] = v1[0]; dest[1] = glm_min(v1[1], v2[1]);
else dest[2] = glm_min(v1[2], v2[2]);
dest[0] = v2[0];
if (v1[1] < v2[1])
dest[1] = v1[1];
else
dest[1] = v2[1];
if (v1[2] < v2[2])
dest[2] = v1[2];
else
dest[2] = v2[2];
} }
/*! /*!
@@ -541,7 +519,7 @@ glm_normalize(vec3 v) {
* *
* this is just convenient wrapper * this is just convenient wrapper
* *
* @param[in] vec source * @param[in] v source
* @param[out] dest destination * @param[out] dest destination
*/ */
CGLM_INLINE CGLM_INLINE

46
include/cglm/vec4.h
View File

@@ -347,25 +347,10 @@ glm_vec4_distance(vec4 v1, vec4 v2) {
CGLM_INLINE CGLM_INLINE
void void
glm_vec4_maxv(vec4 v1, vec4 v2, vec4 dest) { glm_vec4_maxv(vec4 v1, vec4 v2, vec4 dest) {
if (v1[0] > v2[0]) dest[0] = glm_max(v1[0], v2[0]);
dest[0] = v1[0]; dest[1] = glm_max(v1[1], v2[1]);
else dest[2] = glm_max(v1[2], v2[2]);
dest[0] = v2[0]; dest[3] = glm_max(v1[3], v2[3]);
if (v1[1] > v2[1])
dest[1] = v1[1];
else
dest[1] = v2[1];
if (v1[2] > v2[2])
dest[2] = v1[2];
else
dest[2] = v2[2];
if (v1[3] > v2[3])
dest[3] = v1[3];
else
dest[3] = v2[3];
} }
/*! /*!
@@ -378,25 +363,10 @@ glm_vec4_maxv(vec4 v1, vec4 v2, vec4 dest) {
CGLM_INLINE CGLM_INLINE
void void
glm_vec4_minv(vec4 v1, vec4 v2, vec4 dest) { glm_vec4_minv(vec4 v1, vec4 v2, vec4 dest) {
if (v1[0] < v2[0]) dest[0] = glm_min(v1[0], v2[0]);
dest[0] = v1[0]; dest[1] = glm_min(v1[1], v2[1]);
else dest[2] = glm_min(v1[2], v2[2]);
dest[0] = v2[0]; dest[3] = glm_min(v1[3], v2[3]);
if (v1[1] < v2[1])
dest[1] = v1[1];
else
dest[1] = v2[1];
if (v1[2] < v2[2])
dest[2] = v1[2];
else
dest[2] = v2[2];
if (v1[3] < v2[3])
dest[3] = v1[3];
else
dest[3] = v2[3];
} }
#endif /* cglm_vec4_h */ #endif /* cglm_vec4_h */