From cb31bc5a4404399cdd720895a7c3f0fc8881bba6 Mon Sep 17 00:00:00 2001 From: UnavailableDev <69792062+UnavailableDev@users.noreply.github.com> Date: Tue, 7 Mar 2023 16:26:50 +0100 Subject: some func defenitions for game-engine and foundation --- src/stm32/TODO/hh_combat.h | 9 +++++++++ src/stm32/TODO/hh_draw_screen.h | 1 + src/stm32/TODO/hh_entity.h | 20 ++++++++++++++++++++ src/stm32/TODO/maths.h | 11 +++++++++++ src/stm32/TODO/player_controller.h | 4 ++++ src/stm32/TODO/sprite_controller.h | 6 ++++++ 6 files changed, 51 insertions(+) create mode 100644 src/stm32/TODO/hh_combat.h create mode 100644 src/stm32/TODO/hh_draw_screen.h create mode 100644 src/stm32/TODO/hh_entity.h create mode 100644 src/stm32/TODO/maths.h create mode 100644 src/stm32/TODO/player_controller.h create mode 100644 src/stm32/TODO/sprite_controller.h diff --git a/src/stm32/TODO/hh_combat.h b/src/stm32/TODO/hh_combat.h new file mode 100644 index 0000000..16c41f5 --- /dev/null +++ b/src/stm32/TODO/hh_combat.h @@ -0,0 +1,9 @@ +#include "hh_entity.h" + + +// attacktypes: + +/// @brief basic attack +/// @param dmg damage number +/// @param target entity under attack (damage changes this hp value) +void hh_attack_basic( int8_t dmg, hh_entity* target ); diff --git a/src/stm32/TODO/hh_draw_screen.h b/src/stm32/TODO/hh_draw_screen.h new file mode 100644 index 0000000..f5d7507 --- /dev/null +++ b/src/stm32/TODO/hh_draw_screen.h @@ -0,0 +1 @@ +// every function call for drawing the screen goes here. diff --git a/src/stm32/TODO/hh_entity.h b/src/stm32/TODO/hh_entity.h new file mode 100644 index 0000000..82d75c5 --- /dev/null +++ b/src/stm32/TODO/hh_entity.h @@ -0,0 +1,20 @@ +#include "maths.h" + +typedef struct hh_entity +{ + vec2 pos, direction; + int8_t hp; + //armor/block? +}; + +/// @brief detect for collision enity and eviroment +/// @param environment position of tile to be checked +/// @param entity position entity +/// @return true if collision between enity and environment +bool hh_collision(const vec2& environment, const vec2& entity); + +/// @brief solve collisions +/// @param environment position +/// @param entity position +/// @return solved new entity position +vec2 hh_solve_collision(const vec2& environment, const vec2& entity); diff --git a/src/stm32/TODO/maths.h b/src/stm32/TODO/maths.h new file mode 100644 index 0000000..7b68156 --- /dev/null +++ b/src/stm32/TODO/maths.h @@ -0,0 +1,11 @@ +#include + +typedef struct vec2{ + float x,y; +}; + +/// @brief clamps x between min and max +/// @param x value to clamp +/// @param min +/// @param max +float clamp( float& x, float &min, float &max ); diff --git a/src/stm32/TODO/player_controller.h b/src/stm32/TODO/player_controller.h new file mode 100644 index 0000000..1e9b86c --- /dev/null +++ b/src/stm32/TODO/player_controller.h @@ -0,0 +1,4 @@ +#include "maths.h" +#include "hh_entity.h" + +// inputs diff --git a/src/stm32/TODO/sprite_controller.h b/src/stm32/TODO/sprite_controller.h new file mode 100644 index 0000000..c1fadff --- /dev/null +++ b/src/stm32/TODO/sprite_controller.h @@ -0,0 +1,6 @@ +// handles sprites + +// Bg sprites + + +// Fg or entity sprites -- cgit v1.2.3 From 0057e4578284a525724273e167bc527e36302706 Mon Sep 17 00:00:00 2001 From: UnavailableDev <69792062+UnavailableDev@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:32:41 +0100 Subject: more todo's --- src/stm32/TODO/hh_level.h | 1 + src/stm32/TODO/hh_rand.h | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/stm32/TODO/hh_level.h create mode 100644 src/stm32/TODO/hh_rand.h diff --git a/src/stm32/TODO/hh_level.h b/src/stm32/TODO/hh_level.h new file mode 100644 index 0000000..43b19a3 --- /dev/null +++ b/src/stm32/TODO/hh_level.h @@ -0,0 +1 @@ +//deal with loading/saving the correct level diff --git a/src/stm32/TODO/hh_rand.h b/src/stm32/TODO/hh_rand.h new file mode 100644 index 0000000..ea7c1d4 --- /dev/null +++ b/src/stm32/TODO/hh_rand.h @@ -0,0 +1 @@ +// deal with Pseudo random number generation here. -- cgit v1.2.3 From 4510c4d9c9996ac1624b8339885950dda4e608b8 Mon Sep 17 00:00:00 2001 From: UnavailableDev <69792062+UnavailableDev@users.noreply.github.com> Date: Fri, 10 Mar 2023 10:26:04 +0100 Subject: code --- src/stm32/TODO/hh_entity.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/stm32/TODO/hh_entity.h | 20 ++++++++++++-------- src/stm32/TODO/maths.c | 10 ++++++++++ src/stm32/TODO/maths.h | 21 ++++++++++++--------- 4 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 src/stm32/TODO/hh_entity.c create mode 100644 src/stm32/TODO/maths.c diff --git a/src/stm32/TODO/hh_entity.c b/src/stm32/TODO/hh_entity.c new file mode 100644 index 0000000..fa550d5 --- /dev/null +++ b/src/stm32/TODO/hh_entity.c @@ -0,0 +1,41 @@ +#include + +#include "hh_entity.h" +#include "maths.h" + +/* + PLAYER: (pos on X) + ,___, + | | + | X | + |___| + +*/ + +bool hh_collision(vec2* pos1, vec2* pos2){ + if (pos2->x == CLAMP(pos2->x,pos1->x,pos1->x+1.0f)){// hit x + return true; + } + + if (pos2->y == CLAMP(pos2->y,pos1->y,pos1->y+0.99f)){// hit y + return true; + } + return false; +} + +void hh_solve_collision(vec2* pos_environment, hh_entity* entity){ + if (entity->vec.x > 0.0f){ + entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f); + entity->vec.x = 0.0f; + } else if (entity->vec.x < 0.0f){ + entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f); + entity->vec.x = 0.0f; + } else if (entity->vec.y > 0.0f){ + entity->pos.x = MIN(entity->pos.x,pos_environment->x-1.0f); + entity->vec.x = 0.0f; + } else if (entity->vec.y < 0.0f){ + entity->pos.x = MAX(entity->pos.x,pos_environment->x+1.0f); + entity->vec.x = 0.0f; + } +} + diff --git a/src/stm32/TODO/hh_entity.h b/src/stm32/TODO/hh_entity.h index 82d75c5..fdbeb8a 100644 --- a/src/stm32/TODO/hh_entity.h +++ b/src/stm32/TODO/hh_entity.h @@ -1,20 +1,24 @@ +#pragma once + +#include + #include "maths.h" -typedef struct hh_entity -{ - vec2 pos, direction; +typedef struct { + vec2 pos, vec; + bool is_grounded; int8_t hp; //armor/block? -}; +}hh_entity; /// @brief detect for collision enity and eviroment -/// @param environment position of tile to be checked -/// @param entity position entity +/// @param pos1 position of environment tile to be checked +/// @param pos2 position entity /// @return true if collision between enity and environment -bool hh_collision(const vec2& environment, const vec2& entity); +bool hh_collision(vec2* pos1, vec2* pos2); /// @brief solve collisions /// @param environment position /// @param entity position /// @return solved new entity position -vec2 hh_solve_collision(const vec2& environment, const vec2& entity); +void hh_solve_collision(vec2* pos_environment, hh_entity* entity); diff --git a/src/stm32/TODO/maths.c b/src/stm32/TODO/maths.c new file mode 100644 index 0000000..2f4444a --- /dev/null +++ b/src/stm32/TODO/maths.c @@ -0,0 +1,10 @@ +#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; +} diff --git a/src/stm32/TODO/maths.h b/src/stm32/TODO/maths.h index 7b68156..2dc3560 100644 --- a/src/stm32/TODO/maths.h +++ b/src/stm32/TODO/maths.h @@ -1,11 +1,14 @@ -#include +#pragma once -typedef struct vec2{ - float x,y; -}; +// #include -/// @brief clamps x between min and max -/// @param x value to clamp -/// @param min -/// @param max -float clamp( float& x, float &min, float &max ); +typedef struct { + u_int32_t x,y;//fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point)) +} vec2; + +typedef vec2 vec_cen;//centered +typedef vec2 vec_cor;//left upper corner + +#define MIN(a,b) (((a)<(b))?(a):(b)) +#define MAX(a,b) (((a)>(b))?(a):(b)) +#define CLAMP(N,LOWER,UPPER) (MIN(MAX(LOWER, N), UPPER)) -- cgit v1.2.3 From 0b6374a87305ff10020cabc2bcecae91e49151b0 Mon Sep 17 00:00:00 2001 From: UnavailableDev <69792062+UnavailableDev@users.noreply.github.com> Date: Fri, 10 Mar 2023 10:28:38 +0100 Subject: added define for fixed point maths --- src/stm32/TODO/maths.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stm32/TODO/maths.h b/src/stm32/TODO/maths.h index 2dc3560..0889c47 100644 --- a/src/stm32/TODO/maths.h +++ b/src/stm32/TODO/maths.h @@ -3,12 +3,14 @@ // #include typedef struct { - u_int32_t x,y;//fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point)) + u_int32_t x,y; } vec2; typedef vec2 vec_cen;//centered typedef vec2 vec_cor;//left upper corner +#define HH_MATH_FIXED_POINT 7 //fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point)) + #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) #define CLAMP(N,LOWER,UPPER) (MIN(MAX(LOWER, N), UPPER)) -- cgit v1.2.3