herbglitch/archeus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

text stuff, I forgot

Browse source
This commit is contained in:
herbglitch 2023-06-20 00:27:54 -06:00
parent 7018500555
commit 8a29955b1f
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/arc/graphics/text.h
View file

@ -11,8 +11,6 @@ extern "C" {
#include "arc/math/point.h" #include "arc/math/point.h"
#include "arc/std/string.h" #include "arc/std/string.h"
void ARC_TTF_Init();
typedef struct ARC_Text ARC_Text; typedef struct ARC_Text ARC_Text;
void ARC_Text_Create(ARC_Text **text, ARC_String *path, int32_t size, ARC_Color color); void ARC_Text_Create(ARC_Text **text, ARC_String *path, int32_t size, ARC_Color color);

5
src/engine/engine.c
View file

@ -16,6 +16,7 @@
#include "arc/input/sdl/keyboard.h" #include "arc/input/sdl/keyboard.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_video.h> #include <SDL_video.h>
#include <SDL2/SDL_ttf.h>
#elif ARC_OPENGL #elif ARC_OPENGL
#include "arc/graphics/opengl/window.h" #include "arc/graphics/opengl/window.h"
#include "arc/graphics/opengl/renderer.h" #include "arc/graphics/opengl/renderer.h"
@ -39,6 +40,10 @@ void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanf
ARC_KeyboardInfo keyboardInfo; ARC_KeyboardInfo keyboardInfo;
(*data)->windowSize = windowSize; (*data)->windowSize = windowSize;
//TEMP
#ifdef ARC_SDL
TTF_Init();
#endif
#ifdef ARC_SDL #ifdef ARC_SDL
windowInfo = (ARC_WindowInfo){ "title", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, (*data)->windowSize.x, (*data)->windowSize.y, 0 }; windowInfo = (ARC_WindowInfo){ "title", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, (*data)->windowSize.x, (*data)->windowSize.y, 0 };

10
src/graphics/sdl/text.c
View file

@ -7,10 +7,6 @@
#include <SDL2/SDL_ttf.h> #include <SDL2/SDL_ttf.h>
void ARC_TTF_Init(){
TTF_Init();
}
void ARC_Text_Create(ARC_Text **text, ARC_String *path, int32_t size, ARC_Color color){ void ARC_Text_Create(ARC_Text **text, ARC_String *path, int32_t size, ARC_Color color){
*text = (ARC_Text *)malloc(sizeof(ARC_Text)); *text = (ARC_Text *)malloc(sizeof(ARC_Text));
ARC_String_Copy(&(*text)->name, path); ARC_String_Copy(&(*text)->name, path);
@ -31,9 +27,11 @@ void ARC_Text_Destroy(ARC_Text *font){
void ARC_Text_SetString(ARC_Text *text, ARC_Renderer *renderer, ARC_String *string){ void ARC_Text_SetString(ARC_Text *text, ARC_Renderer *renderer, ARC_String *string){
TTF_Font *ttfont = TTF_OpenFont(text->name->data, text->size); TTF_Font *ttfont = TTF_OpenFont(text->name->data, text->size);
SDL_Color textColor = (SDL_Color){ text->color.r, text->color.g, text->color.b, text->color.a }; SDL_Color textColor = (SDL_Color){ text->color.r, text->color.g, text->color.b, text->color.a };
SDL_Surface *surface = TTF_RenderText_Blended(ttfont, string->data, textColor); SDL_Surface *surface = TTF_RenderText_Blended_Wrapped(ttfont, string->data, textColor, 0);
text->bounds.w = surface->w;
text->bounds.h = surface->h;
TTF_SizeText(ttfont, string->data, &(text->bounds.w), &(text->bounds.h));
text->texture = SDL_CreateTextureFromSurface((SDL_Renderer *)renderer, surface); text->texture = SDL_CreateTextureFromSurface((SDL_Renderer *)renderer, surface);
SDL_FreeSurface(surface); SDL_FreeSurface(surface);