diff --git a/bin/muffin/main.cc b/bin/muffin/main.cc index 4c96b36..cbd80a4 100644 --- a/bin/muffin/main.cc +++ b/bin/muffin/main.cc @@ -44,7 +44,7 @@ uint16_t iii = 0x0; window->vCreate(); -// window->vSDECommand(1); + window->vSDECommand(1); ogImage * image = new ogImage(); ogSurface * bgImage = new ogSurface(); @@ -83,13 +83,14 @@ window->vSDECommand(3); //bgImage->ogLine(bgImage->ogGetMaxX(), bgImage->ogGetMaxY(), 0, 0, 0xFF00FFFF); -return(0); +//return(0); while (1) { for (i=0x2;i<0xFF;i += 16) { for (ii=0x0;ii<0xFF;ii+= 16) { for (iii= 0x0;iii< 0xFF;iii+= 16) { window->ogClear(window->ogPack(i,ii,iii)); +window->ogCopy(*bgImage); window->ogFillRect(50, 50, 100, 100, window->ogPack(255, 0, 0)); window->ogFillRect(50, 50, 100, 100, window->ogPack(255, 0, 0)); window->ogFillRect(100, 50, 150, 100, window->ogPack(0, 255, 0)); diff --git a/sys/sde/sde.cc b/sys/sde/sde.cc index 1298a97..9eff9cc 100644 --- a/sys/sde/sde.cc +++ b/sys/sde/sde.cc @@ -63,7 +63,7 @@ } else if (tmp == 0x0 && args->cmd != registerWindow) { if (args->cmd == drawWindow) { - screen->ogCopyBuf(screen->ogGetMaxX() - oldBuf->ogGetMaxX(), screen->ogGetMaxY() - oldBuf->ogGetMaxY(), *oldBuf, 0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY()); + //screen->ogCopyBuf(screen->ogGetMaxX() - oldBuf->ogGetMaxX(), screen->ogGetMaxY() - oldBuf->ogGetMaxY(), *oldBuf, 0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY()); } //kprintf("Invalid Window\n"); @@ -73,9 +73,11 @@ switch (args->cmd) { case drawWindow: + /* screen->ogCopyBuf(screen->ogGetMaxX() - oldBuf->ogGetMaxX(), screen->ogGetMaxY() - oldBuf->ogGetMaxY(), *oldBuf, 0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY()); kprintf("Draw Window\n"); while(1) asm("nop"); + */ tmp->status = drawWindow; while (tmp->status != windowReady) { @@ -87,7 +89,6 @@ tmp->status = killWindow; break; case registerWindow: - /* if (oldBuf->buffer != 0x0) { newBuf = new ogSurface(); newBuf->version = oldBuf->version; @@ -133,7 +134,6 @@ else { kprintf("Invalid Window\n"); } - */ break; default: kprintf("Invalid SDE Command [0x%X]\n", args->ptr);