X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgrise.c;h=f354181d510962cfa49e4f18b32d2a6d14e42837;hb=7fc67193bb83e0bf6fc1583d6aa50e5ea987ab5a;hp=896b7c0b3e6457ede7cdb13ee0dadcee10c32bb5;hpb=899b88b4ab8ef15a5032e745ff34dd9b60cadc26;p=dosdemo diff --git a/src/grise.c b/src/grise.c index 896b7c0..f354181 100644 --- a/src/grise.c +++ b/src/grise.c @@ -14,15 +14,17 @@ typedef struct { unsigned char *scans; } RLEBitmap; -static RLEBitmap rleCreate(unsigned int w, unsigned int h); -static void rleDestroy(RLEBitmap b); +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); + 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); + 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); + RLEBitmap *bitmap, int blitX, int blitY, float scaleX, float scaleY); +static RLEBitmap *rleEncode(RLEBitmap *b, unsigned char *pixels, unsigned int w, unsigned int h); + +static void updatePropeller(float t); #define BG_FILENAME "data/grise.png" #define GROBJ_01_FILENAME "data/grobj_01.png" @@ -33,7 +35,7 @@ static RLEBitmap rleEncode(unsigned char *pixels, unsigned int w, unsigned int h #define PIXEL_PADDING 32 /* Make sure this is less than PIXEL_PADDING*/ -#define MAX_DISPLACEMENT 16 +#define MAX_DISPLACEMENT 16 #define MIN_SCROLL PIXEL_PADDING #define MAX_SCROLL (backgroundW - fb_width - MIN_SCROLL) @@ -76,7 +78,9 @@ static int scrollTableRounded[REFLECTION_HEIGHT]; static int scrollModTable[REFLECTION_HEIGHT]; static float nearScrollAmount = 0.0f; -static RLEBitmap grobj; +static char miniFXBuffer[1024]; + +static RLEBitmap *grobj = 0; static struct screen scr = { "galaxyrise", @@ -99,7 +103,7 @@ static int init(void) int tmpBitmapW, tmpBitmapH; /* Allocate back buffer */ - backBuffer = (unsigned short*) malloc(BB_SIZE * BB_SIZE * sizeof(unsigned short)); + backBuffer = (unsigned short*) calloc(BB_SIZE * BB_SIZE, sizeof(unsigned short)); /* grise.png contains the background (horizon), baked reflection and normalmap for displacement */ if (!(background = img_load_pixels(BG_FILENAME, &backgroundW, &backgroundH, IMG_FMT_RGBA32))) { @@ -116,7 +120,7 @@ static int init(void) return -1; } - grobj = rleEncode(tmpBitmap, tmpBitmapW, tmpBitmapH); + grobj = rleEncode(0, tmpBitmap, tmpBitmapW, tmpBitmapH); img_free_pixels(tmpBitmap); @@ -150,6 +154,9 @@ static void stop(long trans_time) { } + + + static void draw(void) { int scroll = MIN_SCROLL + (MAX_SCROLL - MIN_SCROLL) * mouse_x / fb_width; @@ -163,6 +170,9 @@ static void draw(void) lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f; lastFrameTime = time_msec; + /* Update mini-effects here */ + updatePropeller(time_msec / 1000.0f); + /* First, render the horizon */ for (scanline = 0; scanline < HORIZON_HEIGHT; scanline++) { memcpy(dst, src, fb_width * 2); @@ -204,16 +214,22 @@ 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, 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] = miniFXBuffer[i + 32 * scanline] ? 0xFFFF : 0x0000; + } + } + /* Blit effect to framebuffer */ src = backBuffer + PIXEL_PADDING; - dst = fb_pixels; + dst = vmem_back; for (scanline = 0; scanline < fb_height; scanline++) { memcpy(dst, src, fb_width * 2); src += BB_SIZE; dst += fb_width; } - swap_buffers(fb_pixels); + swap_buffers(0); } /* src and dst can be the same */ @@ -316,35 +332,38 @@ static void updateScrollTables(float dt) { #define RLE_FILL_COLOR 0 #define RLE_FILL_COLOR_32 ((RLE_FILL_COLOR << 16) | RLE_FILL_COLOR) -static RLEBitmap rleCreate(unsigned int w, unsigned int h) { - RLEBitmap ret; - ret.w = w; - ret.h = h; +#define RLE_FIXED_BITS 16 + +static RLEBitmap *rleCreate(unsigned int w, unsigned int h) { + RLEBitmap *ret = (RLEBitmap*)malloc(sizeof(RLEBitmap)); + 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); + ret->scans = (unsigned char*) calloc(h * RLE_BYTES_PER_SCANLINE + w, 1); return ret; } -static void rleDestroy(RLEBitmap b) { - free(b.scans); +static void rleDestroy(RLEBitmap *b) { + if (!b) return; + free(b->scans); + free(b); } -static RLEBitmap rleEncode(unsigned char *pixels, unsigned int w, unsigned int h) { +static RLEBitmap *rleEncode(RLEBitmap *b, unsigned char *pixels, unsigned int w, unsigned int h) { int scanline; int i; 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); + if (!b) b = rleCreate(w, h); for (scanline = 0; scanline < h; scanline++) { - output = ret.scans + scanline * RLE_BYTES_PER_SCANLINE; + output = b->scans + scanline * RLE_BYTES_PER_SCANLINE; accum = 0; for (i = 0; i < w; i++) { if (*pixels++) { @@ -382,23 +401,23 @@ static RLEBitmap rleEncode(unsigned char *pixels, unsigned int w, unsigned int h counter = 0; } - return ret; + return b; } 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; int streakLength = 0; int streak = 0; - unsigned char *input = bitmap.scans; + unsigned char *input = bitmap->scans; unsigned short *output; unsigned int *output32; dst += blitX + blitY * dstStride; - for (scanline = blitY; scanline < blitY + bitmap.h; scanline++) { + 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++; @@ -433,12 +452,22 @@ static void interpolateScan(unsigned char *output, unsigned char *a, unsigned ch ti = (*((unsigned int*)&t)) & 0x7FFFFF; for (i = 0; i < RLE_BYTES_PER_SCANLINE; i++) { - *output++ = ((*b++ * ti) + (*a++ * (div - ti))) >> 23; + 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) + RLEBitmap *bitmap, int blitX, int blitY, float scaleX, float scaleY) { int scanline = 0; int streakPos = 0; @@ -450,14 +479,19 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, int scanlineCounter = 0; static unsigned char scan[512]; - int blitW = (int) (bitmap.w * scaleX + 0.5f); - int blitH = (int)(bitmap.h * scaleY + 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 */ + 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; - unsigned char *scan0 = bitmap.scans + RLE_BYTES_PER_SCANLINE * (int)normalScan; + 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); @@ -466,8 +500,8 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, if (scanline < 0 || scanline >= dstH) continue; for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) { - streakPos = (int) ((*input++) * scaleX + 0.5f); - streakLength = (int)((*input++) * scaleX + 0.5f); + streakPos = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + streakLength = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; if ((streakPos + blitX) <= 0) continue; @@ -490,8 +524,10 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride, } } + + static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStride, - RLEBitmap bitmap, int blitX, int blitY, float scaleX, float scaleY) + RLEBitmap *bitmap, int blitX, int blitY, float scaleX, float scaleY) { int scanline = 0; int streakPos = 0; @@ -503,14 +539,19 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri int scanlineCounter = 0; static unsigned char scan[512]; - int blitW = (int)(bitmap.w * scaleX + 0.5f); - int blitH = (int)(bitmap.h * scaleY + 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 */ + 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; - unsigned char *scan0 = bitmap.scans + RLE_BYTES_PER_SCANLINE * (int)normalScan; + 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); @@ -519,8 +560,8 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri if (scanline < 0 || scanline >= dstH) continue; for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) { - streakPos = (int)((*input++) * scaleX + 0.5f); - streakLength = (int)((*input++) * scaleX + 0.5f); + streakPos = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; + streakLength = (*input++ * scaleXFixed) >> RLE_FIXED_BITS; if ((streakPos + blitX) <= 0) continue; @@ -541,4 +582,80 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri dst -= dstStride; } -} \ No newline at end of file +} + +/* ------------------------------------------------------------------------------------------------- +* PROPELLER STUFF +* ------------------------------------------------------------------------------------------------- +*/ + +#define PROPELLER_CIRCLE_RADIUS 18 +#define PROPELLER_CIRCLE_RADIUS_SQ (PROPELLER_CIRCLE_RADIUS * PROPELLER_CIRCLE_RADIUS) + +static struct { + int circleX[3]; + int circleY[3]; +} propellerState; + +static void updatePropeller(float t) { + int i, j; + int cx, cy, count = 0; + char *dst; + 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; + propellerState.circleX[0] = (int)(x + 0.5f) + 16; + propellerState.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; + propellerState.circleX[1] = (int)(x + 0.5f) + 16; + propellerState.circleY[1] = (int)(y + 0.5f) + 16; + + /* 3rd circle */ + nx = x * cos120 - y * sin120; + ny = y * cos120 + x * sin120; + x = nx; + y = ny; + propellerState.circleX[2] = (int)(x + 0.5f) + 16; + propellerState.circleY[2] = (int)(y + 0.5f) + 16; + + /* Write effect to the mini fx buffer*/ + dst = miniFXBuffer; + for (j = 0; j < 32; j++) { + for (i = 0; i < 32; i++) { + count = 0; + + /* First circle */ + cx = propellerState.circleX[0] - i; + cy = propellerState.circleY[0] - j; + if (cx*cx + cy*cy < PROPELLER_CIRCLE_RADIUS_SQ) count++; + + /* 2nd circle */ + cx = propellerState.circleX[1] - i; + cy = propellerState.circleY[1] - j; + if (cx*cx + cy*cy < PROPELLER_CIRCLE_RADIUS_SQ) count++; + + /* 3rd circle */ + cx = propellerState.circleX[2] - i; + cy = propellerState.circleY[2] - j; + if (cx*cx + cy*cy < PROPELLER_CIRCLE_RADIUS_SQ) count++; + + *dst++ = count >= 2; + } + } +}