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

size -> diag, new sizev

Browse Source
This commit is contained in:
duarm
2024-02-23 13:53:25 -03:00
parent 7e6a463256
commit 131ac68ad3
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docs/source/aabb2d.rst
View File

@@ -17,6 +17,10 @@ convert it before and after calling a cglm aabb2d function.
Table of contents (click to go): Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. :c:func:`glm_aabb2d_size`
Functions: Functions:
1. :c:func:`glm_aabb2d_copy` 1. :c:func:`glm_aabb2d_copy`
@@ -26,7 +30,8 @@ Functions:
#. :c:func:`glm_aabb2d_crop_until` #. :c:func:`glm_aabb2d_crop_until`
#. :c:func:`glm_aabb2d_invalidate` #. :c:func:`glm_aabb2d_invalidate`
#. :c:func:`glm_aabb2d_isvalid` #. :c:func:`glm_aabb2d_isvalid`
#. :c:func:`glm_aabb2d_size` #. :c:func:`glm_aabb2d_diag`
#. :c:func:`glm_aabb2d_sizev`
#. :c:func:`glm_aabb2d_radius` #. :c:func:`glm_aabb2d_radius`
#. :c:func:`glm_aabb2d_center` #. :c:func:`glm_aabb2d_center`
#. :c:func:`glm_aabb2d_aabb` #. :c:func:`glm_aabb2d_aabb`
@@ -111,9 +116,9 @@ Functions documentation
Returns: Returns:
returns true if aabb is valid otherwise false returns true if aabb is valid otherwise false
.. c:function:: float glm_aabb2d_size(vec2 aabb[2]) .. c:function:: float glm_aabb2d_diag(vec2 aabb[2])
| distance between of min and max | distance between min and max
Parameters: Parameters:
| *[in]* **aabb** bounding box | *[in]* **aabb** bounding box
@@ -121,6 +126,18 @@ Functions documentation
Returns: Returns:
distance between min - max distance between min - max
.. c:function:: void glm_aabb2d_sizev(vec2 aabb[2], vec2 dest)
| size vector of aabb
Parameters:
| *[in]* **aabb** bounding box
| *[out]* **dest** size vector
Returns:
size vector of aabb max - min
.. c:function:: float glm_aabb2d_radius(vec2 aabb[2]) .. c:function:: float glm_aabb2d_radius(vec2 aabb[2])
| radius of sphere which surrounds AABB | radius of sphere which surrounds AABB

9
include/cglm/aabb2d.h
View File

@@ -12,6 +12,9 @@
#include "vec2.h" #include "vec2.h"
#include "util.h" #include "util.h"
/* DEPRECATED! use _diag */
#define glm_aabb2d_size(aabb) glm_aabb2d_diag(aabb)
/*! /*!
* @brief copy all members of [aabb] to [dest] * @brief copy all members of [aabb] to [dest]
* *
@@ -164,7 +167,7 @@ glm_aabb2d_isvalid(vec2 aabb[2]) {
*/ */
CGLM_INLINE CGLM_INLINE
float float
glm_aabb2d_diagonal(vec2 aabb[2]) { glm_aabb2d_diag(vec2 aabb[2]) {
return glm_vec2_distance(aabb[0], aabb[1]); return glm_vec2_distance(aabb[0], aabb[1]);
} }
@@ -176,7 +179,7 @@ glm_aabb2d_diagonal(vec2 aabb[2]) {
*/ */
CGLM_INLINE CGLM_INLINE
void void
glm_aabb2d_size(vec2 aabb[2], vec2 dest) { glm_aabb2d_sizev(vec2 aabb[2], vec2 dest) {
glm_vec2_sub(aabb[1], aabb[0], dest); glm_vec2_sub(aabb[1], aabb[0], dest);
} }
@@ -188,7 +191,7 @@ glm_aabb2d_size(vec2 aabb[2], vec2 dest) {
CGLM_INLINE CGLM_INLINE
float float
glm_aabb2d_radius(vec2 aabb[2]) { glm_aabb2d_radius(vec2 aabb[2]) {
return glm_aabb2d_diagonal(aabb) * 0.5f; return glm_aabb2d_diag(aabb) * 0.5f;
} }
/*! /*!

4
include/cglm/call/aabb2d.h
View File

@@ -50,11 +50,11 @@ glmc_aabb2d_isvalid(vec2 aabb[2]);
CGLM_EXPORT CGLM_EXPORT
float float
glmc_aabb2d_diagonal(vec2 aabb[2]); glmc_aabb2d_diag(vec2 aabb[2]);
CGLM_EXPORT CGLM_EXPORT
void void
glmc_aabb2d_size(vec2 aabb[2], vec2 dest); glmc_aabb2d_sizev(vec2 aabb[2], vec2 dest);
CGLM_EXPORT CGLM_EXPORT
float float

8
src/aabb2d.c
View File

@@ -55,14 +55,14 @@ glmc_aabb2d_isvalid(vec2 aabb[2]) {
CGLM_EXPORT CGLM_EXPORT
float float
glmc_aabb2d_diagonal(vec2 aabb[2]) { glmc_aabb2d_diag(vec2 aabb[2]) {
return glm_aabb2d_diagonal(aabb); return glm_aabb2d_diag(aabb);
} }
CGLM_EXPORT CGLM_EXPORT
void void
glmc_aabb2d_size(vec2 aabb[2], vec2 dest) { glmc_aabb2d_sizev(vec2 aabb[2], vec2 dest) {
return glm_aabb2d_size(aabb, dest); glm_aabb2d_sizev(aabb, dest);
} }
CGLM_EXPORT CGLM_EXPORT