diff options
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | asset.h | 5 | ||||
-rw-r--r-- | intermediate/brick.bmp | bin | 0 -> 16522 bytes | |||
-rw-r--r-- | render.c | 2 |
4 files changed, 7 insertions, 1 deletions
@@ -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) @@ -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 Binary files differnew file mode 100644 index 0000000..fdd25cd --- /dev/null +++ b/intermediate/brick.bmp @@ -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; |