raycast start
This commit is contained in:
13
code/first.c
13
code/first.c
@@ -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))
|
||||||
{
|
{
|
||||||
@@ -112,7 +113,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
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);
|
||||||
@@ -120,7 +121,7 @@ int main(int argc, char **argv) {
|
|||||||
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;
|
||||||
@@ -141,7 +142,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
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;
|
||||||
|
|||||||
@@ -3,14 +3,13 @@
|
|||||||
#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);
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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