mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-12-16 11:08:05 +00:00
Code Issues Releases Wiki Activity

fixed glyph replacement

Browse Source
This commit is contained in:
Zeno Rogue
2025-12-12 12:24:10 +01:00
parent 7a7cce78d9
commit 9e344a5766
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
basegraph.cpp
View File

@@ -664,6 +664,23 @@ EX void init_glfont(int size) {
GLERR("initfont"); GLERR("initfont");
} }
vector<int> get_tabids(glfont_t& f, const char* s) {
vector<int> res;
for(int i=0; s[i];) {
int tabid = getnext(s,i);
if(f.reps[tabid]) {
for(auto sub: get_tabids(f, f.reps[tabid])) res.push_back(sub);
continue;
}
res.push_back(tabid);
}
return res;
}
int gl_width(int size, const char *s) { int gl_width(int size, const char *s) {
int gsiz = size; int gsiz = size;
if(size > vid.fsize || size > max_glfont_size) gsiz = max_glfont_size; if(size > vid.fsize || size > max_glfont_size) gsiz = max_glfont_size;
@@ -678,10 +695,7 @@ int gl_width(int size, const char *s) {
glfont_t& f(*cfont->glfont[gsiz]); glfont_t& f(*cfont->glfont[gsiz]);
int x = 0; int x = 0;
for(int i=0; s[i];) { for(int tabid: get_tabids(f, s)) x += f.chars[tabid].w * size/gsiz;
int tabid = getnext(s,i);
x += f.chars[tabid].w * size/gsiz;
}
return x; return x;
} }
@@ -697,7 +711,7 @@ glhr::textured_vertex charvertex(int x1, int y1, ld tx, ld ty) {
return res; return res;
} }
bool gl_print(int x, int y, int shift, int size, string s, color_t color, int align) { bool gl_print(int x, int y, int shift, int size, const char *s, color_t color, int align) {
int gsiz = size; int gsiz = size;
if(size > vid.fsize || size > max_glfont_size) gsiz = max_glfont_size; if(size > vid.fsize || size > max_glfont_size) gsiz = max_glfont_size;
@@ -712,13 +726,9 @@ bool gl_print(int x, int y, int shift, int size, string s, color_t color, int al
int tsize = 0; int tsize = 0;
const char *replacement = ""; int replacement_i = 0; auto tabids = get_tabids(f, s);
for(int i=0; s[i];) {
int tabid = replacement[replacement_i] ? getnext(replacement, replacement_i) : getnext(s,i);
if(f.reps[tabid]) { replacement = f.reps[tabid]; replacement_i = 0; continue; }
for(int tabid: tabids) {
tsize += f.chars[tabid].w * size/gsiz; tsize += f.chars[tabid].w * size/gsiz;
} }
x -= tsize * align / 16; x -= tsize * align / 16;
@@ -741,10 +751,8 @@ bool gl_print(int x, int y, int shift, int size, string s, color_t color, int al
glBindTexture(GL_TEXTURE_2D, f.texture); glBindTexture(GL_TEXTURE_2D, f.texture);
for(int i=0; s[i];) { for(int tabid: tabids) {
int tabid = replacement[replacement_i] ? getnext(replacement, replacement_i) : getnext(s,i);
if(f.reps[tabid]) { replacement = f.reps[tabid]; replacement_i = 0; continue; }
auto& c = f.chars[tabid]; auto& c = f.chars[tabid];
int wi = c.w * size/gsiz; int wi = c.w * size/gsiz;
int hi = c.h * size/gsiz; int hi = c.h * size/gsiz;