bulmanator/ld58
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
Matt Threlfall
2025-10-05 16:51:59 +01:00
parent 222575b318 9a46a802e0
commit 8dc0ac1d3e
8 changed files with 131 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/aabb.h
View File

@@ -3,15 +3,15 @@
#include "../core/types.h"
#include "../core/macros.h"
typedef struct AABB AABB;
struct AABB {
struct AABB
{
V2f pos;
V2f size;
};
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);
#endif // LD_GAME_AABB_H_
#endif // LD_GAME_AABB_H_

27
code/game/impl/aabb.c
View File

@@ -1,15 +1,36 @@
#include "game/aabb.h"
#include "core/types.h"
#include <math.h>
bool AABB_Collide(AABB a, AABB b) {
bool AABB_Collide(AABB a, AABB b)
{
bool collision_x = a.pos.x + a.size.x >= b.pos.x && b.pos.x + b.size.x >= a.pos.x;
bool collision_y = a.pos.y + a.size.x >= b.pos.y && b.pos.y + b.size.y >= a.pos.y;
return collision_x && collision_y;
}
bool AABB_Point(AABB a, V2f v) {
bool AABB_Point(AABB a, V2f v)
{
bool collision_x = a.pos.x + a.size.x >= v.x && a.pos.x <= v.x;
bool collision_y = a.pos.x + a.size.y >= v.y && a.pos.y <= v.y;
return collision_x && collision_y;
}
bool AABB_Slab(V2f origin, V2f point, AABB a)
{
V2f start = a.pos;
V2f finish = {a.pos.x + a.size.x, a.pos.y + a.size.y};
V2f invdirection = {1 / (origin.x - point.x), 1 / (origin.y - point.y)};
// x
F32 tLow = (start.x - origin.x) * invdirection.x;
F32 tHigh = (finish.x - origin.x) * invdirection.x;
F32 tMin = Min(tLow, tHigh);
F32 tMax = Max(tLow, tHigh);
// y
tLow = (start.y - origin.y) * invdirection.y;
tHigh = (finish.y - origin.y) * invdirection.y;
tMin = Max(tMin, Min(tLow, tHigh));
tMax = Min(tMax, Max(tLow, tHigh));
return tMax >= tMin;
}

48
code/game/impl/nav.c
View File

@@ -6,7 +6,8 @@
#define MAX_UNFINISHED 128
typedef struct navSearchNodeState navSearchNodeState;
struct navSearchNodeState{
struct navSearchNodeState
{
bool visited;
F64 distance;
U32 shortest;
@@ -14,37 +15,45 @@ struct navSearchNodeState{
};
typedef struct navSearchState navSearchState;
struct navSearchState{
struct navSearchState
{
navSearchNodeState nodeStates[NAV_MAX_NODES];
};
navSearchState initState(U32 start, U32 meshSize) {
navSearchState state = {};
for(U32 i = 0; i < meshSize; i++) {
state.nodeStates[i].visited = false;
navSearchState initState(U32 start, U32 meshSize)
{
navSearchState state;
for (U32 i = 0; i < meshSize; i++)
{
state.nodeStates[i].visited = false;
state.nodeStates[i].addedToUnvisited = false;
state.nodeStates[i].distance = U64_MAX;
state.nodeStates[i].shortest = 0;
state.nodeStates[i].distance = U64_MAX;
state.nodeStates[i].shortest = 0;
}
state.nodeStates[start].distance = 0;
return state;
}
U32 getLowestState(U32 unfinishedIndexes[128], U32 unfinishedCount, navSearchState state, U32 *offset) {
U32 lowest = U32_MAX;
U32 getLowestState(U32 unfinishedIndexes[128], U32 unfinishedCount, navSearchState state, U32 *offset)
{
U32 lowest = U32_MAX;
U32 lowestI = U32_MAX;
bool startFound = false;
for(U32 i = *offset; i < unfinishedCount; i++) {
for (U32 i = *offset; i < unfinishedCount; i++)
{
navSearchNodeState checkNode = state.nodeStates[unfinishedIndexes[i]];
if(checkNode.visited) {
if(!startFound) {
if (checkNode.visited)
{
if (!startFound)
{
*offset = i;
}
continue;
}
startFound = true;
if (lowest > checkNode.distance) {
lowest = cast(U32) checkNode.distance;
if (lowest > checkNode.distance)
{
lowest = cast(U32) checkNode.distance;
lowestI = unfinishedIndexes[i];
}
}
@@ -81,7 +90,8 @@ NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end) {
testNode->distance = distance;
testNode->shortest = lowestNodeIndex;
}
if(!testNode->addedToUnvisited) {
if (!testNode->addedToUnvisited)
{
unfinishedIndexes[unfinishedCount] = connection->NodeIndex;
unfinishedCount++;
testNode->addedToUnvisited = true;
@@ -89,13 +99,15 @@ NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end) {
}
state.nodeStates[lowestNodeIndex].visited = true;
lowestNodeIndex = getLowestState(unfinishedIndexes, unfinishedCount, state, &unfinishedOffset);
if(lowestNodeIndex == end) {
if (lowestNodeIndex == end)
{
found = true;
}
}
NavPath res_path = {0};
U32 index = end;
while(index!=start) {
while (index != start)
{
res_path.indexes[res_path.nodeCount] = index;
res_path.nodeCount++;
index = state.nodeStates[index].shortest;

49
code/game/impl/player.c
View File

@@ -4,23 +4,34 @@
void PlayerUpdate(SDL_Event *event, Player *player)
{
SDL_KeyboardEvent key = event->key;
switch(key.key) {
case SDLK_W: {
player->pos.y += 10;
break;
}
case SDLK_A: {
player->pos.x -= 10;
break;
}
case SDLK_D: {
player->pos.x += 10;
break;
}
case SDLK_S: {
player->pos.y -= 10;
break;
}
}
SDL_KeyboardEvent key = event->key;
SDL_MouseButtonEvent mouseBtn = event->button;
switch (key.key)
{
case SDLK_W:
{
player->pos.y += 10;
break;
}
case SDLK_A:
{
player->pos.x -= 10;
break;
}
case SDLK_D:
{
player->pos.x += 10;
break;
}
case SDLK_S:
{
player->pos.y -= 10;
break;
}
}
if (mouseBtn.clicks == 1)
{
// shooting
player->bulletsLoaded -= 1;
}
}

12
code/game/impl/world.c
View File

@@ -3,17 +3,21 @@
#include "../player.h"
#include <SDL3/SDL_events.h>
void UpdateWorld(F32 delta, World *world) {
void UpdateWorld(F32 delta, World *world)
{
UpdateNPCs(delta, world);
}
void UpdateNPCs(F32 delta, World *world) {
for(U32 i = 0; i < world->npcCount; i++) {
void UpdateNPCs(F32 delta, World *world)
{
for (U32 i = 0; i < world->npcCount; i++)
{
updateNPC(delta, &world->npcs[i], world);
}
}
void ProcessEvents(SDL_Event *event, World *world) {
void ProcessEvents(SDL_Event *event, World *world)
{
PlayerUpdate(event, &world->player);
}

1
code/game/player.h
View File

@@ -10,6 +10,7 @@ typedef struct Player Player;
struct Player
{
V2f pos;
U32 bulletsLoaded;
};
function void PlayerUpdate(SDL_Event *event, Player *player);