1
0
mirror of https://github.com/pevans/erc-c.git synced 2024-12-21 23:29:16 +00:00

Revert "Implement rect change stack"

This reverts commit 616bfdcc58.
This commit is contained in:
Peter Evans 2018-04-05 20:56:46 -05:00
parent 616bfdcc58
commit e50af5aba9

View File

@ -15,28 +15,6 @@
#include "vm_event.h" #include "vm_event.h"
#include "vm_screen.h" #include "vm_screen.h"
typedef struct {
/*
* The point coordinates of the change on-screen that we are looking
* to make
*/
vm_area area;
/*
* The new color of the pixel
*/
vm_color clr;
} change;
/*
* An array of changes, arranged in a stack, plus the position in the
* stack where we currently are at.
*/
static change changestack[65536];
static int changepos = 0;
static vm_color curcolor;
struct timeval refresh_time; struct timeval refresh_time;
/* /*
@ -227,7 +205,7 @@ vm_screen_active(vm_screen *scr)
void void
vm_screen_prepare(vm_screen *scr) vm_screen_prepare(vm_screen *scr)
{ {
SDL_RenderClear(scr->render); //SDL_RenderClear(scr->render);
} }
/* /*
@ -235,22 +213,10 @@ vm_screen_prepare(vm_screen *scr)
* made recently. * made recently.
*/ */
void void
vm_screen_refresh(vm_screen *scr) vm_screen_refresh(vm_screen *screen)
{ {
change *chg; SDL_RenderPresent(screen->render);
screen->dirty = false;
while (changepos >= 0) {
chg = &changestack[changepos--];
SDL_SetRenderDrawColor(scr->render, chg->clr.r, chg->clr.g,
chg->clr.b, SDL_ALPHA_OPAQUE);
MAKE_SDL_RECT(rect, chg->area);
SDL_RenderFillRect(scr->render, &rect);
}
SDL_RenderPresent(scr->render);
scr->dirty = false;
} }
/* /*
@ -263,8 +229,6 @@ vm_screen_set_color(vm_screen *scr, vm_color clr)
SDL_SetRenderDrawColor(scr->render, clr.r, clr.g, clr.b, SDL_SetRenderDrawColor(scr->render, clr.r, clr.g, clr.b,
SDL_ALPHA_OPAQUE); SDL_ALPHA_OPAQUE);
} }
curcolor = clr;
} }
/* /*
@ -274,22 +238,11 @@ vm_screen_set_color(vm_screen *scr, vm_color clr)
void void
vm_screen_draw_rect(vm_screen *screen, vm_area *area) vm_screen_draw_rect(vm_screen *screen, vm_area *area)
{ {
change *chg;
// FIXME: magic number
if (changepos >= 65536) {
return;
}
chg = &changestack[changepos++];
memcpy(&chg->area, area, sizeof(vm_area));
chg->clr = curcolor;
// The renderer will take care of translating the positions and // The renderer will take care of translating the positions and
// sizes into whatever the window is really at. // sizes into whatever the window is really at.
//MAKE_SDL_RECT(rect, *area); MAKE_SDL_RECT(rect, *area);
//SDL_RenderFillRect(screen->render, &rect); SDL_RenderFillRect(screen->render, &rect);
screen->dirty = true; screen->dirty = true;
} }