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

feat: made hitboxes area dependent

Browse Source
This commit is contained in:
Matt Threlfall
2025-10-06 21:57:06 +01:00
parent c01a6be4e5
commit f18d9d2b0e
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,14 +189,14 @@ void LoadWorld(M_Arena *arena, World *world) {
//
{
U32 n_hitbox = *(U32 *) base; base += 4;
AABB *boxes = (AABB *) base;
World_Hitbox *boxes = (World_Hitbox *) base;
world->hitboxCount = n_hitbox;
world->hitboxes = M_ArenaPush(arena, AABB, .count = WORLD_HITBOX_MAX);
world->hitboxes = M_ArenaPush(arena, World_Hitbox, .count = WORLD_HITBOX_MAX);
M_CopySize(world->hitboxes, boxes, n_hitbox * sizeof(AABB));
M_CopySize(world->hitboxes, boxes, n_hitbox * sizeof(World_Hitbox));
base += (WORLD_HITBOX_MAX * sizeof(AABB));
base += (WORLD_HITBOX_MAX * sizeof(World_Hitbox));
}
// Map
@@ -242,7 +242,7 @@ void GenerateNavMesh(M_Arena *arena, World *world) {
U32 y = (i / 96);
bool skip = false;
for(U32 hi = 0; hi < world->hitboxCount; hi++) {
if(AABB_Point(world->hitboxes[hi], V2F((F32) x, (F32) y))) {
if(AABB_Point(world->hitboxes[hi].box, V2F((F32) x, (F32) y))) {
skip = true;
break;
}
@@ -262,7 +262,7 @@ void GenerateNavMesh(M_Arena *arena, World *world) {
}
// It's quad for loop time :D
for(U32 hi = 0; hi < world->hitboxCount; hi++) {
if(AABB_Point(world->hitboxes[hi], V2F((F32) (x + nx), (F32) (y + ny)))) {
if(AABB_Point(world->hitboxes[hi].box, V2F((F32) (x + nx), (F32) (y + ny)))) {
skip = true;
break;
}

4
code/game/world.h
View File

@@ -45,6 +45,8 @@ struct World_Portal
AABB box;
World_Area area;
};
typedef World_Portal World_Hitbox;
typedef struct World World;
#include "player.h"
@@ -62,7 +64,7 @@ struct World {
World_Tile *tileTypes;
World_PropType *propTypes;
World_Prop *props;
AABB *hitboxes;
World_Hitbox *hitboxes;
World_Portal *portals;
U32 *map;