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

raycast start

Browse Source
This commit is contained in:
Declan Grant
2025-10-04 17:36:47 +01:00
parent 394366480b
commit c8dfcd857e
5 changed files with 107 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
code/first.c
View File

@@ -19,9 +19,10 @@
#include "game/impl/npc.c" #include "game/impl/npc.c"
#include "game/testnavmesh.h" #include "game/testnavmesh.h"
int main(int argc, char **argv) { int main(int argc, char **argv)
(void) argc; {
(void) argv; (void)argc;
(void)argv;
if (!SDL_Init(SDL_INIT_VIDEO)) if (!SDL_Init(SDL_INIT_VIDEO))
{ {
@@ -58,43 +59,43 @@ int main(int argc, char **argv) {
camera->fov = 60.0f; camera->fov = 60.0f;
camera->nearp = 0.01f; camera->nearp = 0.01f;
camera->farp = 1000.0f; camera->farp = 1000.0f;
game->draw.camera = camera; game->draw.camera = camera;
World *world = M_ArenaPush(arena, World); World *world = M_ArenaPush(arena, World);
game->world = world; game->world = world;
world->random = Random_Seed(29237489723847); world->random = Random_Seed(29237489723847);
world->npcCount = 2; world->npcCount = 2;
NPC *npc1 = &world->npcs[0]; NPC *npc1 = &world->npcs[0];
npc1->collision.pos.x = 15; npc1->collision.pos.x = 15;
npc1->collision.pos.y = 15; npc1->collision.pos.y = 15;
npc1->collision.size.x = 10; npc1->collision.size.x = 10;
npc1->collision.size.y = 10; npc1->collision.size.y = 10;
npc1->name = S("Matt"); npc1->name = S("Matt");
npc1->mode = NPC_ACTION_WAITING; npc1->mode = NPC_ACTION_WAITING;
npc1->waitTime = 0; npc1->waitTime = 0;
npc1->maxWaitTime = 5; npc1->maxWaitTime = 5;
npc1->currentNavNode = 87; npc1->currentNavNode = 87;
npc1->collision.pos.x = 15; npc1->collision.pos.x = 15;
npc1->collision.pos.y = 15; npc1->collision.pos.y = 15;
npc1->collision.size.x = 10; npc1->collision.size.x = 10;
npc1->collision.size.y = 10; npc1->collision.size.y = 10;
NPC *npc2 = &world->npcs[1]; NPC *npc2 = &world->npcs[1];
npc2->collision.pos.x = 15; npc2->collision.pos.x = 15;
npc2->collision.pos.y = 15; npc2->collision.pos.y = 15;
npc2->collision.size.x = 10; npc2->collision.size.x = 10;
npc2->collision.size.y = 10; npc2->collision.size.y = 10;
npc2->name = S("James"); npc2->name = S("James");
npc2->mode = NPC_ACTION_WAITING; npc2->mode = NPC_ACTION_WAITING;
npc2->waitTime = 0; npc2->waitTime = 0;
npc2->maxWaitTime = 10; npc2->maxWaitTime = 10;
npc2->currentNavNode = 0; npc2->currentNavNode = 0;
world->navMesh = &TestNavMesh; world->navMesh = &TestNavMesh;
world->npcPOI[0] = 100; world->npcPOI[0] = 100;
world->player.pos.x = 0; world->player.pos.x = 0;
world->player.pos.y = 0; world->player.pos.y = 0;
} }
bool running = true; bool running = true;
@@ -110,17 +111,17 @@ int main(int argc, char **argv) {
{ {
running = false; running = false;
} }
ProcessEvents(&e, game->world); ProcessEvents(&e, game->world);
} }
UpdateWorld(1.0/60.0, game->world); UpdateWorld(1.0 / 60.0, game->world);
int w, h; int w, h;
SDL_GetWindowSizeInPixels(window, &w, &h); SDL_GetWindowSizeInPixels(window, &w, &h);
game->draw.window_width = w; game->draw.window_width = w;
game->draw.window_height = h; game->draw.window_height = h;
G_CalculateCamera(&game->camera, (F32) w / (F32) h); G_CalculateCamera(&game->camera, (F32)w / (F32)h);
Vk_Frame *frame = Vk_FrameBegin(window); Vk_Frame *frame = Vk_FrameBegin(window);
VkCommandBuffer cmd = frame->cmd; VkCommandBuffer cmd = frame->cmd;
@@ -132,27 +133,27 @@ int main(int argc, char **argv) {
clear_colour.color.float32[3] = 1.0f; clear_colour.color.float32[3] = 1.0f;
VkRenderingAttachmentInfo colour_attachment = {0}; VkRenderingAttachmentInfo colour_attachment = {0};
colour_attachment.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO; colour_attachment.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO;
colour_attachment.imageView = vk.swapchain.views[frame->image]; colour_attachment.imageView = vk.swapchain.views[frame->image];
colour_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; colour_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
colour_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; colour_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
colour_attachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE; colour_attachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
colour_attachment.clearValue = clear_colour; colour_attachment.clearValue = clear_colour;
VkRenderingInfo rendering_info = {0}; VkRenderingInfo rendering_info = {0};
rendering_info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO; rendering_info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO;
rendering_info.renderArea = (VkRect2D) { 0, 0, w, h }; rendering_info.renderArea = (VkRect2D){0, 0, w, h};
rendering_info.layerCount = 1; rendering_info.layerCount = 1;
rendering_info.colorAttachmentCount = 1; rendering_info.colorAttachmentCount = 1;
rendering_info.pColorAttachments = &colour_attachment; rendering_info.pColorAttachments = &colour_attachment;
vk.CmdBeginRendering(cmd, &rendering_info); vk.CmdBeginRendering(cmd, &rendering_info);
D_Begin(&game->draw, frame, D_MAX_RECTS); D_Begin(&game->draw, frame, D_MAX_RECTS);
D_Rect(&game->draw, 0.0f, 0.0f, .texture = 1); D_Rect(&game->draw, 0.0f, 0.0f, .texture = 1);
D_Rect(&game->draw, -8.0f, 0.0f, .texture = 2, .scale = 2.0f); D_Rect(&game->draw, -8.0f, 0.0f, .texture = 2, .scale = 2.0f);
D_Rect(&game->draw, 6.0f, 0.0f, .texture = 3); D_Rect(&game->draw, 6.0f, 0.0f, .texture = 3);
D_End(&game->draw, frame); D_End(&game->draw, frame);

7
code/game/aabb.h
View File

@@ -3,15 +3,14 @@
#include "../core/types.h" #include "../core/types.h"
#include "../core/macros.h" #include "../core/macros.h"
typedef struct AABB AABB; typedef struct AABB AABB;
struct AABB { struct AABB
{
V2f pos; V2f pos;
V2f size; V2f size;
}; };
function bool AABB_Collide(AABB a, AABB b); function bool AABB_Collide(AABB a, AABB b);
function bool AABB_Point(AABB a, V2f v); function bool AABB_Point(AABB a, V2f v);
#endif // LD_GAME_AABB_H_ #endif // LD_GAME_AABB_H_

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

@@ -1,15 +1,35 @@
#include "game/aabb.h" #include "game/aabb.h"
#include "core/types.h" #include "core/types.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_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; 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; 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_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; bool collision_y = a.pos.x + a.size.y >= v.y && a.pos.y <= v.y;
return collision_x && collision_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 direction = {origin.x - point.x, origin.y - point.y};
// x
F32 tLow = (start.x - origin.x) / direction.x;
F32 tHigh = (finish.x - origin.x) / direction.x;
F32 tMin = min(tLow, tHigh);
F32 tMax = max(tLow, tHigh);
// y
tLow = (start.x - origin.x) / direction.x;
tHigh = (finish.x - origin.x) / direction.x;
tMin = max(tMin, min(tLow, tHigh));
tMax = min(tMax, max(tLow, tHigh));
return tMax >= max(0.0, tMin);
}

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

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

1
code/game/player.h
View File

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