diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/.vscode/c_cpp_properties.json | 16 | ||||
-rw-r--r-- | src/.vscode/settings.json | 6 | ||||
-rw-r--r-- | src/engine/TODO/hh_combat.h (renamed from src/stm32/TODO/hh_combat.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/hh_draw_screen.h (renamed from src/stm32/TODO/hh_draw_screen.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/hh_entity.c (renamed from src/stm32/TODO/hh_entity.c) | 0 | ||||
-rw-r--r-- | src/engine/TODO/hh_entity.h (renamed from src/stm32/TODO/hh_entity.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/hh_level.h (renamed from src/stm32/TODO/hh_level.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/hh_rand.h (renamed from src/stm32/TODO/hh_rand.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/maths.c | 1 | ||||
-rw-r--r-- | src/engine/TODO/maths.h (renamed from src/stm32/TODO/maths.h) | 4 | ||||
-rw-r--r-- | src/engine/TODO/player_controller.h (renamed from src/stm32/TODO/player_controller.h) | 0 | ||||
-rw-r--r-- | src/engine/TODO/sprite_controller.h (renamed from src/stm32/TODO/sprite_controller.h) | 0 | ||||
-rw-r--r-- | src/ppu/ppu.h | 3 | ||||
-rw-r--r-- | src/stm32/TODO/maths.c | 10 |
14 files changed, 28 insertions, 12 deletions
diff --git a/src/.vscode/c_cpp_properties.json b/src/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..359928d --- /dev/null +++ b/src/.vscode/c_cpp_properties.json @@ -0,0 +1,16 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/**" + ], + "defines": [], + "compilerPath": "/usr/bin/gcc", + "cStandard": "c17", + "cppStandard": "c++14", + "intelliSenseMode": "linux-gcc-x64" + } + ], + "version": 4 +}
\ No newline at end of file diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json new file mode 100644 index 0000000..d485e2c --- /dev/null +++ b/src/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "files.associations": { + "hh_entity.h": "c", + "maths.h": "c" + } +}
\ No newline at end of file diff --git a/src/stm32/TODO/hh_combat.h b/src/engine/TODO/hh_combat.h index 16c41f5..16c41f5 100644 --- a/src/stm32/TODO/hh_combat.h +++ b/src/engine/TODO/hh_combat.h diff --git a/src/stm32/TODO/hh_draw_screen.h b/src/engine/TODO/hh_draw_screen.h index f5d7507..f5d7507 100644 --- a/src/stm32/TODO/hh_draw_screen.h +++ b/src/engine/TODO/hh_draw_screen.h diff --git a/src/stm32/TODO/hh_entity.c b/src/engine/TODO/hh_entity.c index fa550d5..fa550d5 100644 --- a/src/stm32/TODO/hh_entity.c +++ b/src/engine/TODO/hh_entity.c diff --git a/src/stm32/TODO/hh_entity.h b/src/engine/TODO/hh_entity.h index fdbeb8a..fdbeb8a 100644 --- a/src/stm32/TODO/hh_entity.h +++ b/src/engine/TODO/hh_entity.h diff --git a/src/stm32/TODO/hh_level.h b/src/engine/TODO/hh_level.h index 43b19a3..43b19a3 100644 --- a/src/stm32/TODO/hh_level.h +++ b/src/engine/TODO/hh_level.h diff --git a/src/stm32/TODO/hh_rand.h b/src/engine/TODO/hh_rand.h index ea7c1d4..ea7c1d4 100644 --- a/src/stm32/TODO/hh_rand.h +++ b/src/engine/TODO/hh_rand.h diff --git a/src/engine/TODO/maths.c b/src/engine/TODO/maths.c new file mode 100644 index 0000000..d1bb089 --- /dev/null +++ b/src/engine/TODO/maths.c @@ -0,0 +1 @@ +#include "maths.h" diff --git a/src/stm32/TODO/maths.h b/src/engine/TODO/maths.h index 0889c47..032e56d 100644 --- a/src/stm32/TODO/maths.h +++ b/src/engine/TODO/maths.h @@ -1,9 +1,9 @@ #pragma once - +#include <stdint.h> // #include <math.h> typedef struct { - u_int32_t x,y; + uint32_t x,y; } vec2; typedef vec2 vec_cen;//centered diff --git a/src/stm32/TODO/player_controller.h b/src/engine/TODO/player_controller.h index 1e9b86c..1e9b86c 100644 --- a/src/stm32/TODO/player_controller.h +++ b/src/engine/TODO/player_controller.h diff --git a/src/stm32/TODO/sprite_controller.h b/src/engine/TODO/sprite_controller.h index c1fadff..c1fadff 100644 --- a/src/stm32/TODO/sprite_controller.h +++ b/src/engine/TODO/sprite_controller.h diff --git a/src/ppu/ppu.h b/src/ppu/ppu.h index 75d97c1..18b58a2 100644 --- a/src/ppu/ppu.h +++ b/src/ppu/ppu.h @@ -9,6 +9,9 @@ void hh_ppu_init(); /** @brief deinitialize ppu interface */ void hh_ppu_deinit(); +/** @brief */ +void hh_ppu_load_tilemap(); + /** @brief update single foreground sprite */ void hh_ppu_update_foreground(unsigned index, hh_s_ppu_loc_fam_entry e); /** @brief update single background sprite */ diff --git a/src/stm32/TODO/maths.c b/src/stm32/TODO/maths.c deleted file mode 100644 index 2f4444a..0000000 --- a/src/stm32/TODO/maths.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "maths.h" - -float clamp( float* x, float *min, float *max ){ - if (*x < *min) - return *min; - else if (*x > *max) - return *max; - else - return *x; -} |