f***ed up and needed to rework packages

This commit is contained in:
herbglitch 2024-05-20 03:46:04 -06:00
parent f4592ae8d0
commit b43ab1702f
73 changed files with 194 additions and 2045 deletions

View file

@ -1,94 +1,50 @@
#include "arc/engine/engine.h"
//NOTE: some of this file is temporary, mostly to get smthn running so I can test out different ideas
#include <stdlib.h>
#include "arc/engine/state.h"
#include "arc/graphics/window.h"
#include "arc/graphics/renderer.h"
#include "arc/input/mouse.h"
#include "arc/input/keyboard.h"
#include "arc/std/bool.h"
#include "arc/std/errno.h"
#include "arc/std/handler.h"
//NOTE: some of this file is temporary, mostly to get smthn running so I can test out different ideas
#include "arc/graphics/none/window.h"
#include "arc/graphics/none/renderer.h"
#include "arc/input/none/mouse.h"
#include "arc/input/none/keyboard.h"
#include "arc/graphics/sdl/window.h"
#include "arc/graphics/sdl/renderer.h"
#include "arc/input/sdl/mouse.h"
#include "arc/input/sdl/keyboard.h"
#include "arc/graphics/glfw/window.h"
#include "arc/graphics/glfw/renderer.h"
#include "arc/input/glfw/mouse.h"
#include "arc/input/glfw/keyboard.h"
void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanfn, ARC_Point windowSize){
void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanFn, ARC_Point windowSize){
*data = (ARC_EngineData *)malloc(sizeof(ARC_EngineData));
(*data)->window = NULL;
(*data)->renderer = NULL;
(*data)->input = NULL;
(*data)->keyboard = NULL;
(*data)->mouse = NULL;
ARC_Handler_Create(&((*data)->state), cleanfn);
ARC_Handler_Create(&((*data)->state), cleanFn);
ARC_WindowInfo windowInfo;
ARC_RenderInfo renderInfo;
ARC_MouseInfo mouseInfo;
ARC_KeyboardInfo keyboardInfo;
(*data)->dt = 0.0;
(*data)->running = ARC_False;
(*data)->windowSize = windowSize;
//TEMP
#ifdef ARC_SDL
// TTF_Init();
// Mix_Init(0);
// Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024);
#endif
#ifdef ARC_SDL2_WINDOW
windowInfo = (ARC_WindowInfo){ "title", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, (*data)->windowSize.x, (*data)->windowSize.y, 0 };
#elif ARC_GLFW_WINDOW
windowInfo = (ARC_WindowInfo){ "title", (*data)->windowSize.x, (*data)->windowSize.y };
#endif // ARC_SDL
ARC_WindowInfo windowInfo = (ARC_WindowInfo){ "title", (*data)->windowSize.x, (*data)->windowSize.y };
ARC_Window_Create(&((*data)->window), &windowInfo);
if(arc_errno){
free(data);
return;
}
#ifdef ARC_SDL2_WINDOW
renderInfo = (ARC_RenderInfo){ (SDL_Window *)(*data)->window, -1, SDL_RENDERER_ACCELERATED };
#elif ARC_GLFW_WINDOW
renderInfo = (ARC_RenderInfo){ (GLFWwindow *)(*data)->window };
#endif // ARC_SDL
ARC_Renderer_Create(&((*data)->renderer), &renderInfo);
ARC_Renderer_CreateWithEngineData(&((*data)->renderer), *data);
if(arc_errno){
ARC_Window_Destroy((*data)->window);
free(data);
}
#ifdef ARC_SDL2_INPUT
SDL_Event *event = (SDL_Event *)malloc(sizeof(SDL_Event));
mouseInfo = (ARC_MouseInfo ){ event };
keyboardInfo = (ARC_KeyboardInfo){ event };
#elif ARC_GLFW
mouseInfo = (ARC_MouseInfo ){ (GLFWwindow *)(*data)->window };
keyboardInfo = (ARC_KeyboardInfo){ (GLFWwindow *)(*data)->window };
#endif // ARC_SDL
ARC_Input_CreateWithEngineData(&((*data)->input), *data);
ARC_Mouse_Create (&((*data)->mouse) , &mouseInfo );
ARC_Keyboard_Create(&((*data)->keyboard), &keyboardInfo);
(*data)->keyboard = ARC_Input_GetKeyboard((*data)->input);
(*data)->mouse = ARC_Input_GetMouse((*data)->input);
}
void ARC_EngineData_Destroy(ARC_EngineData *data){
#ifdef ARC_SDL2_INPUT
free(data->mouse->event);
// TTF_Quit();
// Mix_Quit();
#endif // ARC_SDL
ARC_Mouse_Destroy(data->mouse);
ARC_Keyboard_Destroy(data->keyboard);
ARC_Renderer_Destroy(data->renderer);
@ -96,35 +52,20 @@ void ARC_EngineData_Destroy(ARC_EngineData *data){
ARC_Handler_Destroy(data->state);
}
void ARC_Engine_Run(ARC_EngineData *data){
void ARC_Engine_RunUncapped(ARC_EngineData *data){
if(arc_errno){
return;
}
#ifdef ARC_SDL2_INPUT
SDL_Event *event = data->mouse->event;
double lastTime = 0, currentTime;
data->dt = 0;
#endif // ARC_SDL
// double lastTime = 0, currentTime;
data->running = 0;
data->running = ARC_True;
while(data->running){
// currentTime = SDL_GetTicks();
// data->dt = currentTime - lastTime;
// lastTime = currentTime;
while(!data->running){
#ifdef ARC_SDL2_INPUT
currentTime = SDL_GetTicks();
data->dt = currentTime - lastTime;
lastTime = currentTime;
SDL_PollEvent(data->mouse->event);
if(event->type == SDL_QUIT){ data->running = 1; }
#elif ARC_GLFW_WINDOW
glfwPollEvents();
data->running = glfwWindowShouldClose((GLFWwindow *)data->window);
#endif // ARC_SDL
ARC_Mouse_Update(data->mouse);
ARC_Keyboard_Update(data->keyboard);
ARC_Input_Update(data->input);
ARC_Handler_Clean(data->state);