Adding macros for math min, max, and clamp.

Chukobyte · Feb 24, 2024 · ae0313b · ae0313b
1 parent 4bd9a80
commit ae0313b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/seika/data_structures/ska_array2d.c b/seika/data_structures/ska_array2d.c
@@ -43,8 +43,8 @@ bool ska_array2d_set(SkaArray2D* array2d, size_t x, size_t y, void* newValue) {
 
 void ska_array2d_resize(SkaArray2D* array2d, size_t newX, size_t newY) {
     // Reallocate memory for data array
-    const size_t width = max(newX, 1);
-    const size_t height = max(newY, 1);
+    const size_t width = SKA_MATH_MAX(newX, 1);
+    const size_t height = SKA_MATH_MAX(newY, 1);
 
     array2d->data = ska_mem_reallocate(array2d->data, height * sizeof(void*));
     for (size_t i = 0; i < height; i++) {

diff --git a/seika/math/se_math.h b/seika/math/se_math.h
@@ -148,6 +148,10 @@ typedef struct SKAMinMaxVec2 {
 SKAVector2 ska_math_minmax_vec2_get_random_in_range(const SKAMinMaxVec2* minmax);
 
 // --- Misc --- //
+#define SKA_MATH_MIN(A, B) ((A) < (B) ? (A) : (B))
+#define SKA_MATH_MAX(A, B) ((A) > (B) ? (A) : (B))
+#define SKA_MATH_CLAMP(VAL, MIN_VAL, MAX_VAL) ((VAL) < (MIN_VAL) ? (MIN_VAL) : (VAL) > (MAX_VAL) ? (MAX_VAL) : (VAL))
+
 float ska_math_lerpf(float a, float b, float alpha);
 float ska_math_map_to_range(float input, float inputMin, float inputMax, float outputMin, float outputMax);
 float ska_math_map_to_unit(float input, float inputMin, float inputMax);

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "seika",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "dependencies": [
     {
       "name": "sdl2",