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

vec: rename glm_vec_ namespace to glm_vec3_

Browse Source
This commit is contained in:
Recep Aslantas
2018-11-28 23:22:30 +03:00
parent ef6134263e
commit 0b8c63a90e
20 changed files with 460 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/cglm/sphere.h
View File

@@ -60,13 +60,13 @@ void
glm_sphere_merge(vec4 s1, vec4 s2, vec4 dest) {
float dist, radii;
dist = glm_vec_distance(s1, s2);
dist = glm_vec3_distance(s1, s2);
radii = dist + s1[3] + s2[3];
radii = glm_max(radii, s1[3]);
radii = glm_max(radii, s2[3]);
glm_vec_center(s1, s2, dest);
glm_vec3_center(s1, s2, dest);
dest[3] = radii;
}
@@ -79,7 +79,7 @@ glm_sphere_merge(vec4 s1, vec4 s2, vec4 dest) {
CGLM_INLINE
bool
glm_sphere_sphere(vec4 s1, vec4 s2) {
return glm_vec_distance2(s1, s2) <= glm_pow2(s1[3] + s2[3]);
return glm_vec3_distance2(s1, s2) <= glm_pow2(s1[3] + s2[3]);
}
/*!
@@ -93,7 +93,7 @@ bool
glm_sphere_point(vec4 s, vec3 point) {
float rr;
rr = s[3] * s[3];
return glm_vec_distance2(point, s) <= rr;
return glm_vec3_distance2(point, s) <= rr;
}
#endif /* cglm_sphere_h */