X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=number.c;h=0b4f096a1559998423b7b92b61ec3ca3511a5653;hb=87a6d41d1909f18851b5c83cb03d1323f0435547;hp=678504209506eee9e8bd31a100bdb17ea7eae78b;hpb=fa0ea24eda75319dfbfe439dbe65c25888da84e9;p=dragonstd.git diff --git a/number.c b/number.c index 6785042..0b4f096 100644 --- a/number.c +++ b/number.c @@ -1,150 +1,95 @@ -#include -#include -#include -#include #include "number.h" -bool read_full(int fd, char *buffer, size_t size) -{ - size_t n_read_total = 0; - int n_read; - while (n_read_total < size) { - if ((n_read = read(fd, buffer + n_read_total, size - n_read_total)) == -1) { - perror("read"); - return false; - } - n_read_total += n_read; - } - return true; -} - -#define htobe8(x) x -#define be8toh(x) x - -#define READVEC(type, n) \ - type buf[n]; \ - for (int i = 0; i < n; i++) { \ - if (! read_ ## type(fd, &buf[i])) \ - return false; \ +#define DEFINE_CLAMP(scalar) \ + scalar scalar ## _clamp(scalar v, scalar min, scalar max) \ + { \ + return v < min ? min : v > max ? max : v; \ } -#define WRITEVEC(type, n) \ - for (int i = 0; i < n; i++) { \ - if (! write_ ## type(fd, vec[i])) \ - return false; \ - } \ - return true; - -#define DEFVEC(type) \ - bool read_v2 ## type(int fd, v2 ## type *ptr) \ - { \ - READVEC(type, 2) \ - ptr->x = buf[0]; \ - ptr->y = buf[1]; \ - return true; \ - } \ - bool write_v2 ## type(int fd, v2 ## type val) \ - { \ - type vec[2] = {val.x, val.y}; \ - WRITEVEC(type, 2) \ - } \ - bool v2 ## type ## _equals(v2 ## type a, v2 ## type b) \ +#define DEFINE_VECTOR2(vector, clamp) \ + bool vector ## _equals(vector a, vector b) \ { \ return a.x == b.x && a.y == b.y; \ } \ - v2 ## type v2 ## type ## _add(v2 ## type a, v2 ## type b) \ - { \ - return (v2 ## type) {a.x + b.x, a.y + b.y}; \ - } \ - bool read_v3 ## type(int fd, v3 ## type *ptr) \ + vector vector ## _add(vector a, vector b) \ { \ - READVEC(type, 3) \ - ptr->x = buf[0]; \ - ptr->y = buf[1]; \ - ptr->z = buf[2]; \ - return true; \ + return (vector) {a.x + b.x, a.y + b.y}; \ } \ - bool write_v3 ## type(int fd, v3 ## type val) \ + vector vector ## _clamp(vector v, vector min, vector max) \ { \ - type vec[3] = {val.x, val.y, val.z}; \ - WRITEVEC(type, 3) \ - } \ - bool v3 ## type ## _equals(v3 ## type a, v3 ## type b) \ + return (vector) {clamp(v.x, min.x, max.x), clamp(v.y, min.y, max.y)}; \ + } + +#define DEFINE_VECTOR3(vector, clamp) \ + bool vector ## _equals(vector a, vector b) \ { \ return a.x == b.x && a.y == b.y && a.z == b.z; \ } \ - v3 ## type v3 ## type ## _add(v3 ## type a, v3 ## type b) \ + vector vector ## _add(vector a, vector b) \ { \ - return (v3 ## type) {a.x + b.x, a.y + b.y, a.z + b.z}; \ + return (vector) {a.x + b.x, a.y + b.y, a.z + b.z}; \ } \ - bool read_v4 ## type(int fd, v4 ## type *ptr) \ + vector vector ## _clamp(vector v, vector min, vector max) \ { \ - READVEC(type, 4) \ - ptr->x = buf[0]; \ - ptr->y = buf[1]; \ - ptr->z = buf[2]; \ - ptr->w = buf[3]; \ - return true; \ - } \ - bool write_v4 ## type(int fd, v4 ## type val) \ + return (vector) {clamp(v.x, min.x, max.x), clamp(v.y, min.y, max.y), clamp(v.z, min.z, max.z)}; \ + } + +#define DEFINE_VECTOR4(vector, clamp) \ + bool vector ## _equals(vector a, vector b) \ { \ - type vec[4] = {val.x, val.y, val.z, val.w}; \ - WRITEVEC(type, 4) \ + return a.x == b.x && a.y == b.y && a.z == b.z && a.w == b.w; \ } \ - bool v4 ## type ## _equals(v4 ## type a, v4 ## type b) \ + vector vector ## _add(vector a, vector b) \ { \ - return a.x == b.x && a.y == b.y && a.z == b.z && a.w == b.w; \ + return (vector) {a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w}; \ } \ - v4 ## type v4 ## type ## _add(v4 ## type a, v4 ## type b) \ + vector vector ## _clamp(vector v, vector min, vector max) \ { \ - return (v4 ## type) {a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w}; \ + return (vector) {clamp(v.x, min.x, max.x), clamp(v.y, min.y, max.y), clamp(v.z, min.z, max.z), clamp(v.w, min.w, max.w)}; \ } -#define DEFTYP(type, bits) \ - bool read_ ## type(int fd, type *buf) \ - { \ - u ## bits encoded; \ - if (! read_full(fd, (char *) &encoded, sizeof(type))) \ - return false; \ - *buf = be ## bits ## toh(encoded); \ - return true; \ - } \ - bool write_ ## type(int fd, type val) \ - { \ - u ## bits encoded = htobe ## bits(val); \ - if (write(fd, &encoded, sizeof(encoded)) == -1) { \ - perror("write"); \ - return false; \ - } \ - return true; \ - } \ - DEFVEC(type) +#define DEFINE_SCALAR(scalar) \ + DEFINE_CLAMP(scalar) \ + DEFINE_VECTOR2(v2 ## scalar, scalar ## _clamp) \ + DEFINE_VECTOR3(v3 ## scalar, scalar ## _clamp) \ + DEFINE_VECTOR4(v4 ## scalar, scalar ## _clamp) -#define DEFTYPES(bits) \ - DEFTYP(s ## bits, bits) \ - DEFTYP(u ## bits, bits) +#define DEFINE_INTEGER(bits) \ + DEFINE_SCALAR(s ## bits) \ + DEFINE_SCALAR(u ## bits) -DEFTYPES(8) -DEFTYPES(16) -DEFTYPES(32) -DEFTYPES(64) +#define DEFINE_MIX_VECTOR2(vector, scalar, mix) \ + vector vector ## _mix(vector a, vector b, scalar f) \ + { \ + return (vector) {mix(a.x, b.x, f), mix(a.y, b.y, f)}; \ + } -#define DEFFLOAT(type) \ - bool read_ ## type(int fd, type *buf) \ +#define DEFINE_MIX_VECTOR3(vector, scalar, mix) \ + vector vector ## _mix(vector a, vector b, scalar f) \ { \ - if (! read_full(fd, (char *) buf, sizeof(type))) \ - return false; \ - return true; \ - } \ - bool write_ ## type(int fd, type val) \ + return (vector) {mix(a.x, b.x, f), mix(a.y, b.y, f), mix(a.z, b.z, f)}; \ + } + +#define DEFINE_MIX_VECTOR4(vector, scalar, mix) \ + vector vector ## _mix(vector a, vector b, scalar f) \ { \ - if (write(fd, &val, sizeof(val)) == -1) { \ - perror("write"); \ - return false; \ - } \ - return true; \ + return (vector) {mix(a.x, b.x, f), mix(a.y, b.y, f), mix(a.z, b.z, f), mix(a.w, b.w, f)}; \ + } + +#define DEFINE_FLOAT(type) \ + DEFINE_SCALAR(type) \ + type type ## _mix(type a, type b, type f) \ + { \ + return (1.0 - f) * a + b * f; \ } \ - DEFVEC(type) + DEFINE_MIX_VECTOR2(v2 ## type, type, type ## _mix) \ + DEFINE_MIX_VECTOR3(v3 ## type, type, type ## _mix) \ + DEFINE_MIX_VECTOR4(v4 ## type, type, type ## _mix) + +DEFINE_INTEGER(8) +DEFINE_INTEGER(16) +DEFINE_INTEGER(32) +DEFINE_INTEGER(64) -DEFFLOAT(f32) -DEFFLOAT(f64) +DEFINE_FLOAT(f32) +DEFINE_FLOAT(f64)