X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgrise.c;h=3ac12cb9942ec14e98fe1c2315dcb604c511c0a7;hb=bed531711e61f7fe2c5684882328e1452aa102f4;hp=50d80ced8e04266f07ca1d75f46710f09e5dc157;hpb=562d5ba2221876479318073167c67ef74ca50c69;p=dosdemo diff --git a/src/grise.c b/src/grise.c index 50d80ce..3ac12cb 100644 --- a/src/grise.c +++ b/src/grise.c @@ -9,6 +9,21 @@ /* APPROX. 170 FPS Minimum */ +typedef struct { + unsigned int w, h; + unsigned char *scans; +} RLEBitmap; + +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, + 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); +static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStride, + RLEBitmap bitmap, int blitX, int blitY, float scaleX, float scaleY); +static RLEBitmap rleEncode(unsigned char *pixels, unsigned int w, unsigned int h); + #define BG_FILENAME "data/grise.png" #define GROBJ_01_FILENAME "data/grobj_01.png" @@ -17,11 +32,14 @@ /* Every backBuffer scanline is guaranteed to have that many dummy pixels before and after */ #define PIXEL_PADDING 32 +/* Make sure this is less than PIXEL_PADDING*/ +#define MAX_DISPLACEMENT 16 + #define MIN_SCROLL PIXEL_PADDING #define MAX_SCROLL (backgroundW - fb_width - MIN_SCROLL) -#define FAR_SCROLL_SPEED 50.0f -#define NEAR_SCROLL_SPEED 400.0f +#define FAR_SCROLL_SPEED 15.0f +#define NEAR_SCROLL_SPEED 120.0f #define HORIZON_HEIGHT 100 #define REFLECTION_HEIGHT (240 - HORIZON_HEIGHT) @@ -31,7 +49,7 @@ static int init(void); static void destroy(void); static void start(long trans_time); -/*static void stop(long trans_time);*/ +static void stop(long trans_time); static void draw(void); static void convert32To16(unsigned int *src32, unsigned short *dst16, unsigned int pixelCount); @@ -39,7 +57,7 @@ static void processNormal(); static void initScrollTables(); static void updateScrollTables(float dt); -static void rleEncode(unsigned char *pixels, unsigned int w, unsigned int h); + static unsigned short *background = 0; static unsigned int backgroundW = 0; @@ -58,12 +76,14 @@ static int scrollTableRounded[REFLECTION_HEIGHT]; static int scrollModTable[REFLECTION_HEIGHT]; static float nearScrollAmount = 0.0f; +static RLEBitmap grobj; + static struct screen scr = { "galaxyrise", init, destroy, start, - 0, + stop, draw }; @@ -75,8 +95,8 @@ struct screen *grise_screen(void) static int init(void) { - unsigned char *reflectedObject; - int reflectedObjectW, reflectedObjectH; + unsigned char *tmpBitmap; + int tmpBitmapW, tmpBitmapH; /* Allocate back buffer */ backBuffer = (unsigned short*) malloc(BB_SIZE * BB_SIZE * sizeof(unsigned short)); @@ -91,14 +111,14 @@ static int init(void) convert32To16((unsigned int*)background, background, backgroundW * NORMALMAP_SCANLINE); /* Normalmap will keep its 32 bit color */ /* Load reflected objects */ - if (!(reflectedObject = img_load_pixels(GROBJ_01_FILENAME, &reflectedObjectW, &reflectedObjectH, IMG_FMT_GREY8))) { + if (!(tmpBitmap = img_load_pixels(GROBJ_01_FILENAME, &tmpBitmapW, &tmpBitmapH, IMG_FMT_GREY8))) { fprintf(stderr, "failed to load image " GROBJ_01_FILENAME "\n"); return -1; } - rleEncode(reflectedObject, reflectedObjectW, reflectedObjectH); + grobj = rleEncode(tmpBitmap, tmpBitmapW, tmpBitmapH); - img_free_pixels(reflectedObject); + img_free_pixels(tmpBitmap); initScrollTables(); @@ -117,6 +137,8 @@ static void destroy(void) backBuffer = 0; img_free_pixels(background); + + rleDestroy(grobj); } static void start(long trans_time) @@ -124,17 +146,79 @@ static void start(long trans_time) lastFrameTime = time_msec; } -/* XXX add the stop function when you have an out-transition, otherwise - * it just delays the change to the next effect. - */ -/* static void stop(long trans_time) { } -*/ + + +struct { + int circleX[3]; + int circleY[3]; +} wheelState; + +static void updateWheel(float t) { + float x = 0.0f; + float y = 18.0f; + float nx, ny; + float cost, sint; + static float sin120 = 0.86602540378f; + static float cos120 = -0.5f; + + /* Rotate */ + sint = sin(t); + cost = cos(t); + nx = x * cost - y * sint; + ny = y * cost + x * sint; + x = nx; + y = ny; + wheelState.circleX[0] = (int)(x + 0.5f) + 16; + wheelState.circleY[0] = (int)(y + 0.5f) + 16; + + /* Rotate by 120 degrees, for the second circle */ + nx = x * cos120 - y * sin120; + ny = y * cos120 + x * sin120; + x = nx; + y = ny; + wheelState.circleX[1] = (int)(x + 0.5f) + 16; + wheelState.circleY[1] = (int)(y + 0.5f) + 16; + + /* 3rd circle */ + nx = x * cos120 - y * sin120; + ny = y * cos120 + x * sin120; + x = nx; + y = ny; + wheelState.circleX[2] = (int)(x + 0.5f) + 16; + wheelState.circleY[2] = (int)(y + 0.5f) + 16; +} + +#define WHEEL_CIRCLE_RADIUS 18 +#define WHEEL_CIRCLE_RADIUS_SQ (WHEEL_CIRCLE_RADIUS * WHEEL_CIRCLE_RADIUS) + +static unsigned short wheel(int x, int y) { + int cx, cy, count=0; + + /* First circle */ + cx = wheelState.circleX[0] - x; + cy = wheelState.circleY[0] - y; + if (cx*cx + cy*cy < WHEEL_CIRCLE_RADIUS_SQ) count++; + + /* 2nd circle */ + cx = wheelState.circleX[1] - x; + cy = wheelState.circleY[1] - y; + if (cx*cx + cy*cy < WHEEL_CIRCLE_RADIUS_SQ) count++; + + /* 3rd circle */ + cx = wheelState.circleX[2] - x; + cy = wheelState.circleY[2] - y; + if (cx*cx + cy*cy < WHEEL_CIRCLE_RADIUS_SQ) count++; + + if (count >= 2) return 0xFFFF; + + return 0x000F; +} 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; @@ -146,38 +230,66 @@ static void draw(void) lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f; lastFrameTime = time_msec; + /* Update mini-effects here */ + updateWheel(time_msec / 1000.0f); + /* First, render the horizon */ for (scanline = 0; scanline < HORIZON_HEIGHT; scanline++) { memcpy(dst, src, fb_width * 2); src += backgroundW; dst += BB_SIZE; } - - /* Create scroll opffsets for all scanlines of the normalmap */ + + /* Create scroll offsets for all scanlines of the normalmap */ updateScrollTables(lastFrameDuration); - /* Then, render the reflection under the horizon */ - /* dst is already in place */ - src = background + HORIZON_HEIGHT * backgroundW; + /* 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 */ + dst = backBuffer + (HORIZON_HEIGHT + 1) * BB_SIZE; + for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) { + memcpy(dst, src, (fb_width + PIXEL_PADDING) * 2); + src += backgroundW; + dst += BB_SIZE; + } + + /* Blit reflections first, to be displaced */ + for (i = 0; i < 5; i++) rleBlitScaleInv(backBuffer + PIXEL_PADDING, fb_width, fb_height, BB_SIZE, grobj, 134 + (i-3) * 60, 235, 1.0f, 1.8f); + + /* Perform displacement */ + dst = backBuffer + HORIZON_HEIGHT * BB_SIZE + PIXEL_PADDING; + src = dst + BB_SIZE; /* The pixels to be displaced are 1 scanline below */ dispScanline = displacementMap; for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) { for (i = 0; i < fb_width; i++) { d = dispScanline[(i + scrollTableRounded[scanline]) % scrollModTable[scanline]]; - *dst++ = src[i + scroll + d]; + *dst++ = src[i + d]; } src += backgroundW; dst += BB_SIZE - fb_width; dispScanline += backgroundW; } + /* Then after displacement, blit the objects */ + for (i = 0; i < 5; i++) rleBlit(backBuffer + PIXEL_PADDING, fb_width, fb_height, BB_SIZE, grobj, 134 + (i-3) * 60, 100); + + for (scanline = 0; scanline < 32; scanline++) { + for (i = 0; i < 32; i++) { + backBuffer[PIXEL_PADDING + scanline * BB_SIZE + i] = wheel(i, scanline); + } + } + /* Blit effect to framebuffer */ src = backBuffer + PIXEL_PADDING; 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; } + + swap_buffers(fb_pixels); } /* src and dst can be the same */ @@ -233,7 +345,7 @@ static void processNormal() { for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) { for (i = 0; i < backgroundW; i++) { /* Remember that MIN_SCROLL is the padding around the screen, so ti's the maximum displacement we can get (positive & negative) */ - *dst2 = 2 * MIN_SCROLL * (*dst2 - minDisplacement) / (maxDisplacement - minDisplacement) - MIN_SCROLL; + *dst2 = 2 * MAX_DISPLACEMENT * (*dst2 - minDisplacement) / (maxDisplacement - minDisplacement) - MAX_DISPLACEMENT; *dst2 = (short)((float)*dst2 / scrollScaleTable[scanline] + 0.5f); /* Displacements must also scale with distance*/ dst2++; } @@ -259,7 +371,7 @@ static void initScrollTables() { static void updateScrollTables(float dt) { int i = 0; - + nearScrollAmount += dt * NEAR_SCROLL_SPEED; nearScrollAmount = (float) fmod(nearScrollAmount, 512.0f); @@ -269,16 +381,264 @@ static void updateScrollTables(float dt) { } } -static void rleEncode(unsigned char *pixels, unsigned int w, unsigned int h) { +/* ------------------------------------------------------------------------------------------------- + * RLE STUFF + * ------------------------------------------------------------------------------------------------- + */ +/* Limit streak count per scanline so we can directly jump to specific scanline */ +#define RLE_STREAKS_PER_SCANLINE 4 +/* Every streak is encoded by 2 bytes: offset and count of black pixels in the streak */ +#define RLE_BYTES_PER_SCANLINE RLE_STREAKS_PER_SCANLINE * 2 +#define RLE_FILL_COLOR 0 +#define RLE_FILL_COLOR_32 ((RLE_FILL_COLOR << 16) | RLE_FILL_COLOR) + +#define RLE_FIXED_BITS 16 + +static RLEBitmap rleCreate(unsigned int w, unsigned int h) { + RLEBitmap ret; + ret.w = w; + ret.h = h; + + /* Add some padding at the end of the buffer, with the worst case for a scanline (w/2 streaks) */ + ret.scans = (unsigned char*) calloc(h * RLE_BYTES_PER_SCANLINE + w, 1); + + return ret; +} + +static void rleDestroy(RLEBitmap b) { + free(b.scans); +} + +static RLEBitmap rleEncode(unsigned char *pixels, unsigned int w, unsigned int h) { int scanline; int i; - int skipping = 1; + int penActive = 0; + int counter = 0; + int accum = 0; + RLEBitmap ret; + unsigned char *output; + + /* https://www.youtube.com/watch?v=RKMR02o1I88&feature=youtu.be&t=55 */ + ret = rleCreate(w, h); for (scanline = 0; scanline < h; scanline++) { + output = ret.scans + scanline * RLE_BYTES_PER_SCANLINE; + accum = 0; for (i = 0; i < w; i++) { if (*pixels++) { + if (penActive) { + if (counter >= PIXEL_PADDING) { + *output++ = (unsigned char) counter; + counter = 0; + *output++ = (unsigned char)accum; + } + counter++; + accum++; + } else { + *output++ = (unsigned char)accum; + counter = 1; + accum++; + penActive = 1; + } + } else { + if (penActive) { + *output++ = (unsigned char)counter; + counter = 1; + accum++; + penActive = 0; + } else { + counter++; + accum++; + } + } + } + + if (penActive) { + *output++ = (unsigned char)counter; + } + penActive = 0; + counter = 0; + } + + return ret; +} + +static void rleBlit(unsigned short *dst, int dstW, int dstH, int dstStride, + RLEBitmap bitmap, int blitX, int blitY) +{ + int scanline = 0; + int streakPos = 0; + int streakLength = 0; + int streak = 0; + unsigned char *input = bitmap.scans; + unsigned short *output; + unsigned int *output32; + + dst += blitX + blitY * dstStride; + + for (scanline = blitY; scanline < blitY + bitmap.h; scanline++) { + if (scanline < 0 || scanline >= dstH) continue; + for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) { + streakPos = *input++; + streakLength = *input++; + if ((streakPos + blitX) <= 0) continue; + + output = dst + streakPos; + + /* Check if we need to write the first pixel as 16bit */ + if (streakLength % 2) { + *output++ = RLE_FILL_COLOR; + } + + /* Then, write 2 pixels at a time */ + streakLength >>= 1; + output32 = (unsigned int*) output; + while (streakLength--) { + *output32++ = RLE_FILL_COLOR_32; + } + } + + dst += dstStride; + } +} + +static void interpolateScan(unsigned char *output, unsigned char *a, unsigned char *b, float t) { + static int div = 1 << 23; + int ti, i; + + t += 1.0f; + ti = (*((unsigned int*)&t)) & 0x7FFFFF; + + for (i = 0; i < RLE_BYTES_PER_SCANLINE; i++) { + if (*a == 0) { + *output++ = *b++; + a++; + } else { + if (*b == 0) { + *output++ = *a++; + b++; + } else { + *output++ = ((*b++ * ti) + (*a++ * (div - ti))) >> 23; } } } } + +static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, + RLEBitmap bitmap, int blitX, int blitY, float scaleX, float scaleY) +{ + int scanline = 0; + int streakPos = 0; + int streakLength = 0; + int streak = 0; + unsigned short *output; + unsigned int *output32; + unsigned char *input; + int scanlineCounter = 0; + static unsigned char scan[512]; + + int blitW = (int) (bitmap.w * scaleX + 0.5f); + int blitH = (int)(bitmap.h * scaleY + 0.5f); + + /* From this point on, scaleY will be inverted */ + scaleY = 1.0f / scaleY; + + int scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f); + + dst += blitX + blitY * dstStride; + + for (scanline = blitY; scanline < blitY + blitH; scanline++) { + float normalScan = scanlineCounter * scaleY; /* ScaleY is inverted */ + unsigned char *scan0 = bitmap.scans + RLE_BYTES_PER_SCANLINE * (int)normalScan; + unsigned char *scan1 = scan0 + RLE_BYTES_PER_SCANLINE; + normalScan -= (int)normalScan; + interpolateScan(scan, scan0, scan1, normalScan); + input = scan; + scanlineCounter++; + + if (scanline < 0 || scanline >= dstH) continue; + for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) { + streakPos = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + streakLength = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + + if ((streakPos + blitX) <= 0) continue; + + output = dst + streakPos; + + /* Check if we need to write the first pixel as 16bit */ + if (streakLength % 2) { + *output++ = RLE_FILL_COLOR; + } + + /* Then, write 2 pixels at a time */ + streakLength >>= 1; + output32 = (unsigned int*)output; + while (streakLength--) { + *output32++ = RLE_FILL_COLOR_32; + } + } + + dst += dstStride; + } +} + + + +static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStride, + RLEBitmap bitmap, int blitX, int blitY, float scaleX, float scaleY) +{ + int scanline = 0; + int streakPos = 0; + int streakLength = 0; + int streak = 0; + unsigned short *output; + unsigned int *output32; + unsigned char *input; + int scanlineCounter = 0; + static unsigned char scan[512]; + + int blitW = (int)(bitmap.w * scaleX + 0.5f); + int blitH = (int)(bitmap.h * scaleY + 0.5f); + + /* From this point on, scaleY will be inverted */ + scaleY = 1.0f / scaleY; + + int scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f); + + dst += blitX + blitY * dstStride; + + for (scanline = blitY; scanline > blitY - blitH; scanline--) { + float normalScan = scanlineCounter * scaleY; /* ScaleY is inverted */ + unsigned char *scan0 = bitmap.scans + RLE_BYTES_PER_SCANLINE * (int)normalScan; + unsigned char *scan1 = scan0 + RLE_BYTES_PER_SCANLINE; + normalScan -= (int)normalScan; + interpolateScan(scan, scan0, scan1, normalScan); + input = scan; + scanlineCounter++; + + if (scanline < 0 || scanline >= dstH) continue; + for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) { + streakPos = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + streakLength = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + + if ((streakPos + blitX) <= 0) continue; + + output = dst + streakPos; + + /* Check if we need to write the first pixel as 16bit */ + if (streakLength % 2) { + *output++ = RLE_FILL_COLOR; + } + + /* Then, write 2 pixels at a time */ + streakLength >>= 1; + output32 = (unsigned int*)output; + while (streakLength--) { + *output32++ = RLE_FILL_COLOR_32; + } + } + + dst -= dstStride; + } +} \ No newline at end of file