diff options
Diffstat (limited to 'src/maths')
| -rw-r--r-- | src/maths/primitives.c | 14 | ||||
| -rw-r--r-- | src/maths/primitives.h | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/maths/primitives.c b/src/maths/primitives.c index bb8a348..1e1e673 100644 --- a/src/maths/primitives.c +++ b/src/maths/primitives.c @@ -6,11 +6,6 @@ #include "render_types.h" // --- Helpers -#define VERT_3D(arr, pos, norm, uv) \ - { \ - Vertex v = { .static_3d = { .position = pos, .normal = norm, .tex_coords = uv } }; \ - Vertex_darray_push(arr, v); \ - } void push_triangle(u32_darray* arr, u32 i0, u32 i1, u32 i2) { u32_darray_push(arr, i0); @@ -58,15 +53,6 @@ Geometry Geo_CreatePlane(f32x2 extents) { return geo; } -static const Vec3 BACK_BOT_LEFT = (Vec3){ 0, 0, 0 }; -static const Vec3 BACK_BOT_RIGHT = (Vec3){ 1, 0, 0 }; -static const Vec3 BACK_TOP_LEFT = (Vec3){ 0, 1, 0 }; -static const Vec3 BACK_TOP_RIGHT = (Vec3){ 1, 1, 0 }; -static const Vec3 FRONT_BOT_LEFT = (Vec3){ 0, 0, 1 }; -static const Vec3 FRONT_BOT_RIGHT = (Vec3){ 1, 0, 1 }; -static const Vec3 FRONT_TOP_LEFT = (Vec3){ 0, 1, 1 }; -static const Vec3 FRONT_TOP_RIGHT = (Vec3){ 1, 1, 1 }; - Geometry Geo_CreateCuboid(f32x3 extents) { Vertex_darray* vertices = Vertex_darray_new(36); diff --git a/src/maths/primitives.h b/src/maths/primitives.h index 38ae1de..f7b390d 100644 --- a/src/maths/primitives.h +++ b/src/maths/primitives.h @@ -11,3 +11,18 @@ Geometry Geo_CreateCuboid(f32x3 extents); Geometry Geo_CreateCylinder(f32 radius, f32 height, u32 resolution); Geometry Geo_CreateUVsphere(f32 radius, u32 north_south_lines, u32 east_west_lines); Geometry Geo_CreateIcosphere(f32 radius, f32 n_subdivisions); + +static const Vec3 BACK_BOT_LEFT = (Vec3){ 0, 0, 0 }; +static const Vec3 BACK_BOT_RIGHT = (Vec3){ 1, 0, 0 }; +static const Vec3 BACK_TOP_LEFT = (Vec3){ 0, 1, 0 }; +static const Vec3 BACK_TOP_RIGHT = (Vec3){ 1, 1, 0 }; +static const Vec3 FRONT_BOT_LEFT = (Vec3){ 0, 0, 1 }; +static const Vec3 FRONT_BOT_RIGHT = (Vec3){ 1, 0, 1 }; +static const Vec3 FRONT_TOP_LEFT = (Vec3){ 0, 1, 1 }; +static const Vec3 FRONT_TOP_RIGHT = (Vec3){ 1, 1, 1 }; + +#define VERT_3D(arr, pos, norm, uv) \ + { \ + Vertex v = { .static_3d = { .position = pos, .normal = norm, .tex_coords = uv } }; \ + Vertex_darray_push(arr, v); \ + }
\ No newline at end of file |