From cfc86e984f965285094fca91fee7d9098423b4cb Mon Sep 17 00:00:00 2001 From: quou Date: Sat, 10 Aug 2024 19:21:55 +1000 Subject: draw the gun --- 3de.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to '3de.c') diff --git a/3de.c b/3de.c index 1c10e03..099096a 100644 --- a/3de.c +++ b/3de.c @@ -41,21 +41,6 @@ void draw_spinny(Renderer* r, Colour c) { a += 20; } -void draw_gun(Renderer* r) { - static int a = 0; - const Mesh* m = get_mesh(asset_id_monkey); - const Texture* tex = get_texture(asset_id_gun_texture); - int p[] = { f1 * 7, 0, f1 * 5, f1 }; - mtx_push_trans(p); - mtx_push_scale(0xff); - /*mtx_push_rot_x(a); - mtx_push_rot_y(a); - mtx_push_rot_z(a);*/ - ren_mesh(r, m, tex); - mtx_popn(2); - a++; -} - void draw_tri(Renderer* r, int x, int y) { const Texture* tex = get_texture(asset_id_gun_texture); int v0[] = { 100, 100, 0, 0, 0, f1, f1, f1 }; @@ -158,10 +143,8 @@ int entrypoint(int argc, const char** argv, Arena* a) { if (editing) { edit_map(&e, &g, map); } else { - push_player_cam(&p); - draw_map(&r, &p, map); - draw_gun(&r); - pop_player_cam(); + draw_map(&r, &p, map); + draw_player_world(&r, &p); } /*draw_tri(&r, app->mx, app->my);*/ gui_end(&g, &r); -- cgit v1.2.3-54-g00ecf