diff options
| author | Flenk008 <frenk_0_0@hotmail.com> | 2023-03-11 20:59:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 20:59:29 +0100 |
| commit | 19bc4a3a13d17422cfa9b2a9fcede95d4c83e822 (patch) | |
| tree | f285c0e9e564a09109910b0850ae513f503e126d | |
| parent | c12ff10740927c6040c83b3399ad35e94117131c (diff) | |
| parent | e1f6e318c47d382299ba963a84379982113f0f4b (diff) | |
Merge branch 'lonkaars:dev' into dev
| -rw-r--r-- | src/engine/TODO/draw_screen.h | 1 | ||||
| -rw-r--r-- | src/engine/draw_screen.h | 9 | ||||
| -rw-r--r-- | src/engine/engine.c | 3 | ||||
| -rw-r--r-- | src/engine/level.h (renamed from src/engine/TODO/level.h) | 1 | ||||
| -rw-r--r-- | src/engine/maths.h (renamed from src/engine/TODO/maths.h) | 0 | ||||
| -rw-r--r-- | src/makefile | 3 |
6 files changed, 15 insertions, 2 deletions
diff --git a/src/engine/TODO/draw_screen.h b/src/engine/TODO/draw_screen.h deleted file mode 100644 index f5d7507..0000000 --- a/src/engine/TODO/draw_screen.h +++ /dev/null @@ -1 +0,0 @@ -// every function call for drawing the screen goes here. diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h new file mode 100644 index 0000000..4af5865 --- /dev/null +++ b/src/engine/draw_screen.h @@ -0,0 +1,9 @@ +#pragma once + + +// every function call for drawing the screen goes here. +#include "engine/maths.h" + +#include <stdint.h> +uint16_t hh_world_to_tile(vec2 pos); +void hh_draw_screen(vec2 viewport);
\ No newline at end of file diff --git a/src/engine/engine.c b/src/engine/engine.c new file mode 100644 index 0000000..f3410a4 --- /dev/null +++ b/src/engine/engine.c @@ -0,0 +1,3 @@ +#include "engine/draw_screen.h" +#include "engine/level.h" +#include "engine/maths.h" diff --git a/src/engine/TODO/level.h b/src/engine/level.h index 09f77e7..8d610dd 100644 --- a/src/engine/TODO/level.h +++ b/src/engine/level.h @@ -1,3 +1,4 @@ +#pragma once //deal with loading/saving the correct level /** @brief */ diff --git a/src/engine/TODO/maths.h b/src/engine/maths.h index c7f1b44..c7f1b44 100644 --- a/src/engine/TODO/maths.h +++ b/src/engine/maths.h diff --git a/src/makefile b/src/makefile index c69bfb5..96751fb 100644 --- a/src/makefile +++ b/src/makefile @@ -30,7 +30,8 @@ CFLAGS += $(if $(DESKTOP), -DHH_TARGET_DESKTOP, ) LOCAL_SRCS += main.c \ ppu/internals.c \ ppu/ppu.c \ - demo.c + demo.c \ + engine/engine.c CFLAGS += $(SHARED_FLAGS) LFLAGS += $(SHARED_FLAGS) |