commit 985bab86476cf435f7fe92d8d8a902b5cc2b1d1b
parent 179af98488dfe706850dac9548ef9277b5df8519
Author: William Casarin <jb55@jb55.com>
Date: Sun, 28 Jul 2019 09:17:07 -0700
inline vec3
Diffstat:
| D | src/vec3.c | | | 271 | ------------------------------------------------------------------------------- |
| M | src/vec3.h | | | 286 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ |
2 files changed, 266 insertions(+), 291 deletions(-)
diff --git a/src/vec3.c b/src/vec3.c
@@ -1,271 +0,0 @@
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "mat4.h"
-#include "vec3.h"
-
-vec3 *vec3_create(vec3 *vec) {
- vec3 *dest = calloc(sizeof(float_t), 3);
-
- if (vec) {
- dest[0] = vec[0];
- dest[1] = vec[1];
- dest[2] = vec[2];
- } else {
- dest[0] = dest[1] = dest[2] = 0;
- }
-
- return dest;
-}
-
-vec3 *vec3_set(vec3 *vec, vec3 *dest) {
- dest[0] = vec[0];
- dest[1] = vec[1];
- dest[2] = vec[2];
-
- return dest;
-}
-
-vec3 *vec3_add(vec3 *vec, vec3 *vec2, vec3 *dest) {
- if (!dest || vec == dest) {
- vec[0] += vec2[0];
- vec[1] += vec2[1];
- vec[2] += vec2[2];
- return vec;
- }
-
- dest[0] = vec[0] + vec2[0];
- dest[1] = vec[1] + vec2[1];
- dest[2] = vec[2] + vec2[2];
-
- return dest;
-}
-
-vec3 *vec3_subtract(vec3 *vec, vec3 *vec2, vec3 *dest) {
- if (!dest || vec == dest) {
- vec[0] -= vec2[0];
- vec[1] -= vec2[1];
- vec[2] -= vec2[2];
- return vec;
- }
-
- dest[0] = vec[0] - vec2[0];
- dest[1] = vec[1] - vec2[1];
- dest[2] = vec[2] - vec2[2];
- return dest;
-}
-
-vec3 *vec3_multiply(vec3 *vec, vec3 *vec2, vec3 *dest) {
- if (!dest || vec == dest) {
- vec[0] *= vec2[0];
- vec[1] *= vec2[1];
- vec[2] *= vec2[2];
- return vec;
- }
-
- dest[0] = vec[0] * vec2[0];
- dest[1] = vec[1] * vec2[1];
- dest[2] = vec[2] * vec2[2];
- return dest;
-}
-
-vec3 *vec3_negate(vec3 *vec, vec3 *dest) {
- if (!dest) { dest = vec; }
-
- dest[0] = -vec[0];
- dest[1] = -vec[1];
- dest[2] = -vec[2];
- return dest;
-}
-
-vec3 *vec3_scale(vec3 *vec, float val, vec3 *dest) {
- if (!dest || vec == dest) {
- vec[0] *= val;
- vec[1] *= val;
- vec[2] *= val;
- return vec;
- }
-
- dest[0] = vec[0] * val;
- dest[1] = vec[1] * val;
- dest[2] = vec[2] * val;
- return dest;
-}
-
-vec3 *vec3_normalize(vec3 *vec, vec3 *dest) {
- if (!dest) { dest = vec; }
-
- float x = vec[0], y = vec[1], z = vec[2],
- len = sqrt(x * x + y * y + z * z);
-
- if (!len) {
- dest[0] = 0;
- dest[1] = 0;
- dest[2] = 0;
- return dest;
- } else if (len == 1) {
- dest[0] = x;
- dest[1] = y;
- dest[2] = z;
- return dest;
- }
-
- len = 1 / len;
- dest[0] = x * len;
- dest[1] = y * len;
- dest[2] = z * len;
- return dest;
-}
-
-vec3 *vec3_cross (vec3 *vec, vec3 *vec2, vec3 *dest) {
- if (!dest) { dest = vec; }
-
- float x = vec[0], y = vec[1], z = vec[2],
- x2 = vec2[0], y2 = vec2[1], z2 = vec2[2];
-
- dest[0] = y * z2 - z * y2;
- dest[1] = z * x2 - x * z2;
- dest[2] = x * y2 - y * x2;
- return dest;
-}
-
-float vec3_lengthsq(vec3 *vec) {
- float x = vec[0], y = vec[1], z = vec[2];
- return x * x + y * y + z * z;
-}
-
-float vec3_length(vec3 *vec) {
- return sqrt(vec3_lengthsq(vec));
-}
-
-float vec3_dot(vec3 *vec, vec3 *vec2) {
- return vec[0] * vec2[0] + vec[1] * vec2[1] + vec[2] * vec2[2];
-}
-
-vec3 *vec3_direction (vec3 *vec, vec3 *vec2, vec3 *dest) {
- if (!dest) { dest = vec; }
-
- float x = vec[0] - vec2[0],
- y = vec[1] - vec2[1],
- z = vec[2] - vec2[2],
- len = sqrt(x * x + y * y + z * z);
-
- if (!len) {
- dest[0] = 0;
- dest[1] = 0;
- dest[2] = 0;
- return dest;
- }
-
- len = 1 / len;
- dest[0] = x * len;
- dest[1] = y * len;
- dest[2] = z * len;
- return dest;
-}
-
-vec3 *vec3_lerp(vec3 *vec, vec3 *vec2, float lerp, vec3 *dest) {
- if (!dest) { dest = vec; }
-
- dest[0] = vec[0] + lerp * (vec2[0] - vec[0]);
- dest[1] = vec[1] + lerp * (vec2[1] - vec[1]);
- dest[2] = vec[2] + lerp * (vec2[2] - vec[2]);
-
- return dest;
-}
-
-float vec3_distsq(vec3 *vec, vec3 *vec2) {
- float x = vec2[0] - vec[0],
- y = vec2[1] - vec[1],
- z = vec2[2] - vec[2];
-
- return x*x + y*y + z*z;
-}
-
-
-vec3 *vec3_all(vec3 *vec, float n) {
- vec[0] = n;
- vec[1] = n;
- vec[2] = n;
- return vec;
-}
-
-/* vec3 *vec3_unproject(vec3 *vec, mat4 view, mat4 proj, vec4_t viewport, vec3 *dest) { */
-/* if (!dest) { dest = vec; } */
-
-/* mat4 m = mat4_create(NULL); */
-/* float *v = malloc(sizeof(float) * 4); */
-
-/* v[0] = (vec[0] - viewport[0]) * 2.0 / viewport[2] - 1.0; */
-/* v[1] = (vec[1] - viewport[1]) * 2.0 / viewport[3] - 1.0; */
-/* v[2] = 2.0 * vec[2] - 1.0; */
-/* v[3] = 1.0; */
-
-/* mat4_multiply(proj, view, m); */
-/* if(!mat4_inverse(m, NULL)) { return NULL; } */
-
-/* mat4_multiplyVec4(m, v, NULL); */
-/* if(v[3] == 0.0) { return NULL; } */
-
-/* dest[0] = v[0] / v[3]; */
-/* dest[1] = v[1] / v[3]; */
-/* dest[2] = v[2] / v[3]; */
-
-/* return dest; */
-/* } */
-
-int vec3_isall(vec3 *vec, float n) {
- for (int i = 0; i < 3; ++i) {
- if (vec[i] != n)
- return 0;
- }
-
- return 1;
-}
-
-int vec3_eq(vec3 *a, vec3 *b, float precision) {
- return fabs(a[0] - b[0]) <= precision &&
- fabs(a[1] - b[1]) <= precision &&
- fabs(a[2] - b[2]) <= precision;
-}
-
-
-void vec3_copy(vec3 *a, vec3 *dest) {
- dest[0] = a[0];
- dest[1] = a[1];
- dest[2] = a[2];
-}
-
-
-static inline double max(double a, double b) {
- return a > b ? a : b;
-}
-
-static inline double min(double a, double b) {
- return a < b ? a : b;
-}
-
-vec3 *vec3_min(vec3 *vec, vec3* vec2, vec3 *dest) {
- dest[0] = min(vec[0], vec2[0]);
- dest[1] = min(vec[1], vec2[1]);
- dest[2] = min(vec[2], vec2[2]);
- return dest;
-}
-
-vec3 *vec3_max(vec3 *vec, vec3* vec2, vec3 *dest) {
- dest[0] = max(vec[0], vec2[0]);
- dest[1] = max(vec[1], vec2[1]);
- dest[2] = max(vec[2], vec2[2]);
- return dest;
-}
-
-
-vec3 *vec3_from_yaw_pitch(float yaw, float pitch, float *dest) {
- float theta = yaw;
- float phi = pitch;
- dest[0] = sin(theta) * cos(phi);
- dest[1] = sin(theta) * sin(phi);
- dest[2] = cos(theta);
- return dest;
-}
diff --git a/src/vec3.h b/src/vec3.h
@@ -2,31 +2,277 @@
#ifndef VEC3_H
#define VEC3_H
+#include <stdlib.h>
+#include <math.h>
typedef float vec3;
#define V3(x,y,z) ((vec3[3]){x,y,z})
-vec3 *vec3_direction (vec3 *vec, vec3 *vec2, vec3 *dest);
-vec3 *vec3_scale(vec3 *vec, float val, vec3 *dest);
-vec3 *vec3_subtract(vec3 *vec, vec3 *vec2, vec3 *dest);
-vec3 *vec3_cross (vec3 *vec, vec3 *vec2, vec3 *dest);
-vec3 *vec3_multiply(vec3 *vec, vec3 *vec2, vec3 *dest);
-vec3 *vec3_scale(vec3 *vec, float val, vec3 *dest);
-vec3 *vec3_normalize(vec3 *vec, vec3 *dest);
-vec3 *vec3_min(vec3 *vec, vec3* vec2, vec3 *dest);
-vec3 *vec3_max(vec3 *vec, vec3* vec2, vec3 *dest);
-float vec3_dist(vec3 *vec, vec3 *vec2);
-float vec3_distsq(vec3 *vec, vec3 *vec2);
-float *vec3_set(vec3 *vec, vec3 *dest);
-float vec3_length(vec3 *vec);
-float vec3_lengthsq(vec3 *vec);
-float vec3_dot(vec3 *vec, vec3 *vec2);
-int vec3_isall(vec3 *vec, float n);
-vec3 *vec3_all(vec3 *vec, float n);
-vec3 *vec3_add(vec3 *vec, vec3 *vec2, vec3 *dest);
-int vec3_eq(vec3 *a, vec3 *b, float precision);
-void vec3_copy(vec3 *a, vec3 *dest);
+static inline vec3 *vec3_create(vec3 *vec) {
+ vec3 *dest = calloc(sizeof(float_t), 3);
+
+ if (vec) {
+ dest[0] = vec[0];
+ dest[1] = vec[1];
+ dest[2] = vec[2];
+ } else {
+ dest[0] = dest[1] = dest[2] = 0;
+ }
+
+ return dest;
+}
+
+static inline vec3 *vec3_set(vec3 *vec, vec3 *dest) {
+ dest[0] = vec[0];
+ dest[1] = vec[1];
+ dest[2] = vec[2];
+
+ return dest;
+}
+
+static inline vec3 *vec3_add(vec3 *vec, vec3 *vec2, vec3 *dest) {
+ if (!dest || vec == dest) {
+ vec[0] += vec2[0];
+ vec[1] += vec2[1];
+ vec[2] += vec2[2];
+ return vec;
+ }
+
+ dest[0] = vec[0] + vec2[0];
+ dest[1] = vec[1] + vec2[1];
+ dest[2] = vec[2] + vec2[2];
+
+ return dest;
+}
+
+static inline vec3 *vec3_subtract(vec3 *vec, vec3 *vec2, vec3 *dest) {
+ if (!dest || vec == dest) {
+ vec[0] -= vec2[0];
+ vec[1] -= vec2[1];
+ vec[2] -= vec2[2];
+ return vec;
+ }
+
+ dest[0] = vec[0] - vec2[0];
+ dest[1] = vec[1] - vec2[1];
+ dest[2] = vec[2] - vec2[2];
+ return dest;
+}
+
+static inline vec3 *vec3_multiply(vec3 *vec, vec3 *vec2, vec3 *dest) {
+ if (!dest || vec == dest) {
+ vec[0] *= vec2[0];
+ vec[1] *= vec2[1];
+ vec[2] *= vec2[2];
+ return vec;
+ }
+
+ dest[0] = vec[0] * vec2[0];
+ dest[1] = vec[1] * vec2[1];
+ dest[2] = vec[2] * vec2[2];
+ return dest;
+}
+
+static inline vec3 *vec3_negate(vec3 *vec, vec3 *dest) {
+ if (!dest) { dest = vec; }
+
+ dest[0] = -vec[0];
+ dest[1] = -vec[1];
+ dest[2] = -vec[2];
+ return dest;
+}
+
+static inline vec3 *vec3_scale(vec3 *vec, float val, vec3 *dest) {
+ if (!dest || vec == dest) {
+ vec[0] *= val;
+ vec[1] *= val;
+ vec[2] *= val;
+ return vec;
+ }
+
+ dest[0] = vec[0] * val;
+ dest[1] = vec[1] * val;
+ dest[2] = vec[2] * val;
+ return dest;
+}
+
+static inline vec3 *vec3_normalize(vec3 *vec, vec3 *dest) {
+ if (!dest) { dest = vec; }
+
+ float x = vec[0], y = vec[1], z = vec[2],
+ len = sqrt(x * x + y * y + z * z);
+
+ if (!len) {
+ dest[0] = 0;
+ dest[1] = 0;
+ dest[2] = 0;
+ return dest;
+ } else if (len == 1) {
+ dest[0] = x;
+ dest[1] = y;
+ dest[2] = z;
+ return dest;
+ }
+
+ len = 1 / len;
+ dest[0] = x * len;
+ dest[1] = y * len;
+ dest[2] = z * len;
+ return dest;
+}
+
+static inline vec3 *vec3_cross (vec3 *vec, vec3 *vec2, vec3 *dest) {
+ if (!dest) { dest = vec; }
+
+ float x = vec[0], y = vec[1], z = vec[2],
+ x2 = vec2[0], y2 = vec2[1], z2 = vec2[2];
+
+ dest[0] = y * z2 - z * y2;
+ dest[1] = z * x2 - x * z2;
+ dest[2] = x * y2 - y * x2;
+ return dest;
+}
+
+static inline float vec3_lengthsq(vec3 *vec) {
+ float x = vec[0], y = vec[1], z = vec[2];
+ return x * x + y * y + z * z;
+}
+
+static inline float vec3_length(vec3 *vec) {
+ return sqrt(vec3_lengthsq(vec));
+}
+
+static inline float vec3_dot(vec3 *vec, vec3 *vec2) {
+ return vec[0] * vec2[0] + vec[1] * vec2[1] + vec[2] * vec2[2];
+}
+
+static inline vec3 *vec3_direction (vec3 *vec, vec3 *vec2, vec3 *dest) {
+ if (!dest) { dest = vec; }
+
+ float x = vec[0] - vec2[0],
+ y = vec[1] - vec2[1],
+ z = vec[2] - vec2[2],
+ len = sqrt(x * x + y * y + z * z);
+
+ if (!len) {
+ dest[0] = 0;
+ dest[1] = 0;
+ dest[2] = 0;
+ return dest;
+ }
+
+ len = 1 / len;
+ dest[0] = x * len;
+ dest[1] = y * len;
+ dest[2] = z * len;
+ return dest;
+}
+
+static inline vec3 *vec3_lerp(vec3 *vec, vec3 *vec2, float lerp, vec3 *dest) {
+ if (!dest) { dest = vec; }
+
+ dest[0] = vec[0] + lerp * (vec2[0] - vec[0]);
+ dest[1] = vec[1] + lerp * (vec2[1] - vec[1]);
+ dest[2] = vec[2] + lerp * (vec2[2] - vec[2]);
+
+ return dest;
+}
+
+static inline float vec3_distsq(vec3 *vec, vec3 *vec2) {
+ float x = vec2[0] - vec[0],
+ y = vec2[1] - vec[1],
+ z = vec2[2] - vec[2];
+
+ return x*x + y*y + z*z;
+}
+
+
+static inline vec3 *vec3_all(vec3 *vec, float n) {
+ vec[0] = n;
+ vec[1] = n;
+ vec[2] = n;
+ return vec;
+}
+
+/* vec3 *vec3_unproject(vec3 *vec, mat4 view, mat4 proj, vec4_t viewport, vec3 *dest) { */
+/* if (!dest) { dest = vec; } */
+
+/* mat4 m = mat4_create(NULL); */
+/* float *v = malloc(sizeof(float) * 4); */
+
+/* v[0] = (vec[0] - viewport[0]) * 2.0 / viewport[2] - 1.0; */
+/* v[1] = (vec[1] - viewport[1]) * 2.0 / viewport[3] - 1.0; */
+/* v[2] = 2.0 * vec[2] - 1.0; */
+/* v[3] = 1.0; */
+
+/* mat4_multiply(proj, view, m); */
+/* if(!mat4_inverse(m, NULL)) { return NULL; } */
+
+/* mat4_multiplyVec4(m, v, NULL); */
+/* if(v[3] == 0.0) { return NULL; } */
+
+/* dest[0] = v[0] / v[3]; */
+/* dest[1] = v[1] / v[3]; */
+/* dest[2] = v[2] / v[3]; */
+
+/* return dest; */
+/* } */
+
+static inline int vec3_isall(vec3 *vec, float n) {
+ for (int i = 0; i < 3; ++i) {
+ if (vec[i] != n)
+ return 0;
+ }
+
+ return 1;
+}
+
+static inline int vec3_eq(vec3 *a, vec3 *b, float precision) {
+ return fabs(a[0] - b[0]) <= precision &&
+ fabs(a[1] - b[1]) <= precision &&
+ fabs(a[2] - b[2]) <= precision;
+}
+
+
+static inline void vec3_copy(vec3 *a, vec3 *dest) {
+ dest[0] = a[0];
+ dest[1] = a[1];
+ dest[2] = a[2];
+}
+
+
+static inline double max(double a, double b) {
+ return a > b ? a : b;
+}
+
+static inline double min(double a, double b) {
+ return a < b ? a : b;
+}
+
+static inline vec3 *vec3_min(vec3 *vec, vec3* vec2, vec3 *dest) {
+ dest[0] = min(vec[0], vec2[0]);
+ dest[1] = min(vec[1], vec2[1]);
+ dest[2] = min(vec[2], vec2[2]);
+ return dest;
+}
+
+static inline vec3 *vec3_max(vec3 *vec, vec3* vec2, vec3 *dest) {
+ dest[0] = max(vec[0], vec2[0]);
+ dest[1] = max(vec[1], vec2[1]);
+ dest[2] = max(vec[2], vec2[2]);
+ return dest;
+}
+
+
+static inline vec3 *vec3_from_yaw_pitch(float yaw, float pitch, float *dest) {
+ float theta = yaw;
+ float phi = pitch;
+ dest[0] = sin(theta) * cos(phi);
+ dest[1] = sin(theta) * sin(phi);
+ dest[2] = cos(theta);
+ return dest;
+}
#define EPSILON 0.0001
#define vec3_approxeq(a, b) vec3_eq(a, b, EPSILON)
