From 567c351b8f2c924c90790dec7cdd051c8753691d Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 13 Apr 2021 21:03:30 -0400 Subject: [PATCH] [sprixcell] kill unused TAM enums for now --- src/lib/internal.h | 2 -- src/lib/render.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/internal.h b/src/lib/internal.h index ce2ca6ce3..ed1e84d35 100644 --- a/src/lib/internal.h +++ b/src/lib/internal.h @@ -57,8 +57,6 @@ typedef enum { SPRIXCELL_NORMAL, // no transparent pixels in this cell SPRIXCELL_CONTAINS_TRANS, // this cell has transparent pixels SPRIXCELL_ANNIHILATED, // this cell has been wiped - SPRIXCELL_UNHIDDEN, // this cell needs be unwiped - SPRIXCELL_ANASTASIS, // this cell needs be revived } sprixcell_e; // there is a context-wide set of displayed pixel glyphs ("sprixels"); i.e. diff --git a/src/lib/render.c b/src/lib/render.c index 417425aa0..844928a9a 100644 --- a/src/lib/render.c +++ b/src/lib/render.c @@ -204,15 +204,16 @@ paint_sprixel(const ncplane* p, const nccell* vis, struct crender* crender, int y, int x){ const notcurses* nc = ncplane_notcurses_const(p); //fprintf(stderr, "presprixel: %p preid: %d id: %d state: %d\n", rvec->sprixel, rvec->sprixel ? rvec->sprixel->id : 0, cell_sprixel_id(vis), sprixel_by_id(ncplane_notcurses_const(p), cell_sprixel_id(vis))->invalidated); - // if we already have a glyph solved, and we run into a bitmap - // cell, we need to null that cell out of the bitmap. + // if we already have a glyph solved (meaning said glyph is above this + // sprixel), and we run into a bitmap cell, we need to null that cell out + // of the bitmap. if(crender->p || crender->s.bgblends){ // if sprite_wipe_cell() fails, we presumably do not have the // ability to wipe, and must reprint the character if(sprite_wipe_cell(nc, p->sprite, y, x)){ //fprintf(stderr, "damaging due to wipe %d/%d\n", y, x); - crender->s.p_beats_sprixel = 1; crender->s.damaged = 1; + crender->s.p_beats_sprixel = 1; } }else if(!crender->p){ // if we are a bitmap, and above a cell that has changed (and