From 319bb441ed410d70da1a20474b549b2b468ef91f Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 5 Oct 2025 22:35:34 +0100 Subject: [PATCH] feat: Added basic shooting --- code/core/impl/math.c | 9 +++++++++ code/core/math.h | 2 ++ code/first.c | 18 +++++++++++------- code/game/aabb.h | 1 + code/game/impl/aabb.c | 4 ++++ code/game/impl/player.c | 4 ++-- code/game/impl/world.c | 6 ++++-- code/game/player.h | 2 ++ code/game/world.h | 4 +++- linux | 2 +- 10 files changed, 39 insertions(+), 13 deletions(-) diff --git a/code/core/impl/math.c b/code/core/impl/math.c index c1a2cd7..36d0876 100644 --- a/code/core/impl/math.c +++ b/code/core/impl/math.c @@ -222,3 +222,12 @@ F32 Random_Bilateral(Random *rnd) { F32 result = -1.0f + (2.0f * Random_Unilateral(rnd)); return result; } + +V2f V2f_Clip(V2f screen_xy, V2f screen_size) { + V2f result; + result.x = ((screen_xy.x / screen_size.w) * 2.0f) - 1.0f; + result.y = ((screen_xy.y / screen_size.h) * 2.0f) - 1.0f; + + return result; +} + diff --git a/code/core/math.h b/code/core/math.h index 4dd6d84..f49cc00 100644 --- a/code/core/math.h +++ b/code/core/math.h @@ -147,4 +147,6 @@ function U32 Random_U32(Random *rnd, U32 min, U32 max); function F32 Random_Unilateral(Random *rnd); function F32 Random_Bilateral(Random *rnd); +V2f V2f_Clip(V2f screen_xy, V2f screen_size); + #endif // LD_CORE_MATH_H_ diff --git a/code/first.c b/code/first.c index ddfc93e..63d1dce 100644 --- a/code/first.c +++ b/code/first.c @@ -27,6 +27,9 @@ #include "game/impl/bandit.c" #include "game/testnavmesh.h" +const int width = 1280; +const int height = 720; + int main(int argc, char **argv) { (void)argc; @@ -80,16 +83,12 @@ int main(int argc, char **argv) npc1->collision.pos.x = 15; npc1->collision.pos.y = 15; npc1->collision.size.x = 1; - npc1->collision.size.y = 1; + npc1->collision.size.y = 2; npc1->name = S("Matt"); npc1->mode = NPC_ACTION_WAITING; npc1->waitTime = 0; - npc1->maxWaitTime = 5; + npc1->maxWaitTime = 5000; npc1->currentNavNode = 0; - npc1->collision.pos.x = 15; - npc1->collision.pos.y = 15; - npc1->collision.size.x = 10; - npc1->collision.size.y = 10; } Bandit *badman = &world->bandit; @@ -107,6 +106,7 @@ int main(int argc, char **argv) world->navMesh = &TestNavMesh; world->npcPOI[0] = 100; + world->player.world = world; world->player.pos.x = 0; world->player.pos.y = 0; world->player.bulletsLoaded = PLAYER_BULLET_COUNT; @@ -126,7 +126,11 @@ int main(int argc, char **argv) { running = false; } - + V3f projection = G_CameraUnproject(&game->camera, V2f_Clip( + V2F(e.button.x, e.button.y), + V2F(width, height) + )); + game->world->mouseProjected = V2F(projection.x, projection.y); ProcessEvents(&e, game->world); } diff --git a/code/game/aabb.h b/code/game/aabb.h index 9344521..5c22fb3 100644 --- a/code/game/aabb.h +++ b/code/game/aabb.h @@ -13,5 +13,6 @@ struct AABB function bool AABB_Collide(AABB a, AABB b); function bool AABB_Point(AABB a, V2f v); function bool AABB_Slab(V2f origin, V2f point, AABB a); +function V2f AABB_Centre(AABB a); #endif // LD_GAME_AABB_H_ diff --git a/code/game/impl/aabb.c b/code/game/impl/aabb.c index dfeb99b..f927452 100644 --- a/code/game/impl/aabb.c +++ b/code/game/impl/aabb.c @@ -34,3 +34,7 @@ bool AABB_Slab(V2f origin, V2f point, AABB a) return tMax >= tMin; } + +V2f AABB_Centre(AABB a) { + return V2F(a.pos.x + a.size.x/2, a.pos.y + a.size.y/2); +} diff --git a/code/game/impl/player.c b/code/game/impl/player.c index f9c442c..07d57eb 100644 --- a/code/game/impl/player.c +++ b/code/game/impl/player.c @@ -42,8 +42,8 @@ void PlayerInput(SDL_Event *event, Player *player) // shooting player->bulletsLoaded -= 1; player->controls.shot = true; - player->shotPos = V2F(mouseBtn.x, mouseBtn.y); - printf("shot %f %f\n", mouseBtn.x, mouseBtn.y); + player->shotPos = player->world->mouseProjected; + printf("shot %f %f\n", player->shotPos.x, player->shotPos.y); } else if(player->reloadTimer == 0) { player->reloadTimer = PLAYER_RELOAD_TIME; printf("reloading\n"); diff --git a/code/game/impl/world.c b/code/game/impl/world.c index 3734e08..bbca252 100644 --- a/code/game/impl/world.c +++ b/code/game/impl/world.c @@ -1,6 +1,7 @@ #include "../world.h" #include "../npc.h" #include "../player.h" +#include "../aabb.h" #include void UpdateWorld(F32 delta, World *world) @@ -30,8 +31,9 @@ void ProcessEvents(SDL_Event *event, World *world) void RenderWorld(World *world, D_Context *draw) { for(U32 i = 0; i < world->npcCount; i++) { NPC npc = world->npcs[i]; - D_Rect(draw, npc.collision.pos.x, npc.collision.pos.y, .texture = 1); - D_Rect(draw, npc.collision.pos.x, npc.collision.pos.y, .texture = 0, .dim = npc.collision.size); + V2f drawPos = AABB_Centre(npc.collision); + D_Rect(draw, drawPos.x, drawPos.y, .texture = 1); + D_Rect(draw, drawPos.x, drawPos.y, .texture = 0, .dim = npc.collision.size, .flags = D_RECT_IGNORE_ASPECT); } D_Rect(draw, world->bandit.collision.pos.x, world->bandit.collision.pos.y, .texture = 9); D_Rect(draw, world->player.pos.x, world->player.pos.y, .texture = 1); diff --git a/code/game/player.h b/code/game/player.h index 5a994dc..a727453 100644 --- a/code/game/player.h +++ b/code/game/player.h @@ -22,7 +22,9 @@ struct ControlState { typedef struct Player Player; struct Player { + World *world; V2f pos; + World_Area currentArea; U32 bulletsLoaded; ControlState controls; V2f shotPos; diff --git a/code/game/world.h b/code/game/world.h index 2cd96eb..eeaaf8a 100644 --- a/code/game/world.h +++ b/code/game/world.h @@ -1,7 +1,6 @@ #if !defined(LD_GAME_WORLD_H_) #define LD_GAME_WORLD_H_ -#include "player.h" #include "npc.h" #include "bandit.h" #include "../core/math.h" @@ -14,10 +13,13 @@ enum World_Area { }; typedef struct World World; +#include "player.h" + struct World { //// Static stuff NavMesh *navMesh; Random random; + V2f mouseProjected; //// Player Player player; diff --git a/linux b/linux index e259fee..eee3913 100755 --- a/linux +++ b/linux @@ -57,7 +57,7 @@ glslangValidator -o "assets/shaders/basic.frag.spv" --target-env "vulkan1.3" ".. echo "[Building source]" -COMPILER_OPTS="-Wall -Wno-missing-braces -Wno-unused-function -Ideps/stb -I../code" +COMPILER_OPTS="-Wall -Wno-override-init-side-effects -Wno-missing-braces -Wno-unused-function -Ideps/stb -I../code" LINKER_OPTS="-lSDL3 -lm" if [[ $release == 1 ]]