X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fgrise.c;h=94e385062fbaa76db774c77c47cc1e064bfa0805;hp=543b51e653bcf28225350a6a98fb13c6908e17c2;hb=7deef4d5a20da09044bf7311c6ee274090cde5e6;hpb=695b69a4c4acbaee28d99851d711c00b2468e280 diff --git a/src/grise.c b/src/grise.c index 543b51e..94e3850 100644 --- a/src/grise.c +++ b/src/grise.c @@ -16,7 +16,7 @@ typedef struct { static RLEBitmap *rleCreate(unsigned int w, unsigned int h); static void rleDestroy(RLEBitmap *b); -static void rleBlit(unsigned short *dst, int dstW, int dstH, int dstStride, +static void rleBlit(unsigned short *dst, int dstW, int dstH, int dstStride, RLEBitmap *bitmap, int blitX, int blitY); static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, RLEBitmap *bitmap, int blitX, int blitY, float scaleX, float scaleY); @@ -62,8 +62,8 @@ static void updateScrollTables(float dt); static unsigned short *background = 0; -static unsigned int backgroundW = 0; -static unsigned int backgroundH = 0; +static int backgroundW = 0; +static int backgroundH = 0; static unsigned int lastFrameTime = 0; static float lastFrameDuration = 0.0f; @@ -78,7 +78,7 @@ static int scrollTableRounded[REFLECTION_HEIGHT]; static int scrollModTable[REFLECTION_HEIGHT]; static float nearScrollAmount = 0.0f; -static char miniFXBuffer[1024]; +static unsigned char miniFXBuffer[1024]; static RLEBitmap *grobj = 0; static RLEBitmap *rlePropeller = 0; @@ -88,7 +88,7 @@ static struct screen scr = { init, destroy, start, - stop, + 0, draw }; @@ -97,7 +97,6 @@ struct screen *grise_screen(void) return &scr; } - static int init(void) { unsigned char *tmpBitmap; @@ -129,11 +128,7 @@ static int init(void) processNormal(); -#ifdef MIKE_PC - return 0xCAFE; -#else return 0; -#endif } static void destroy(void) @@ -151,15 +146,9 @@ static void start(long trans_time) lastFrameTime = time_msec; } -static void stop(long trans_time) -{ -} - - - static void draw(void) -{ +{ int scroll = MIN_SCROLL + (MAX_SCROLL - MIN_SCROLL) * mouse_x / fb_width; unsigned short *dst = backBuffer + PIXEL_PADDING; unsigned short *src = background + scroll; @@ -167,6 +156,9 @@ static void draw(void) int i = 0; short *dispScanline; int d; + int accum = 0; + int md, sc; + int scrolledIndex; lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f; lastFrameTime = time_msec; @@ -180,11 +172,11 @@ static void draw(void) src += backgroundW; dst += BB_SIZE; } - + /* Create scroll offsets for all scanlines of the normalmap */ updateScrollTables(lastFrameDuration); - /* Render the baked reflection one scanline below its place, so that + /* Render the baked reflection one scanline below its place, so that * the displacement that follows will be done in a cache-friendly way */ src -= PIXEL_PADDING; /* We want to also fill the PADDING pixels here */ @@ -203,8 +195,19 @@ static void draw(void) src = dst + BB_SIZE; /* The pixels to be displaced are 1 scanline below */ dispScanline = displacementMap; for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) { + + md = scrollModTable[scanline]; + sc = scrollTableRounded[scanline]; + accum = 0; + for (i = 0; i < fb_width; i++) { - d = dispScanline[(i + scrollTableRounded[scanline]) % scrollModTable[scanline]]; + /* Try to immitate modulo without the division */ + if (i == md) accum += md; + scrolledIndex = i - accum + sc; + if (scrolledIndex >= md) scrolledIndex -= md; + + /* Displace */ + d = dispScanline[scrolledIndex]; *dst++ = src[i + d]; } src += backgroundW; @@ -214,13 +217,13 @@ static void draw(void) /* Then after displacement, blit the objects */ for (i = 0; i < 5; i++) rleBlit(backBuffer + PIXEL_PADDING, fb_width, fb_height, BB_SIZE, rlePropeller, 134 + (i-3) * 60, 100); - + /* Blit effect to framebuffer */ src = backBuffer + PIXEL_PADDING; - dst = vmem_back; + dst = fb_pixels; for (scanline = 0; scanline < fb_height; scanline++) { memcpy(dst, src, fb_width * 2); - src += BB_SIZE; + src += BB_SIZE; dst += fb_width; } @@ -306,7 +309,7 @@ static void initScrollTables() { static void updateScrollTables(float dt) { int i = 0; - + nearScrollAmount += dt * NEAR_SCROLL_SPEED; nearScrollAmount = (float) fmod(nearScrollAmount, 512.0f); @@ -317,7 +320,7 @@ static void updateScrollTables(float dt) { } /* ------------------------------------------------------------------------------------------------- - * RLE STUFF + * RLE STUFF * ------------------------------------------------------------------------------------------------- */ /* Limit streak count per scanline so we can directly jump to specific scanline */ @@ -407,7 +410,7 @@ static RLEBitmap *rleEncode(RLEBitmap *b, unsigned char *pixels, unsigned int w, static void rleDistributeStreaks(RLEBitmap *bitmap) { int scanline, halfW = bitmap->w >> 1; unsigned char *ptr, tmp; - + ptr = bitmap->scans; for (scanline = 0; scanline < bitmap->h; scanline++) { if (ptr[0] >= halfW) { @@ -424,7 +427,7 @@ static void rleDistributeStreaks(RLEBitmap *bitmap) { } static void rleBlit(unsigned short *dst, int dstW, int dstH, int dstStride, - RLEBitmap *bitmap, int blitX, int blitY) + RLEBitmap *bitmap, int blitX, int blitY) { int scanline = 0; int streakPos = 0; @@ -469,7 +472,7 @@ static void interpolateScan(unsigned char *output, unsigned char *a, unsigned ch t += 1.0f; ti = (*((unsigned int*)&t)) & 0x7FFFFF; - + for (i = 0; i < RLE_BYTES_PER_SCANLINE; i++) { if (*a == 0) { *output++ = *b++; @@ -499,7 +502,7 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, int scaleXFixed; static unsigned char scan[512]; - int blitW = (int)(bitmap->w * scaleX + 0.5f); + /*int blitW = (int)(bitmap->w * scaleX + 0.5f);*/ int blitH = (int)(bitmap->h * scaleY + 0.5f); /* From this point on, scaleY will be inverted */ @@ -560,7 +563,7 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri int scaleXFixed; static unsigned char scan[512]; - int blitW = (int)(bitmap->w * scaleX + 0.5f); + /*int blitW = (int)(bitmap->w * scaleX + 0.5f);*/ int blitH = (int)(bitmap->h * scaleY + 0.5f); /* From this point on, scaleY will be inverted */ @@ -621,7 +624,7 @@ static struct { static void updatePropeller(float t) { int i, j; int cx, cy, count = 0; - char *dst; + unsigned char *dst; float x = 0.0f; float y = 18.0f; float nx, ny;