mirror
/
pimoroni-pico
kopia lustrzana https://github.com/pimoroni/pimoroni-pico
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

PicoVector: Fix x16 anti-aliasing.

patch-img-open_file
Phil Howard 2024-07-11 09:41:29 +01:00 zatwierdzone przez Phil Howard
rodzic 03ada256ed
commit 7fd72fe06c
2 zmienionych plików z 16 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
libraries/pico_vector/pico_vector.cpp
Wyświetl plik

@ -6,6 +6,9 @@
namespace pimoroni { namespace pimoroni {
PicoGraphics *PicoVector::graphics = nullptr; PicoGraphics *PicoVector::graphics = nullptr;
uint8_t PicoVector::max_alpha = 4;
const uint8_t *PicoVector::alpha_map = alpha_map_x4;
void PicoVector::draw(pp_poly_t *poly) { void PicoVector::draw(pp_poly_t *poly) {
pp_transform(NULL); pp_transform(NULL);
pp_render(poly); pp_render(poly);

16
libraries/pico_vector/pico_vector.hpp
Wyświetl plik

@ -31,7 +31,10 @@ namespace pimoroni {
private: private:
static PicoGraphics *graphics; static PicoGraphics *graphics;
af_text_metrics_t text_metrics; af_text_metrics_t text_metrics;
static constexpr uint8_t alpha_map[4] {0, 128, 192, 255}; static constexpr uint8_t alpha_map_x4[4] {0, 128, 192, 255};
static constexpr uint8_t alpha_map_x16[16] {0, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 255};
static uint8_t max_alpha;
static const uint8_t *alpha_map;
public: public:
PicoVector(PicoGraphics *graphics, void *mem = nullptr) { PicoVector(PicoGraphics *graphics, void *mem = nullptr) {
@ -39,7 +42,7 @@ namespace pimoroni {
pp_tile_callback(PicoVector::tile_callback); pp_tile_callback(PicoVector::tile_callback);
pp_antialias(graphics->supports_alpha_blend() ? PP_AA_X4 : PP_AA_NONE); set_antialiasing(graphics->supports_alpha_blend() ? PP_AA_X4 : PP_AA_NONE);
pp_clip(graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h); pp_clip(graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h);
@ -67,7 +70,7 @@ namespace pimoroni {
for(auto y = 0; y < tile->h; y++) { for(auto y = 0; y < tile->h; y++) {
for(auto x = 0; x < tile->w; x++) { for(auto x = 0; x < tile->w; x++) {
uint8_t alpha = *tile_data++; uint8_t alpha = *tile_data++;
if (alpha >= 4) { if (alpha >= max_alpha) {
PicoVector::graphics->pixel({x + tile->x, y + tile->y}); PicoVector::graphics->pixel({x + tile->x, y + tile->y});
} else if (alpha > 0) { } else if (alpha > 0) {
alpha = alpha_map[alpha]; alpha = alpha_map[alpha];
@ -91,6 +94,13 @@ namespace pimoroni {
void set_antialiasing(pp_antialias_t antialias) { void set_antialiasing(pp_antialias_t antialias) {
pp_antialias(antialias); pp_antialias(antialias);
if(antialias == PP_AA_X16) {
alpha_map = alpha_map_x16;
max_alpha = 16;
} else {
alpha_map = alpha_map_x4;
max_alpha = 4;
}
} }
void set_font_size(unsigned int font_size) { void set_font_size(unsigned int font_size) {