john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

repl tab completion; rgb text coloring

Browse Source
This commit is contained in:
John Alanbrook
2023-10-09 18:03:12 +00:00
parent 9701cd2b4a
commit 5db00e9019
12 changed files with 400 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/engine/ffi.c
View File

@@ -277,7 +277,7 @@ JSValue vecarr2js(cpVect *points, int n) {
}
JSValue duk_ui_text(JSContext *js, JSValueConst this, int argc, JSValueConst *argv) {
const char *s = JS_ToCString(js, argv[0]);
const unsigned char *s = JS_ToCString(js, argv[0]);
HMM_Vec2 pos = js2hmmv2(argv[1]);
float size = js2number(argv[2]);

86
source/engine/font.c
View File

@@ -23,7 +23,7 @@
struct sFont *font;
#define max_chars 4000
#define max_chars 10000
static sg_shader fontshader;
static sg_bindings bind_text;
@@ -139,7 +139,7 @@ struct sFont *MakeFont(const char *fontfile, int height) {
stbtt_GetFontVMetrics(&fontinfo, &newfont->ascent, &newfont->descent, &newfont->linegap);
newfont->emscale = stbtt_ScaleForMappingEmToPixels(&fontinfo, 16);
newfont->linegap = (newfont->ascent - newfont->descent) * 1.5*newfont->emscale/2;
newfont->linegap = (newfont->ascent - newfont->descent) * newfont->emscale;
newfont->texID = sg_make_image(&(sg_image_desc){
.type = SG_IMAGETYPE_2D,
@@ -246,8 +246,37 @@ void text_settype(struct sFont *mfont) {
font = mfont;
}
struct boundingbox text_bb(const char *text, float scale, float lw, float tracking)
unsigned char *esc_color(unsigned char *c, struct rgba *color, struct rgba defc)
{
struct rgba d;
if (!color) color = &d;
if (*c != '\e') c;
c++;
if (*c != '[') return c;
c++;
if (*c == '0') {
*color = defc;
c++;
return c;
}
else if (!strncmp(c, "38;2;", 5)) {
c += 5;
*color = (struct rgba){0,0,0,255};
color->r = atoi(c);
c = strchr(c, ';')+1;
color->g = atoi(c);
c = strchr(c,';')+1;
color->b = atoi(c);
c = strchr(c,';')+1;
return c;
}
return c;
}
struct boundingbox text_bb(const unsigned char *text, float scale, float lw, float tracking)
{
struct rgba dummy;
HMM_Vec2 cursor = {0,0};
const unsigned char *c = text;
const unsigned char *line, *wordstart, *drawstart;
@@ -262,6 +291,9 @@ struct boundingbox text_bb(const char *text, float scale, float lw, float tracki
cursor.X = 0;
line++;
} else {
if (*line == '\e')
line = esc_color(line, NULL, dummy);
wordstart = line;
int wordWidth = 0;
@@ -276,6 +308,9 @@ struct boundingbox text_bb(const char *text, float scale, float lw, float tracki
}
while (wordstart < line) {
if (*wordstart == '\e')
line = esc_color(wordstart, NULL, dummy);
cursor.X += font->Characters[*wordstart].Advance * tracking * scale;
wordstart++;
}
@@ -291,38 +326,42 @@ void check_caret(int caret, int l, HMM_Vec2 pos, float scale, struct rgba color)
draw_char_box(font->Characters[0], pos, scale, color);
}
/* pos given in screen coordinates */
int renderText(const char *text, HMM_Vec2 pos, float scale, struct rgba color, float lw, int caret, float tracking) {
int renderText(const unsigned char *text, HMM_Vec2 pos, float scale, struct rgba color, float lw, int caret, float tracking) {
int len = strlen(text);
HMM_Vec2 cursor = pos;
int l = 0;
const unsigned char *line, *wordstart, *drawstart;
line = drawstart = (unsigned char *)text;
struct rgba usecolor = color;
check_caret(caret, l, cursor, scale, usecolor);
check_caret(caret, line-drawstart, cursor, scale, usecolor);
while (line[l] != '\0') {
if (isblank(line[l])) {
sdrawCharacter(font->Characters[line[l]], cursor, scale, usecolor);
cursor.X += font->Characters[line[l]].Advance * tracking * scale;
l++;
check_caret(caret, l, cursor, scale, usecolor);
} else if (isspace(line[l])) {
sdrawCharacter(font->Characters[line[l]], cursor, scale, usecolor);
while (*line != '\0') {
if (isblank(*line)) {
sdrawCharacter(font->Characters[*line], cursor, scale, usecolor);
cursor.X += font->Characters[*line].Advance * tracking * scale;
line++;
check_caret(caret, line-drawstart, cursor, scale, usecolor);
} else if (isspace(*line)) {
sdrawCharacter(font->Characters[*line], cursor, scale, usecolor);
cursor.Y -= scale * font->linegap;
cursor.X = pos.X;
l++;
check_caret(caret, l, cursor, scale, usecolor);
line++;
check_caret(caret, line-drawstart, cursor, scale, usecolor);
} else {
wordstart = &line[l];
if (*line == '\e')
line = esc_color(line, &usecolor, color);
wordstart = line;
int wordWidth = 0;
while (!isspace(line[l]) && line[l] != '\0') {
wordWidth += font->Characters[line[l]].Advance * tracking * scale;
l++;
while (!isspace(*line) && *line != '\0') {
wordWidth += font->Characters[*line].Advance * tracking * scale;
line++;
}
if (lw > 0 && (cursor.X + wordWidth - pos.X) >= lw) {
@@ -330,11 +369,14 @@ int renderText(const char *text, HMM_Vec2 pos, float scale, struct rgba color, f
cursor.Y -= scale * font->linegap;
}
while (wordstart < &line[l]) {
while (wordstart < line) {
if (*wordstart == '\e')
wordstart = esc_color(wordstart, &usecolor, color);
sdrawCharacter(font->Characters[*wordstart], cursor, scale, usecolor);
cursor.X += font->Characters[*wordstart].Advance * tracking * scale;
wordstart++;
check_caret(caret, wordstart-line, cursor, scale, usecolor);
check_caret(caret, wordstart-drawstart, cursor, scale, usecolor);
}
}
}

4
source/engine/font.h
View File

@@ -33,8 +33,8 @@ void font_init();
struct sFont *MakeFont(const char *fontfile, int height);
void sdrawCharacter(struct Character c, HMM_Vec2 cursor, float scale, struct rgba color);
void text_settype(struct sFont *font);
struct boundingbox text_bb(const char *text, float scale, float lw, float tracking);
int renderText(const char *text, HMM_Vec2 pos, float scale, struct rgba color, float lw, int caret, float tracking);
struct boundingbox text_bb(const unsigned char *text, float scale, float lw, float tracking);
int renderText(const unsigned char *text, HMM_Vec2 pos, float scale, struct rgba color, float lw, int caret, float tracking);
// void text_frame();
void text_flush(HMM_Mat4 *proj);

47
source/engine/input.c
View File

@@ -279,90 +279,52 @@ const char *keyname_extd(int key) {
switch (key) {
case SAPP_KEYCODE_ENTER:
return "enter";
break;
case SAPP_KEYCODE_ESCAPE:
return "escape";
break;
case SAPP_KEYCODE_DELETE:
return "delete";
break;
case SAPP_KEYCODE_INSERT:
return "insert";
break;
case SAPP_KEYCODE_TAB:
return "tab";
break;
case SAPP_KEYCODE_RIGHT:
return "right";
break;
case SAPP_KEYCODE_LEFT:
return "left";
break;
case SAPP_KEYCODE_UP:
return "up";
break;
case SAPP_KEYCODE_DOWN:
return "down";
break;
case SAPP_KEYCODE_LEFT_SHIFT:
return "lshift";
break;
case SAPP_KEYCODE_RIGHT_SHIFT:
return "rshift";
break;
case SAPP_KEYCODE_LEFT_CONTROL:
return "lctrl";
break;
case SAPP_KEYCODE_LEFT_ALT:
return "lalt";
break;
case SAPP_KEYCODE_RIGHT_CONTROL:
return "rctrl";
break;
case SAPP_KEYCODE_RIGHT_ALT:
return "ralt";
break;
case SAPP_KEYCODE_SPACE:
return "space";
break;
case SAPP_KEYCODE_KP_ADD:
return "plus";
break;
case SAPP_KEYCODE_KP_SUBTRACT:
return "minus";
break;
case SAPP_KEYCODE_GRAVE_ACCENT:
return "`";
break;
case SAPP_KEYCODE_LEFT_BRACKET:
return "lbracket";
break;
case SAPP_KEYCODE_RIGHT_BRACKET:
return "rbracket";
break;
case SAPP_KEYCODE_BACKSPACE:
return "backspace";
break;
case SAPP_KEYCODE_PAGE_UP:
return "pgup";
case SAPP_KEYCODE_PAGE_DOWN:
return "pgdown";
}
if (key >= 32 && key <=90) {
@@ -372,7 +334,6 @@ const char *keyname_extd(int key) {
return keybuf;
}
return "NULL";
}

2
source/engine/sound.c
View File

@@ -153,7 +153,7 @@ struct wav *make_sound(const char *wav) {
void *raw = slurp_file(wav, &rawlen);
if (!raw) {
YughError("Could not find file %s.", wav);
return;
return NULL;
}
if (!strcmp(ext, "wav"))