nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 20:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken texture code

Browse Source
This commit is contained in:
NishiOwO 2025-04-17 00:37:18 +09:00
parent ef34a14cd7
commit 1e6a2e97b2
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/gf_draw_common.c
View File

@ -62,7 +62,7 @@ gf_draw_t* gf_draw_create(gf_engine_t* engine, const char* title) {
draw->lookat[1] = 0;
draw->lookat[2] = 0;
draw->font = gf_font_create("font/helvR24.bdf");
draw->font = gf_font_create(draw, "font/helvR24.bdf");
draw->gui = gf_gui_create(engine, draw);
if(1) {

18
engine/gf_font.c
View File

@ -34,12 +34,16 @@ gf_font_glyph_t* gf_font_get(gf_font_t* font, int code) {
#define gf_stat stat
#endif
GF_DECLARE_TYPE(font_store, { int glyph_index; });
GF_DECLARE_TYPE(font_store, {
int glyph_index;
int line_index;
unsigned char* buffer;
});
/**
* This is a private method to parse BDF line
*/
void gf_font_parse_line(const char* path, gf_font_store_t* store, gf_font_t* font, char* line) {
void gf_font_parse_line(gf_draw_t* draw, const char* path, gf_font_store_t* store, gf_font_t* font, char* line) {
int i;
char* args[32];
int argc = 0;
@ -67,7 +71,11 @@ void gf_font_parse_line(const char* path, gf_font_store_t* store, gf_font_t* fon
font->glyph[store->glyph_index] = malloc(sizeof(**font->glyph));
memset(font->glyph[store->glyph_index], 0, sizeof(**font->glyph));
} else if(argc > 0 && strcmp(args[0], "ENDCHAR") == 0) {
font->glyph[store->glyph_index]->texture = gf_texture_create(draw, font->glyph[store->glyph_index]->bbox.width, font->glyph[store->glyph_index]->bbox.height, store->buffer);
free(store->buffer);
store->glyph_index++;
} else if(argc > 0 && strcmp(args[0], "BITMAP") == 0) {
store->line_index = 0;
} else if(argc == 2) {
if(strcmp(args[0], "COPYRIGHT") == 0) {
gf_log_function(NULL, "%s: %s", path, args[1]);
@ -101,11 +109,13 @@ void gf_font_parse_line(const char* path, gf_font_store_t* store, gf_font_t* fon
font->glyph[store->glyph_index]->bbox.height = atoi(args[2]);
font->glyph[store->glyph_index]->bbox.x = atoi(args[3]);
font->glyph[store->glyph_index]->bbox.y = atoi(args[4]);
store->buffer = malloc(atoi(args[1]) * atoi(args[2]) * 4);
memset(store->buffer, 0, atoi(args[1]) * atoi(args[2]) * 4);
}
}
}
gf_font_t* gf_font_create(const char* path) {
gf_font_t* gf_font_create(gf_draw_t* draw, const char* path) {
gf_font_t* font = malloc(sizeof(*font));
struct gf_stat s;
char* buf;
@ -132,7 +142,7 @@ gf_font_t* gf_font_create(const char* path) {
buf[i] = 0;
incr = i + 1;
gf_font_parse_line(path, &store, font, line);
gf_font_parse_line(draw, path, &store, font, line);
if(oldc == 0) break;
}

6
engine/graphic/opengl/gf_driver.c
View File

@ -37,11 +37,11 @@ gf_draw_driver_texture_t* gf_draw_driver_register_texture(gf_draw_t* draw, int w
*iwidth = w;
*iheight = h;
memset(d, 0, w * h);
memset(d, 0, w * h * 4);
for(y = 0; y < height; y++) {
for(x = 0; x < width; x++) {
int pos = (y * h + x) * 4;
int ogpos = (y * height + x) * 4;
int pos = (y * w + x) * 4;
int ogpos = (y * width + x) * 4;
memcpy(d + pos + 0, data + ogpos + 0, 4);
}
}

4
engine/include/gf_font.h
View File

@ -14,6 +14,7 @@
#include <gf_type/font.h>
/* Engine */
#include <gf_type/draw.h>
/* Standard */
@ -29,9 +30,10 @@ GF_EXPORT gf_font_glyph_t* gf_font_get(gf_font_t* font, int code);
/**
* @~english
* @brief Load font
* @param draw Drawing interface
* @param path Path
* @return Font
*/
GF_EXPORT gf_font_t* gf_font_create(const char* path);
GF_EXPORT gf_font_t* gf_font_create(gf_draw_t* draw, const char* path);
#endif