v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

font: add FONT_JUSTIFY support

main
Dominik Madarász 2024-02-08 14:21:19 +01:00
parent b79492b709
commit 0da93a645b
4 changed files with 139 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/01-font.c
View File

@ -127,7 +127,7 @@ int main() {
{ {
vec2 pos = vec2(1490,820); vec2 pos = vec2(1490,820);
ddraw_push_2d(); ddraw_push_2d();
char *txt = FONT_CENTER FONT_MIDDLE "This is the first line.\nAnd now the second line.\nYou can do a third great line, too!\n"; char *txt = FONT_JUSTIFY FONT_MIDDLE "This is the first line.\nAnd now the second line.\nYou can do a third great line, too!\n";
font_goto(pos.x, pos.y); font_goto(pos.x, pos.y);
vec2 size=font_rect(txt); vec2 size=font_rect(txt);
font_metrics_t m=font_metrics(txt); font_metrics_t m=font_metrics(txt);

51
engine/joint/v4k.h
View File

@ -363933,13 +363933,14 @@ void font_goto(float x, float y) {
// Print and linefeed. Text may include markup code // Print and linefeed. Text may include markup code
vec2 font_print_rect(const char *text, vec4 rect) { vec2 font_print_rect(const char *text, vec4 rect) {
int l=0,c=0,r=0,t=0,b=0,m=0,B=0; int l=0,c=0,r=0,j=0,t=0,b=0,m=0,B=0;
while ( text[0] == FONT_LEFT[0] ) { while ( text[0] == FONT_LEFT[0] ) {
int has_set=0; int has_set=0;
if (text[1] == FONT_LEFT[1]) l = 1, has_set=1; if (text[1] == FONT_LEFT[1]) l = 1, has_set=1;
if (text[1] == FONT_CENTER[1]) c = 1, has_set=1; if (text[1] == FONT_CENTER[1]) c = 1, has_set=1;
if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1; if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1;
if (text[1] == FONT_JUSTIFY[1]) j = 1, has_set=1;
if (text[1] == FONT_TOP[1]) t = 1, has_set=1; if (text[1] == FONT_TOP[1]) t = 1, has_set=1;
if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1; if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1;
if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1; if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1;
@ -363956,6 +363957,19 @@ vec2 font_print_rect(const char *text, vec4 rect) {
if (num_newlines > 1) { if (num_newlines > 1) {
vec2 text_dims = font_rect(text); vec2 text_dims = font_rect(text);
array(char *) lines = strsplit(text, "\n"); array(char *) lines = strsplit(text, "\n");
char tags[4] = {0};
for (int i = 0, t = 0, end = strlen(text); i < end; ++i) {
if (t == 4) break;
char ch = text[i];
if( (ch >= 1 && ch <= 6) ||
(ch >= 0x1a && ch <= 0x1f) ||
(ch >= 0x10 && ch <= 0x19)) {
tags[t++] = ch;
++text;
}
}
if (b) { if (b) {
gotoxy.y += (rect.w - text_dims.y); gotoxy.y += (rect.w - text_dims.y);
} }
@ -363966,13 +363980,40 @@ vec2 font_print_rect(const char *text, vec4 rect) {
gotoxy.y += (rect.w/2. - text_dims.y/1.); gotoxy.y += (rect.w/2. - text_dims.y/1.);
} }
for (int i = 0; i < array_count(lines); i++) { for (int i = 0; i < array_count(lines); i++) {
char *line = va("%s%s\n", tags, lines[i]);
vec2 text_rect = font_rect(line);
if( l || c || r ) { if( l || c || r ) {
vec2 text_rect = font_rect(lines[i]);
gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.; gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.;
} else if (j) {
float words_space = 0.0f;
array(char *) words = strsplit(lines[i], " ");
for (int k = 0; k < array_count(words); ++k) {
if (!strlen(words[k])) {
array_erase_slow(words, k);
--k;
} else {
words_space += font_rect(words[k]).x;
}
}
if (array_count(words) == 0) {
gotoxy.y += text_rect.y;
continue;
}
float extra_space = rect.z - words_space;
int gaps = array_count(words) - 1;
float space_offset = gaps > 0 ? extra_space / (float)gaps : 0;
for (int k = 0; k < array_count(words); ++k) {
vec2 dims = font_draw_ex(va("%s%s", tags, words[k]), gotoxy, NULL, font_draw_cmd);
gotoxy.x += dims.x + space_offset;
}
gotoxy.x = rect.x;
} }
char *line = va("%s\n", lines[i]);
vec2 dims = font_draw_ex(line, gotoxy, NULL, font_draw_cmd); if (!j) {
gotoxy.y += dims.y; font_draw_ex(line, gotoxy, NULL, font_draw_cmd);
}
gotoxy.y += text_rect.y;
} }
return text_dims; return text_dims;
} else { } else {

51
engine/split/v4k_font.c
View File

@ -2375,13 +2375,14 @@ void font_goto(float x, float y) {
// Print and linefeed. Text may include markup code // Print and linefeed. Text may include markup code
vec2 font_print_rect(const char *text, vec4 rect) { vec2 font_print_rect(const char *text, vec4 rect) {
int l=0,c=0,r=0,t=0,b=0,m=0,B=0; int l=0,c=0,r=0,j=0,t=0,b=0,m=0,B=0;
while ( text[0] == FONT_LEFT[0] ) { while ( text[0] == FONT_LEFT[0] ) {
int has_set=0; int has_set=0;
if (text[1] == FONT_LEFT[1]) l = 1, has_set=1; if (text[1] == FONT_LEFT[1]) l = 1, has_set=1;
if (text[1] == FONT_CENTER[1]) c = 1, has_set=1; if (text[1] == FONT_CENTER[1]) c = 1, has_set=1;
if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1; if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1;
if (text[1] == FONT_JUSTIFY[1]) j = 1, has_set=1;
if (text[1] == FONT_TOP[1]) t = 1, has_set=1; if (text[1] == FONT_TOP[1]) t = 1, has_set=1;
if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1; if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1;
if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1; if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1;
@ -2398,6 +2399,19 @@ vec2 font_print_rect(const char *text, vec4 rect) {
if (num_newlines > 1) { if (num_newlines > 1) {
vec2 text_dims = font_rect(text); vec2 text_dims = font_rect(text);
array(char *) lines = strsplit(text, "\n"); array(char *) lines = strsplit(text, "\n");
char tags[4] = {0};
for (int i = 0, t = 0, end = strlen(text); i < end; ++i) {
if (t == 4) break;
char ch = text[i];
if( (ch >= 1 && ch <= 6) ||
(ch >= 0x1a && ch <= 0x1f) ||
(ch >= 0x10 && ch <= 0x19)) {
tags[t++] = ch;
++text;
}
}
if (b) { if (b) {
gotoxy.y += (rect.w - text_dims.y); gotoxy.y += (rect.w - text_dims.y);
} }
@ -2408,13 +2422,40 @@ vec2 font_print_rect(const char *text, vec4 rect) {
gotoxy.y += (rect.w/2. - text_dims.y/1.); gotoxy.y += (rect.w/2. - text_dims.y/1.);
} }
for (int i = 0; i < array_count(lines); i++) { for (int i = 0; i < array_count(lines); i++) {
char *line = va("%s%s\n", tags, lines[i]);
vec2 text_rect = font_rect(line);
if( l || c || r ) { if( l || c || r ) {
vec2 text_rect = font_rect(lines[i]);
gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.; gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.;
} else if (j) {
float words_space = 0.0f;
array(char *) words = strsplit(lines[i], " ");
for (int k = 0; k < array_count(words); ++k) {
if (!strlen(words[k])) {
array_erase_slow(words, k);
--k;
} else {
words_space += font_rect(words[k]).x;
}
}
if (array_count(words) == 0) {
gotoxy.y += text_rect.y;
continue;
}
float extra_space = rect.z - words_space;
int gaps = array_count(words) - 1;
float space_offset = gaps > 0 ? extra_space / (float)gaps : 0;
for (int k = 0; k < array_count(words); ++k) {
vec2 dims = font_draw_ex(va("%s%s", tags, words[k]), gotoxy, NULL, font_draw_cmd);
gotoxy.x += dims.x + space_offset;
}
gotoxy.x = rect.x;
} }
char *line = va("%s\n", lines[i]);
vec2 dims = font_draw_ex(line, gotoxy, NULL, font_draw_cmd); if (!j) {
gotoxy.y += dims.y; font_draw_ex(line, gotoxy, NULL, font_draw_cmd);
}
gotoxy.y += text_rect.y;
} }
return text_dims; return text_dims;
} else { } else {

51
engine/v4k.c
View File

@ -11073,13 +11073,14 @@ void font_goto(float x, float y) {
// Print and linefeed. Text may include markup code // Print and linefeed. Text may include markup code
vec2 font_print_rect(const char *text, vec4 rect) { vec2 font_print_rect(const char *text, vec4 rect) {
int l=0,c=0,r=0,t=0,b=0,m=0,B=0; int l=0,c=0,r=0,j=0,t=0,b=0,m=0,B=0;
while ( text[0] == FONT_LEFT[0] ) { while ( text[0] == FONT_LEFT[0] ) {
int has_set=0; int has_set=0;
if (text[1] == FONT_LEFT[1]) l = 1, has_set=1; if (text[1] == FONT_LEFT[1]) l = 1, has_set=1;
if (text[1] == FONT_CENTER[1]) c = 1, has_set=1; if (text[1] == FONT_CENTER[1]) c = 1, has_set=1;
if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1; if (text[1] == FONT_RIGHT[1]) r = 1, has_set=1;
if (text[1] == FONT_JUSTIFY[1]) j = 1, has_set=1;
if (text[1] == FONT_TOP[1]) t = 1, has_set=1; if (text[1] == FONT_TOP[1]) t = 1, has_set=1;
if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1; if (text[1] == FONT_BOTTOM[1]) b = 1, has_set=1;
if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1; if (text[1] == FONT_MIDDLE[1]) m = 1, has_set=1;
@ -11096,6 +11097,19 @@ vec2 font_print_rect(const char *text, vec4 rect) {
if (num_newlines > 1) { if (num_newlines > 1) {
vec2 text_dims = font_rect(text); vec2 text_dims = font_rect(text);
array(char *) lines = strsplit(text, "\n"); array(char *) lines = strsplit(text, "\n");
char tags[4] = {0};
for (int i = 0, t = 0, end = strlen(text); i < end; ++i) {
if (t == 4) break;
char ch = text[i];
if( (ch >= 1 && ch <= 6) ||
(ch >= 0x1a && ch <= 0x1f) ||
(ch >= 0x10 && ch <= 0x19)) {
tags[t++] = ch;
++text;
}
}
if (b) { if (b) {
gotoxy.y += (rect.w - text_dims.y); gotoxy.y += (rect.w - text_dims.y);
} }
@ -11106,13 +11120,40 @@ vec2 font_print_rect(const char *text, vec4 rect) {
gotoxy.y += (rect.w/2. - text_dims.y/1.); gotoxy.y += (rect.w/2. - text_dims.y/1.);
} }
for (int i = 0; i < array_count(lines); i++) { for (int i = 0; i < array_count(lines); i++) {
char *line = va("%s%s\n", tags, lines[i]);
vec2 text_rect = font_rect(line);
if( l || c || r ) { if( l || c || r ) {
vec2 text_rect = font_rect(lines[i]);
gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.; gotoxy.x = l ? rect.x : r ? ((rect.x+rect.z) - text_rect.x) : rect.x+rect.z/2. - text_rect.x/2.;
} else if (j) {
float words_space = 0.0f;
array(char *) words = strsplit(lines[i], " ");
for (int k = 0; k < array_count(words); ++k) {
if (!strlen(words[k])) {
array_erase_slow(words, k);
--k;
} else {
words_space += font_rect(words[k]).x;
}
}
if (array_count(words) == 0) {
gotoxy.y += text_rect.y;
continue;
}
float extra_space = rect.z - words_space;
int gaps = array_count(words) - 1;
float space_offset = gaps > 0 ? extra_space / (float)gaps : 0;
for (int k = 0; k < array_count(words); ++k) {
vec2 dims = font_draw_ex(va("%s%s", tags, words[k]), gotoxy, NULL, font_draw_cmd);
gotoxy.x += dims.x + space_offset;
}
gotoxy.x = rect.x;
} }
char *line = va("%s\n", lines[i]);
vec2 dims = font_draw_ex(line, gotoxy, NULL, font_draw_cmd); if (!j) {
gotoxy.y += dims.y; font_draw_ex(line, gotoxy, NULL, font_draw_cmd);
}
gotoxy.y += text_rect.y;
} }
return text_dims; return text_dims;
} else { } else {