External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-01-06 15:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into interpolation

Browse Source
This commit is contained in:
Recep Aslantas
2018-07-12 16:17:33 +03:00
parent 7e7098d498 43c4d05d4a
commit 06d66fc6cc
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/cglm/util.h
View File

@@ -146,6 +146,17 @@ glm_clamp(float val, float minVal, float maxVal) {
return glm_min(glm_max(val, minVal), maxVal); return glm_min(glm_max(val, minVal), maxVal);
} }
/*!
* @brief clamp a number to zero and one
*
* @param[in] val value to clamp
*/
CGLM_INLINE
float
glm_clamp_zo(float val) {
return glm_clamp(val, 0.0f, 1.0f);
}
/*! /*!
* @brief linear interpolation between two number * @brief linear interpolation between two number
* *
@@ -158,7 +169,7 @@ glm_clamp(float val, float minVal, float maxVal) {
CGLM_INLINE CGLM_INLINE
float float
glm_lerp(float from, float to, float t) { glm_lerp(float from, float to, float t) {
return from + glm_clamp(t, 0.0f, 1.0f) * (to - from); return from + glm_clamp_zo(t) * (to - from);
} }
/*! /*!

2
include/cglm/vec3.h
View File

@@ -736,7 +736,7 @@ glm_vec_lerp(vec3 from, vec3 to, float t, vec3 dest) {
vec3 s, v; vec3 s, v;
/* from + s * (to - from) */ /* from + s * (to - from) */
glm_vec_broadcast(glm_clamp(t, 0.0f, 1.0f), s); glm_vec_broadcast(glm_clamp_zo(t), s);
glm_vec_sub(to, from, v); glm_vec_sub(to, from, v);
glm_vec_mulv(s, v, v); glm_vec_mulv(s, v, v);
glm_vec_add(from, v, dest); glm_vec_add(from, v, dest);

2
include/cglm/vec4.h
View File

@@ -698,7 +698,7 @@ glm_vec4_lerp(vec4 from, vec4 to, float t, vec4 dest) {
vec4 s, v; vec4 s, v;
/* from + s * (to - from) */ /* from + s * (to - from) */
glm_vec4_broadcast(glm_clamp(t, 0.0f, 1.0f), s); glm_vec4_broadcast(glm_clamp_zo(t), s);
glm_vec4_sub(to, from, v); glm_vec4_sub(to, from, v);
glm_vec4_mulv(s, v, v); glm_vec4_mulv(s, v, v);
glm_vec4_add(from, v, dest); glm_vec4_add(from, v, dest);