From 735f88232a72de17d22423ba6ec207cae40ea086 Mon Sep 17 00:00:00 2001 From: opfez Date: Tue, 23 Nov 2021 18:48:31 +0100 Subject: [PATCH] add models to makefile, add up/down movement --- Makefile | 12 +++++++++++- main.c | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 24241e6..5751feb 100644 --- a/Makefile +++ b/Makefile @@ -6,5 +6,15 @@ default: serialize out serialize: serialize.c types.h $(CC) $(CFLAGS) serialize.c -o $@ -out: main.c types.h +# models +resources/plane.mod: serialize resources/plane.obj + ./serialize resources/plane.obj resources/plane.mod + +resources/monkey.mod: serialize resources/monkey.obj + ./serialize resources/monkey.obj resources/monkey.mod + +resources/iso.mod: serialize resources/iso.obj + ./serialize resources/iso.obj resources/iso.mod + +out: main.c types.h resources/plane.mod resources/monkey.mod resources/iso.mod $(CC) $(CFLAGS) $(LIBS) main.c -o $@ diff --git a/main.c b/main.c index 05c282d..06d1238 100644 --- a/main.c +++ b/main.c @@ -767,6 +767,12 @@ main(void) if (keyboard[SDL_SCANCODE_D]) { cam.pos = vec3_add(cam.pos, vec3_scalar_mul(cam.right, velocity)); } + if (keyboard[SDL_SCANCODE_SPACE]) { + cam.pos = vec3_add(cam.pos, vec3_scalar_mul(UP, velocity)); + } + if (keyboard[SDL_SCANCODE_LCTRL]) { + cam.pos = vec3_sub(cam.pos, vec3_scalar_mul(UP, velocity)); + } /* other events */ while (SDL_PollEvent(&event)) {