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

Merge branch 'master' of https://github.com/recp/cglm

Browse Source
This commit is contained in:
Recep Aslantas
2020-03-06 23:33:30 +03:00
parent 7eada03909 ad4a763d47
commit fabc655919
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/cglm/struct/sphere.h
View File

@@ -42,9 +42,9 @@ glms_sphere_radii(vec4s s) {
*/ */
CGLM_INLINE CGLM_INLINE
vec4s vec4s
glms_sphere_transform(vec4s s, mat4 m) { glms_sphere_transform(vec4s s, mat4s m) {
vec4s r; vec4s r;
glm_sphere_transform(s.raw, m, r.raw); glm_sphere_transform(s.raw, m.raw, r.raw);
return r; return r;
} }

10
include/cglm/struct/vec2.h
View File

@@ -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] v vector
* @param[in] axis axis vector (must be unit vector)
* @param[in] angle angle by radians * @param[in] angle angle by radians
* @returns rotated vector * @returns rotated vector
*/ */
CGLM_INLINE CGLM_INLINE
vec2s vec2s
glms_vec2_rotate(vec2s v, float angle, vec2s axis) { glms_vec2_rotate(vec2s v, float angle) {
glm_vec2_rotate(v.raw, angle, axis.raw); vec2s r;
return v; glm_vec2_rotate(v.raw, angle, r.raw);
return r;
} }
/** /**