config working, commented out the line throwing error for closing window. will fix soon

include/arc/engine/engine.h

@@ -13,6 +13,8 @@ typedef struct ARC_EngineData {
     ARC_Window   *window;
     ARC_Renderer *renderer;
     ARC_Handler  *state;
+
+    double dt;
 } ARC_EngineData;
 
 //NOTE: most work below is temp, and will change once I figure out a better way to write this header

include/arc/graphics/config.h

@@ -4,9 +4,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+    
+#include "arc/std/config.h"
+#include "arc/graphics/renderer.h"
 
-// ARC_Config_Create();
+void ARC_GraphicsConfig_Init(ARC_Config *config, ARC_Renderer *renderer);
-// ARC_Config_Destroy();
 
 #ifdef __cplusplus
 }

src/engine/engine.c

@@ -29,7 +29,7 @@ void ARC_EngineData_Create(ARC_EngineData **data){
         return;
     }
 
-    windowInfo = (ARC_WindowInfo){ "title", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1280, 720, 0 };
+    windowInfo = (ARC_WindowInfo){ "title", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 2560, 1440, 0 };
 #endif // ARC_SDL
 
     ARC_Window_Create(&((*data)->window), &windowInfo);
@@ -59,11 +59,11 @@ void ARC_Engine_Run(ARC_EngineData *data){
 #endif // ARC_SDL
 
     while(1){
-        // currentTime = SDL_GetTicks();
-        // data->dt = currentTime - lastTime;
-        // lastTime = currentTime;
-
 #ifdef ARC_SDL
+        currentTime = SDL_GetTicks();
+        data->dt = currentTime - lastTime;
+        lastTime = currentTime;
+
         while(SDL_PollEvent(&event)){
             if(event.type == SDL_QUIT){ return; }
             if(event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_ESCAPE){ return; }

src/graphics/sdl/temp.c

@@ -1,266 +0,0 @@
-#include "types.h"
-#include <SDL_image.h>
-#include <stdio.h>
-#include <arc_string.h>
-#include <arc_errno.h>
-
-#define ARC_DEFAULT_CONFIG
-#include <defaults/arc_default_config.h>
-
-SDL_Renderer *global_renderer;
-
-int32_t ARC_SDL_Rect_Read   (ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value);
-int32_t ARC_SDL_Texture_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value);
-int32_t ARC_Spritesheet_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value);
-int32_t ARC_Sprite_Read     (ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value);
-
-int32_t ARC_SDL_Rect_Delete   (ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value);
-int32_t ARC_SDL_Texture_Delete(ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value);
-int32_t ARC_Spritesheet_Delete(ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value);
-int32_t ARC_Sprite_Delete     (ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value);
-
-int32_t ARC_Types_Init(ARC_Config *config, SDL_Renderer *renderer){
-    global_renderer = renderer;
-    ARC_ConfigKey_Add(config, (char *)"SDL_Rect"       , (ARC_ConfigKeyRead) ARC_SDL_Rect_Read   , (ARC_ConfigKeyDelete) ARC_SDL_Rect_Delete   );
-    ARC_ConfigKey_Add(config, (char *)"SDL_Texture"    , (ARC_ConfigKeyRead) ARC_SDL_Texture_Read, (ARC_ConfigKeyDelete) ARC_SDL_Texture_Delete);
-    ARC_ConfigKey_Add(config, (char *)"ARC_Spritesheet", (ARC_ConfigKeyRead) ARC_Spritesheet_Read, (ARC_ConfigKeyDelete) ARC_Spritesheet_Delete);
-    ARC_ConfigKey_Add(config, (char *)"ARC_Sprite"     , (ARC_ConfigKeyRead) ARC_Sprite_Read     , (ARC_ConfigKeyDelete) ARC_Sprite_Delete     );
-    return 0;
-}
-
-int32_t ARC_SDL_Texture_Load(const char *path, SDL_Texture **texture){
-    IMG_Init(IMG_INIT_PNG);
-    SDL_Surface *surface = IMG_Load(path);
-    if(!surface){
-        printf("Error: reading png '%s'\nSDL_Image Error: %s", path, IMG_GetError());
-        return 1; // GE_SDL_ERRNO_
-    }
-
-    *texture = SDL_CreateTextureFromSurface(global_renderer, surface);
-
-    SDL_FreeSurface(surface);
-    IMG_Quit();
-
-    return 0;
-}
-
-int32_t ARC_SDL_Rect_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value){
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    if(data[subdata->index] != '{' || data[subdata->index + subdata->length - 1] != '}'){ return ARC_ERRNO_DATA; }
-    subdata->index++;
-    subdata->length -= 2;
-
-    uint64_t split;
-    *value = malloc(sizeof(SDL_Rect));
-
-    //x
-    int32_t err = ARC_String_Find(((char *)data) + subdata->index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-    ARC_StringSubstr temp = { subdata->index, split };
-    ((SDL_Rect *) *value)->x = (int)ARC_String_ToUint64_t(data, &temp);
-
-    //y
-    temp.index = subdata->index + split + 1;
-    err = ARC_String_Find(((char *)data) + temp.index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-    temp.length = split;
-    ((SDL_Rect *) *value)->y = (int)ARC_String_ToUint64_t(data, &temp);
-
-    //w
-    temp.index = temp.index + split + 1;
-    err = ARC_String_Find(((char *)data) + temp.index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-    temp.length = split;
-    ((SDL_Rect *) *value)->w = (int)ARC_String_ToUint64_t(data, &temp);
-
-    //hhttps://w2g.tv/8r0knvefgpciytccsw
-    temp = (ARC_StringSubstr){ temp.index + split + 1, subdata->length - split - 1 };
-    ((SDL_Rect *) *value)->h = (int)ARC_String_ToUint64_t(data, &temp);
-
-    SDL_Rect *ntemp = ((SDL_Rect *) *value);
-    return 0;
-}
-
-int32_t ARC_SDL_Texture_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value){
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    ARC_StringSubstr_StripEnds((char *)data, (char *)"\"", subdata);
-
-    char path[subdata->length + 1];
-    strncpy(path, data + subdata->index, subdata->length);
-    path[subdata->length] = 0;
-
-    return ARC_SDL_Texture_Load(path, (SDL_Texture **)value);
-}
-
-int32_t ARC_Spritesheet_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value){
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    if(data[subdata->index] != '{'){
-        SDL_Texture *texture = (SDL_Texture *)ARC_Config_GetReference(config, (char *)data, subdata);
-        if(!texture && data[subdata->index] != '"'){ return ARC_ERRNO_DATA; }
-
-        if(!texture){
-            int32_t err = ARC_SDL_Texture_Read(config, data, subdata, (void **)&texture);
-            if(err){ return ARC_ERRNO_DATA; }
-        }
-
-        *value = malloc(sizeof(ARC_Spritesheet));
-        ((ARC_Spritesheet *) *value)->texture = texture;
-        ((ARC_Spritesheet *) *value)->size = NULL;
-        return 0;
-    }
-
-    if(data[subdata->index + subdata->length - 1] != '}'){ return ARC_ERRNO_DATA; }
-    subdata->index++;
-    subdata->length -= 2; //remove the starting { and ending }
-
-    //Texture
-    uint64_t split;
-    int32_t err = ARC_String_Find(((char *)data) + subdata->index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-
-    ARC_StringSubstr temp = { subdata->index, split };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    SDL_Texture *texture = (SDL_Texture *)ARC_Config_GetReference(config, (char *)data, &temp);
-    if(!texture && data[temp.index] != '"'){ return ARC_ERRNO_DATA; }
-
-    if(!texture){
-        err = ARC_SDL_Texture_Read(config, data, &temp, (void **)&texture);
-        if(err){ return ARC_ERRNO_DATA; }
-    }
-
-    //uint32_t size
-    temp = (ARC_StringSubstr){ subdata->index + split + 1, subdata->length - split - 1 };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    uint32_t *size = (uint32_t *)ARC_Config_GetReference(config, (char *)data, &temp);
-    if(!size){
-        ARC_ConfigKey_Read_Uint64_t(config, data, &temp, (void **)&size);
-        if(err){ return ARC_ERRNO_DATA; }
-    }
-
-    *value = malloc(sizeof(ARC_Spritesheet));
-    ((ARC_Spritesheet *) *value)->texture = texture;
-    ((ARC_Spritesheet *) *value)->size = size;
-
-    return 0;
-}
-
-int32_t ARC_Sprite_Read(ARC_Config* config, const char *data, ARC_StringSubstr *subdata, void **value){
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    if(data[subdata->index] != '{' || data[subdata->index + subdata->length - 1] != '}'){ return ARC_ERRNO_DATA; }
-    subdata->index++;
-    subdata->length -= 2; //remove the starting { and ending }
-
-    uint64_t split;
-    int32_t err = ARC_String_Find(((char *)data) + subdata->index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-
-    //spritesheet
-    ARC_StringSubstr temp = { subdata->index, split };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    ARC_Spritesheet *spritesheet = (ARC_Spritesheet *)ARC_Config_GetReference(config, (char *)data, &temp);
-
-    if(!spritesheet){
-        err = ARC_Spritesheet_Read(config, data, &temp, (void **)&spritesheet);
-        if(err){ return ARC_ERRNO_DATA; }
-    }
-
-    //bounds
-    temp = (ARC_StringSubstr){ subdata->index + split + 1, subdata->length - split - 1 };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    SDL_Rect *bounds = (SDL_Rect *)ARC_Config_GetReference(config, (char *)data, &temp);
-
-    if(!bounds){
-        ARC_ConfigKey_Read_Uint64_t(config, data, &temp, (void **)&bounds);
-        if(err){ return ARC_ERRNO_DATA; }
-    }
-
-    *value = malloc(sizeof(ARC_Sprite));
-    ((ARC_Sprite *) *value)->spritesheet = spritesheet;
-    ((ARC_Sprite *) *value)->bounds = bounds;
-
-    return 0;
-}
-
-int32_t ARC_SDL_Rect_Delete (ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value){
-    if((SDL_Rect *)value){ free((SDL_Rect *)value); }
-    return 0;
-}
-
-int32_t ARC_SDL_Texture_Delete(ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value){
-    //if((SDL_Texture *) value){ SDL_DestroyTexture((SDL_Texture *) value); }
-    return 0;
-}
-
-int32_t ARC_Spritesheet_Delete(ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value){
-    ARC_Spritesheet *spritesheet = (ARC_Spritesheet *) value;
-    if(!data){ //there is no data, kill everything, most likely was called by a data type being destroyed
-        free(spritesheet);
-        return 0;
-    }
-
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    if(data[subdata->index] != '{'){
-        SDL_Texture *texture = (SDL_Texture *)ARC_Config_GetReference(config, (char *)data, subdata);
-        if(!texture){ ARC_SDL_Texture_Delete(config, data, subdata, (void *)spritesheet->texture); }
-
-        free(spritesheet);
-        return 0;
-    }
-
-    uint64_t split;
-    int32_t err = ARC_String_Find(((char *)data) + subdata->index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-
-    ARC_StringSubstr temp = { subdata->index, split };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    SDL_Texture *texture = (SDL_Texture *)ARC_Config_GetReference(config, (char *)data, &temp);
-    if(!texture){ ARC_SDL_Texture_Delete(config, data, &temp, (void *)spritesheet->texture); }
-
-    temp = (ARC_StringSubstr){ subdata->index + split + 1, subdata->length - split - 1 };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    uint32_t *size = (uint32_t *)ARC_Config_GetReference(config, (char *)data, &temp);
-    if(!size){ ARC_ConfigKey_Delete_Uint64_t(config, data, &temp, (void *)spritesheet->size); }
-
-    free(spritesheet);
-    return 0;
-}
-
-int32_t ARC_Sprite_Delete(ARC_Config* config, const char* data, ARC_StringSubstr *subdata, void *value){
-    ARC_Sprite *sprite = (ARC_Sprite *) value;
-    if(!data){
-        free(sprite); 
-        return 0;
-    }
-
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, subdata);
-    if(data[subdata->index] != '{' || data[subdata->index + subdata->length - 1] != '}'){ return ARC_ERRNO_DATA; }
-    subdata->index++;
-    subdata->length -= 2; //remove the starting { and ending }
-
-    uint64_t split;
-    int32_t err = ARC_String_Find(((char *)data) + subdata->index, (char *)",", &split);
-    if(err){ return err; }
-    if(split == ~((uint64_t)0) || split > subdata->length){ return ARC_ERRNO_DATA; }
-
-    //spritesheet
-    ARC_StringSubstr temp = { subdata->index, split };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    ARC_Spritesheet *spritesheet = (ARC_Spritesheet *)ARC_Config_GetReference(config, (char *)data, &temp);
-    if(!spritesheet){ ARC_Spritesheet_Delete(config, data, &temp, (void *)sprite->spritesheet); }
-
-    //bounds
-    temp = (ARC_StringSubstr){ subdata->index + split + 1, subdata->length - split - 1 };
-    ARC_StringSubstr_StripWhitespaceEnds((char *)data, &temp);
-    SDL_Rect *bounds = (SDL_Rect *)ARC_Config_GetReference(config, (char *)data, &temp);
-
-    if(!bounds){ ARC_SDL_Rect_Delete(config, data, &temp, (void *)sprite->bounds); }
-
-    free(sprite);
-    return 0;
-}

src/std/handler.c

@@ -32,7 +32,7 @@ void ARC_Handler_Add(ARC_Handler *handler, void *data){
 int8_t ARC_Handler_RemoveCompareFn(void *a, void *b){ return a == b; }
 
 void ARC_Handler_Remove(ARC_Handler *handler, void *data){
-    ARC_Vector_Add(handler->trash, data);
+    // ARC_Vector_Add(handler->trash, data);
     ARC_Vector_Remove(handler->data, data, ARC_Handler_RemoveCompareFn);
 }