YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need for asset batching on text.c

Browse Source
This commit is contained in:
Dominic Masters
2026-06-01 22:36:02 -05:00
parent 1e8311fc04
commit 88903fee94
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/display/text/text.c
+13 -17
View File
@@ -10,37 +10,33 @@
#include "util/memory.h" #include "util/memory.h"
#include "display/spritebatch/spritebatch.h" #include "display/spritebatch/spritebatch.h"
#include "asset/asset.h" #include "asset/asset.h"
#include "asset/assetbatch.h"
#include "asset/loader/display/assettextureloader.h" #include "asset/loader/display/assettextureloader.h"
#include "asset/loader/display/assettilesetloader.h" #include "asset/loader/display/assettilesetloader.h"
#include "display/shader/shaderunlit.h" #include "display/shader/shaderunlit.h"
font_t FONT_DEFAULT; font_t FONT_DEFAULT;
assetbatch_t TEXT_BATCH;
errorret_t textInit(void) { errorret_t textInit(void) {
assetBatchInit(&TEXT_BATCH, 2, (assetbatchdesc_t[]){ assetloaderinput_t input = { .texture = TEXTURE_FORMAT_RGBA };
{ assetentry_t *entryTexture = assetLock(
.path = "ui/minogram.png", "ui/minogram.png", ASSET_LOADER_TYPE_TEXTURE, &input
.type = ASSET_LOADER_TYPE_TEXTURE, );
.input = { .texture = TEXTURE_FORMAT_RGBA } assetentry_t *entryTileset = assetLock(
}, "ui/minogram.dtf", ASSET_LOADER_TYPE_TILESET, NULL
{ );
.path = "ui/minogram.dtf", errorChain(assetRequireLoaded(entryTexture));
.type = ASSET_LOADER_TYPE_TILESET errorChain(assetRequireLoaded(entryTileset));
},
});
errorChain(assetBatchRequireLoaded(&TEXT_BATCH));
FONT_DEFAULT.texture = &TEXT_BATCH.entries[0]->data.texture; FONT_DEFAULT.texture = &entryTexture->data.texture;
FONT_DEFAULT.tileset = &TEXT_BATCH.entries[1]->data.tileset; FONT_DEFAULT.tileset = &entryTileset->data.tileset;
errorOk(); errorOk();
} }
errorret_t textDispose(void) { errorret_t textDispose(void) {
FONT_DEFAULT.texture = NULL; FONT_DEFAULT.texture = NULL;
FONT_DEFAULT.tileset = NULL; FONT_DEFAULT.tileset = NULL;
assetBatchDispose(&TEXT_BATCH); assetUnlock("ui/minogram.png");
assetUnlock("ui/minogram.dtf");
errorOk(); errorOk();
} }