Compare commits
3 Commits
394366480b
...
9a46a802e0
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a46a802e0 | |||
| 628a6c5ade | |||
| c8dfcd857e |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
build/
|
build/
|
||||||
code/compile_commands.json
|
code/compile_commands.json
|
||||||
code/.cache
|
code/.cache
|
||||||
|
.vscode
|
||||||
|
|||||||
@@ -19,7 +19,8 @@
|
|||||||
#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)argc;
|
||||||
(void)argv;
|
(void)argv;
|
||||||
|
|
||||||
|
|||||||
@@ -3,15 +3,15 @@
|
|||||||
#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);
|
||||||
|
function bool AABB_Slab(V2f origin, V2f point, AABB a);
|
||||||
|
|
||||||
#endif // LD_GAME_AABB_H_
|
#endif // LD_GAME_AABB_H_
|
||||||
|
|||||||
@@ -1,15 +1,36 @@
|
|||||||
#include "game/aabb.h"
|
#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_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 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;
|
||||||
|
}
|
||||||
@@ -6,7 +6,8 @@
|
|||||||
#define MAX_UNFINISHED 128
|
#define MAX_UNFINISHED 128
|
||||||
|
|
||||||
typedef struct navSearchNodeState navSearchNodeState;
|
typedef struct navSearchNodeState navSearchNodeState;
|
||||||
struct navSearchNodeState{
|
struct navSearchNodeState
|
||||||
|
{
|
||||||
bool visited;
|
bool visited;
|
||||||
U64 distance;
|
U64 distance;
|
||||||
U32 shortest;
|
U32 shortest;
|
||||||
@@ -14,13 +15,16 @@ struct navSearchNodeState{
|
|||||||
};
|
};
|
||||||
|
|
||||||
typedef struct navSearchState navSearchState;
|
typedef struct navSearchState navSearchState;
|
||||||
struct navSearchState{
|
struct navSearchState
|
||||||
|
{
|
||||||
navSearchNodeState nodeStates[NAV_MAX_NODES];
|
navSearchNodeState nodeStates[NAV_MAX_NODES];
|
||||||
};
|
};
|
||||||
|
|
||||||
navSearchState initState(U32 start, U32 meshSize) {
|
navSearchState initState(U32 start, U32 meshSize)
|
||||||
navSearchState state = {};
|
{
|
||||||
for(U32 i = 0; i < meshSize; i++) {
|
navSearchState state;
|
||||||
|
for (U32 i = 0; i < meshSize; i++)
|
||||||
|
{
|
||||||
state.nodeStates[i].visited = false;
|
state.nodeStates[i].visited = false;
|
||||||
state.nodeStates[i].addedToUnvisited = false;
|
state.nodeStates[i].addedToUnvisited = false;
|
||||||
state.nodeStates[i].distance = U64_MAX;
|
state.nodeStates[i].distance = U64_MAX;
|
||||||
@@ -30,20 +34,25 @@ navSearchState initState(U32 start, U32 meshSize) {
|
|||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
U32 getLowestState(U32 unfinishedIndexes[128], U32 unfinishedCount, navSearchState state, U32 *offset) {
|
U32 getLowestState(U32 unfinishedIndexes[128], U32 unfinishedCount, navSearchState state, U32 *offset)
|
||||||
|
{
|
||||||
U32 lowest = U32_MAX;
|
U32 lowest = U32_MAX;
|
||||||
U32 lowestI = U32_MAX;
|
U32 lowestI = U32_MAX;
|
||||||
bool startFound = false;
|
bool startFound = false;
|
||||||
for(U32 i = *offset; i < unfinishedCount; i++) {
|
for (U32 i = *offset; i < unfinishedCount; i++)
|
||||||
|
{
|
||||||
navSearchNodeState checkNode = state.nodeStates[unfinishedIndexes[i]];
|
navSearchNodeState checkNode = state.nodeStates[unfinishedIndexes[i]];
|
||||||
if(checkNode.visited) {
|
if (checkNode.visited)
|
||||||
if(!startFound) {
|
{
|
||||||
|
if (!startFound)
|
||||||
|
{
|
||||||
*offset = i;
|
*offset = i;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
startFound = true;
|
startFound = true;
|
||||||
if (lowest > checkNode.distance) {
|
if (lowest > checkNode.distance)
|
||||||
|
{
|
||||||
lowest = cast(U32) checkNode.distance;
|
lowest = cast(U32) checkNode.distance;
|
||||||
lowestI = unfinishedIndexes[i];
|
lowestI = unfinishedIndexes[i];
|
||||||
}
|
}
|
||||||
@@ -52,7 +61,8 @@ U32 getLowestState(U32 unfinishedIndexes[128], U32 unfinishedCount, navSearchSta
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Generate a path to follow between the start and end node.
|
// Generate a path to follow between the start and end node.
|
||||||
NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end) {
|
NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end)
|
||||||
|
{
|
||||||
navSearchState state = initState(start, mesh->nodeCount);
|
navSearchState state = initState(start, mesh->nodeCount);
|
||||||
U32 unfinishedCount = 1;
|
U32 unfinishedCount = 1;
|
||||||
U32 unfinishedIndexes[NAV_MAX_NODES] = {start};
|
U32 unfinishedIndexes[NAV_MAX_NODES] = {start};
|
||||||
@@ -63,19 +73,26 @@ NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end) {
|
|||||||
U32 unfinishedOffset = 0;
|
U32 unfinishedOffset = 0;
|
||||||
U32 lowestNodeIndex = start;
|
U32 lowestNodeIndex = start;
|
||||||
bool found = false;
|
bool found = false;
|
||||||
while(!found) {
|
while (!found)
|
||||||
for(int connectionI = 0 ; connectionI < mesh->nodes[lowestNodeIndex].connectionCount; connectionI++) {
|
{
|
||||||
|
for (int connectionI = 0; connectionI < mesh->nodes[lowestNodeIndex].connectionCount; connectionI++)
|
||||||
|
{
|
||||||
NavConnection *connection = &mesh->nodes[lowestNodeIndex].connections[connectionI];
|
NavConnection *connection = &mesh->nodes[lowestNodeIndex].connections[connectionI];
|
||||||
navSearchNodeState *testNode = &state.nodeStates[connection->NodeIndex];
|
navSearchNodeState *testNode = &state.nodeStates[connection->NodeIndex];
|
||||||
if(testNode->visited) {continue;}
|
if (testNode->visited)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
U32 distance = cast(U32)(state.nodeStates[lowestNodeIndex].distance + connection->Cost);
|
U32 distance = cast(U32)(state.nodeStates[lowestNodeIndex].distance + connection->Cost);
|
||||||
distance += cast(U32)(mesh->nodes[end].pos.x - mesh->nodes[connection->NodeIndex].pos.x);
|
distance += cast(U32)(mesh->nodes[end].pos.x - mesh->nodes[connection->NodeIndex].pos.x);
|
||||||
distance += cast(U32)(mesh->nodes[end].pos.y - mesh->nodes[connection->NodeIndex].pos.y);
|
distance += cast(U32)(mesh->nodes[end].pos.y - mesh->nodes[connection->NodeIndex].pos.y);
|
||||||
if(testNode->distance > distance) {
|
if (testNode->distance > distance)
|
||||||
|
{
|
||||||
testNode->distance = distance;
|
testNode->distance = distance;
|
||||||
testNode->shortest = lowestNodeIndex;
|
testNode->shortest = lowestNodeIndex;
|
||||||
}
|
}
|
||||||
if(!testNode->addedToUnvisited) {
|
if (!testNode->addedToUnvisited)
|
||||||
|
{
|
||||||
unfinishedIndexes[unfinishedCount] = connection->NodeIndex;
|
unfinishedIndexes[unfinishedCount] = connection->NodeIndex;
|
||||||
unfinishedCount++;
|
unfinishedCount++;
|
||||||
testNode->addedToUnvisited = true;
|
testNode->addedToUnvisited = true;
|
||||||
@@ -83,13 +100,15 @@ NavPath Nav_Path(NavMesh *mesh, U32 start, U32 end) {
|
|||||||
}
|
}
|
||||||
state.nodeStates[lowestNodeIndex].visited = true;
|
state.nodeStates[lowestNodeIndex].visited = true;
|
||||||
lowestNodeIndex = getLowestState(unfinishedIndexes, unfinishedCount, state, &unfinishedOffset);
|
lowestNodeIndex = getLowestState(unfinishedIndexes, unfinishedCount, state, &unfinishedOffset);
|
||||||
if(lowestNodeIndex == end) {
|
if (lowestNodeIndex == end)
|
||||||
|
{
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NavPath res_path = {0};
|
NavPath res_path = {0};
|
||||||
U32 index = end;
|
U32 index = end;
|
||||||
while(index!=start) {
|
while (index != start)
|
||||||
|
{
|
||||||
res_path.indexes[res_path.nodeCount] = index;
|
res_path.indexes[res_path.nodeCount] = index;
|
||||||
res_path.nodeCount++;
|
res_path.nodeCount++;
|
||||||
index = state.nodeStates[index].shortest;
|
index = state.nodeStates[index].shortest;
|
||||||
|
|||||||
@@ -5,22 +5,33 @@
|
|||||||
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)
|
||||||
|
{
|
||||||
|
case SDLK_W:
|
||||||
|
{
|
||||||
player->pos.y += 10;
|
player->pos.y += 10;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SDLK_A: {
|
case SDLK_A:
|
||||||
|
{
|
||||||
player->pos.x -= 10;
|
player->pos.x -= 10;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SDLK_D: {
|
case SDLK_D:
|
||||||
|
{
|
||||||
player->pos.x += 10;
|
player->pos.x += 10;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SDLK_S: {
|
case SDLK_S:
|
||||||
|
{
|
||||||
player->pos.y -= 10;
|
player->pos.y -= 10;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (mouseBtn.clicks == 1)
|
||||||
|
{
|
||||||
|
// shooting
|
||||||
|
player->bulletsLoaded -= 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,16 +3,20 @@
|
|||||||
#include "../player.h"
|
#include "../player.h"
|
||||||
#include <SDL3/SDL_events.h>
|
#include <SDL3/SDL_events.h>
|
||||||
|
|
||||||
void UpdateWorld(F32 delta, World *world) {
|
void UpdateWorld(F32 delta, World *world)
|
||||||
|
{
|
||||||
UpdateNPCs(delta, world);
|
UpdateNPCs(delta, world);
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateNPCs(F32 delta, World *world) {
|
void UpdateNPCs(F32 delta, World *world)
|
||||||
for(U32 i = 0; i < world->npcCount; i++) {
|
{
|
||||||
|
for (U32 i = 0; i < world->npcCount; i++)
|
||||||
|
{
|
||||||
updateNPC(delta, &world->npcs[i], world);
|
updateNPC(delta, &world->npcs[i], world);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProcessEvents(SDL_Event *event, World *world) {
|
void ProcessEvents(SDL_Event *event, World *world)
|
||||||
|
{
|
||||||
PlayerUpdate(event, &world->player);
|
PlayerUpdate(event, &world->player);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user