RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2026-01-30 19:42:51 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(gx): update supported text tags in GxuDetermineQuotedCode

Browse Source
This commit is contained in:
VDm 2025-04-08 00:14:04 +04:00
parent 98111f2920
commit 665b8862fd
2 changed files with 101 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common

@ -1 +1 @@
Subproject commit a654f25957979c381760916f6382b526ef024491 Subproject commit 0401d901376995c7a209125b8cb12f1ceaa46fb7

107
src/gx/Font.cpp
View File

@ -10,11 +10,13 @@
#include "gx/Shader.hpp" #include "gx/Shader.hpp"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <cstdlib>
#include <bc/Memory.hpp> #include <bc/Memory.hpp>
#include <storm/Error.hpp> #include <storm/Error.hpp>
#include <storm/String.hpp> #include <storm/String.hpp>
#include <storm/Unicode.hpp> #include <storm/Unicode.hpp>
#include <tempest/Math.hpp> #include <tempest/Math.hpp>
#include <common/Unicode.hpp>
CGxShader* g_fontPixelShader[1]; CGxShader* g_fontPixelShader[1];
CGxShader* g_fontVertexShader[2]; CGxShader* g_fontVertexShader[2];
@ -177,7 +179,18 @@ uint32_t GetScreenPixelWidth() {
} }
QUOTEDCODE GxuDetermineQuotedCode(const char* text, int32_t& advance, CImVector* color, uint32_t flags, uint32_t& wide) { QUOTEDCODE GxuDetermineQuotedCode(const char* text, int32_t& advance, CImVector* color, uint32_t flags, uint32_t& wide) {
wide = SUniSGetUTF8(reinterpret_cast<const uint8_t*>(text), &advance); STORM_ASSERT(text);
STORM_ASSERT(*text);
bool ignoreColorCodes = flags & 0x100;
bool ignoreNewlines = flags & 0x200;
bool ignoreHyperlinks = flags & 0x400;
bool ignorePipes = flags & 0x800;
bool ignoreTextures = flags & 0x1000;
auto utext = reinterpret_cast<const uint8_t*>(text);
wide = sgetu8(utext, &advance);
switch (wide) { switch (wide) {
case 0x0: case 0x0:
@ -185,7 +198,7 @@ QUOTEDCODE GxuDetermineQuotedCode(const char* text, int32_t& advance, CImVector*
return CODE_INVALIDCODE; return CODE_INVALIDCODE;
case '\r': case '\r':
advance = 2 - (SUniSGetUTF8(reinterpret_cast<const uint8_t*>(text + 1), &advance) != '\n'); advance = 2 - (sgetu8(utext + 1, &advance) != '\n');
return CODE_NEWLINE; return CODE_NEWLINE;
case '\n': case '\n':
@ -193,7 +206,7 @@ QUOTEDCODE GxuDetermineQuotedCode(const char* text, int32_t& advance, CImVector*
return CODE_NEWLINE; return CODE_NEWLINE;
} }
if (wide != '|' || flags & 0x800) { if (wide != '|' || ignorePipes) {
return CODE_INVALIDCODE; return CODE_INVALIDCODE;
} }
@ -203,18 +216,98 @@ QUOTEDCODE GxuDetermineQuotedCode(const char* text, int32_t& advance, CImVector*
return CODE_INVALIDCODE; return CODE_INVALIDCODE;
} }
int32_t firstCharAdvance = advance;
switch (quotedCode) { switch (quotedCode) {
case 'N': case 'C':
case 'n': { case 'c': {
if (flags & 0x200) { if (ignoreColorCodes) {
return CODE_INVALIDCODE;
}
size_t offset = advance + 1;
uint8_t comps[4];
for (size_t j = 0; j < 4; ++j) {
if (!text[offset] || !text[offset + 1]) {
return CODE_INVALIDCODE; return CODE_INVALIDCODE;
} }
char hex[3] = { text[offset], text[offset + 1], '\0' };
offset += 2;
char* error = nullptr;
comps[j] = static_cast<uint8_t>(strtol(hex, &error, 16));
if (error && *error) {
return CODE_INVALIDCODE;
}
}
if (color) {
color->value = CImVector::MakeARGB(255, comps[1], comps[2], comps[3]);
}
advance = 10;
return CODE_COLORON;
}
case 'H': {
if (ignoreHyperlinks) {
return CODE_INVALIDCODE;
}
// TODO
break;
}
case 'N':
case 'n': {
if (ignoreNewlines) {
return CODE_INVALIDCODE;
}
advance = 2; advance = 2;
return CODE_NEWLINE; return CODE_NEWLINE;
} }
// TODO handle other control codes case 'R':
case 'r': {
if (ignoreColorCodes) {
return CODE_INVALIDCODE;
}
advance = 2;
return CODE_COLORRESTORE;
}
case 'T': {
if (ignoreTextures) {
return CODE_INVALIDCODE;
}
// TODO
break;
}
case 'h': {
if (ignoreHyperlinks) {
return CODE_INVALIDCODE;
}
advance = 2;
return CODE_HYPERLINKSTOP;
}
case 't': {
if (ignoreTextures) {
return CODE_INVALIDCODE;
}
advance = 2;
return CODE_TEXTURESTOP;
}
case '|': {
advance = 2;
return CODE_PIPE;
}
default: {
return CODE_INVALIDCODE;
}
} }
// TODO remainder of function // TODO remainder of function