mirror of
https://github.com/recp/cglm.git
synced 2025-12-31 12:47:05 +00:00
Merge branch 'master' of https://github.com/recp/cglm
This commit is contained in:
@@ -42,9 +42,9 @@ glms_sphere_radii(vec4s s) {
|
||||
*/
|
||||
CGLM_INLINE
|
||||
vec4s
|
||||
glms_sphere_transform(vec4s s, mat4 m) {
|
||||
glms_sphere_transform(vec4s s, mat4s m) {
|
||||
vec4s r;
|
||||
glm_sphere_transform(s.raw, m, r.raw);
|
||||
glm_sphere_transform(s.raw, m.raw, r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
@@ -455,18 +455,18 @@ glms_vec2_normalize(vec2s v) {
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief rotate vec2 around axis by angle using Rodrigues' rotation formula
|
||||
* @brief rotate vec2 by angle using Rodrigues' rotation formula
|
||||
*
|
||||
* @param[in] v vector
|
||||
* @param[in] axis axis vector (must be unit vector)
|
||||
* @param[in] angle angle by radians
|
||||
* @returns rotated vector
|
||||
*/
|
||||
CGLM_INLINE
|
||||
vec2s
|
||||
glms_vec2_rotate(vec2s v, float angle, vec2s axis) {
|
||||
glm_vec2_rotate(v.raw, angle, axis.raw);
|
||||
return v;
|
||||
glms_vec2_rotate(vec2s v, float angle) {
|
||||
vec2s r;
|
||||
glm_vec2_rotate(v.raw, angle, r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user