From 8313dc2387e35bd69b01a23fbbc12fc0e6946993 Mon Sep 17 00:00:00 2001 From: quou Date: Sun, 28 Jul 2024 14:31:12 +1000 Subject: brick texture --- Makefile | 1 + asset.h | 5 +++++ intermediate/brick.bmp | Bin 0 -> 16522 bytes render.c | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 intermediate/brick.bmp diff --git a/Makefile b/Makefile index 050f658..3d2983f 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ mesh_sources = \ texture_sources = \ $(int_dir)/gun.bmp \ + $(int_dir)/brick.bmp meshes = $(mesh_sources:$(int_dir)/%.obj=$(data_dir)/%.msh) textures = $(texture_sources:$(int_dir)/%.bmp=$(data_dir)/%.bc1) diff --git a/asset.h b/asset.h index 91bb2fe..a569202 100644 --- a/asset.h +++ b/asset.h @@ -26,6 +26,11 @@ struct Mesh; asset_type_texture, \ "gun.bc1" \ ) \ + x( \ + asset_id_brick_texture, \ + asset_type_texture, \ + "brick.bc1" \ + ) \ typedef enum { #define x(id, type, path) id, diff --git a/intermediate/brick.bmp b/intermediate/brick.bmp new file mode 100644 index 0000000..fdd25cd Binary files /dev/null and b/intermediate/brick.bmp differ diff --git a/render.c b/render.c index 7c4dd77..f6dc018 100644 --- a/render.c +++ b/render.c @@ -727,7 +727,7 @@ void ren_map( int x, w, h, hh; const int* data = (const int*)&map[1]; /* temp */ - const Texture* texture = get_texture(asset_id_gun_texture); + const Texture* texture = get_texture(asset_id_brick_texture); w = r->vp[0] << fbits; h = r->vp[1] << fbits; hh = h / 2; -- cgit v1.2.3-54-g00ecf