vhaudiquet/deb-lite-xl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add pixel format to render font in bitmap format

Browse Source 
The purpose it to add later subpixel by storing the bitmap with RGB
channels to have subpixel LCD coverage information.

The colorization and gamma blending will be done when blitting the glyph
on the destination surface.
This commit is contained in:
Francesco Abbate
2020-05-30 18:07:31 +02:00
parent 010966d60d
commit 103336945e
3 changed files with 269 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/agg_font_render_test.cpp
+16 -10
View File
@@ -3,7 +3,7 @@
#include <assert.h>
#include "SDL_surface.h"
#include "font_render_lcd.h"
#include "font_renderer_alpha.h"
#define MAX_GLYPHSET 256
@@ -22,7 +22,7 @@ struct GlyphSetA {
};
struct RenFontA {
font_renderer_lcd *renderer;
font_renderer_alpha *renderer;
float size;
int height;
};
@@ -57,9 +57,7 @@ RenFontA* ren_load_font_agg(const char *filename, float size) {
font = (RenFontA *) check_alloc(calloc(1, sizeof(RenFontA)));
font->size = size;
// FIXME: we should remove the gamma correction.
// So that we have just the coverage.
font->renderer = new font_renderer_lcd(true, false, false, 1.8);
font->renderer = new font_renderer_alpha(true, false);
font->renderer->load_font(filename);
int ascender, descender;
@@ -75,21 +73,22 @@ RenFontA* ren_load_font_agg(const char *filename, float size) {
}
static GlyphSetA* load_glyphset_agg(RenFontA *font, int idx) {
const int pixel_size = 4;
const int pixel_size = 1;
GlyphSetA *set = (GlyphSetA *) check_alloc(calloc(1, sizeof(GlyphSetA)));
/* init image */
int width = 512; // 128;
int height = 512; // 128;
int width = 128;
int height = 128;
retry:
set->image = ren_new_image(width, height);
memset(set->image->pixels, 0xff, width * height * pixel_size);
memset(set->image->pixels, 0x00, width * height * pixel_size);
agg::rendering_buffer ren_buf((agg::int8u *) set->image->pixels, width, height, -width * pixel_size);
// FIXME: figure out how to precisely layout each glyph.
double x = 4, y = height - font->size * 3 / 2;
int res = 0;
const agg::rgba8 text_color(0x00, 0x00, 0x00);
const agg::alpha8 text_color(0xff);
for (int i = 0; i < 256; i++) {
if (x + font->size * 3 / 2 > width) {
x = 4;
@@ -113,6 +112,13 @@ retry:
goto retry;
}
/* convert 8bit data to 32bit */
for (int i = width * height - 1; i >= 0; i--) {
uint8_t n = *((uint8_t*) set->image->pixels + i);
RenColor c = {0xff, 0xff, 0xff, n};
set->image->pixels[i] = c;
}
return set;
}