removed pointless pointers in rectange, reset background clear color, fixed entity, and added some state functions
This commit is contained in:
parent
dd1f3ca3e0
commit
bd7e3212da
12 changed files with 161 additions and 86 deletions
|
|
@ -14,16 +14,21 @@
|
|||
//TODO: remove this
|
||||
//#include <SDL.h>
|
||||
|
||||
void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanFn, ARC_Point windowSize){
|
||||
void ARC_EngineData_HandlerDestroyStateFn(void *data){
|
||||
ARC_State_Destroy((ARC_State *)data);
|
||||
}
|
||||
|
||||
void ARC_EngineData_Create(ARC_EngineData **data, 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;
|
||||
(*data)->window = NULL;
|
||||
(*data)->renderer = NULL;
|
||||
(*data)->input = NULL;
|
||||
(*data)->keyboard = NULL;
|
||||
(*data)->mouse = NULL;
|
||||
(*data)->entitySystem = NULL;
|
||||
|
||||
//TODO: set the destroy callback
|
||||
ARC_Handler_Create(&((*data)->state), NULL, cleanFn);
|
||||
ARC_Handler_Create(&((*data)->state), NULL, ARC_EngineData_HandlerDestroyStateFn);
|
||||
|
||||
(*data)->dt = 0.0;
|
||||
(*data)->running = ARC_False;
|
||||
|
|
@ -46,9 +51,12 @@ void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanF
|
|||
|
||||
(*data)->keyboard = ARC_Input_GetKeyboard((*data)->input);
|
||||
(*data)->mouse = ARC_Input_GetMouse((*data)->input);
|
||||
|
||||
ARC_EntitySystem_Create(&((*data)->entitySystem));
|
||||
}
|
||||
|
||||
void ARC_EngineData_Destroy(ARC_EngineData *data){
|
||||
ARC_EntitySystem_Destroy(data->entitySystem);
|
||||
ARC_Mouse_Destroy(data->mouse);
|
||||
ARC_Keyboard_Destroy(data->keyboard);
|
||||
ARC_Renderer_Destroy(data->renderer);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,29 @@
|
|||
#include "arc/engine/state.h"
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
void ARC_State_Create(ARC_State **state, ARC_State_UpdateFn updateFn, ARC_State_RenderFn renderFn, void *data, ARC_State_DestroyDataFn *destroyDataFn){
|
||||
*state = (ARC_State *)malloc(sizeof(ARC_State));
|
||||
|
||||
(*state)->updateFn = updateFn;
|
||||
(*state)->renderFn = renderFn;
|
||||
|
||||
(*state)->data = data;
|
||||
|
||||
(*state)->destroyDataFn = NULL;
|
||||
if(destroyDataFn != NULL){
|
||||
(*state)->destroyDataFn = (ARC_State_DestroyDataFn *)malloc(sizeof(ARC_State_DestroyDataFn));
|
||||
*((*state)->destroyDataFn) = *destroyDataFn;
|
||||
}
|
||||
}
|
||||
|
||||
void ARC_State_Destroy(ARC_State *state){
|
||||
if(state->destroyDataFn != NULL){
|
||||
(*(state->destroyDataFn))(state->data);
|
||||
}
|
||||
|
||||
free(state);
|
||||
}
|
||||
|
||||
void ARC_State_Update(void *data){
|
||||
((ARC_State *)data)->updateFn(((ARC_State *)data)->data);
|
||||
|
|
@ -7,4 +31,4 @@ void ARC_State_Update(void *data){
|
|||
|
||||
void ARC_State_Render(void *data){
|
||||
((ARC_State *)data)->renderFn(((ARC_State *)data)->data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue