-src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.c) $(wildcard src/scr/*.c) $(wildcard src/utils/*.c) \
+src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.c) $(wildcard src/scr/*.c) \
$(wildcard src/glut/*.c)
asmsrc = $(wildcard src/*.asm)
obj = $(src:.c=.o) $(asmsrc:.asm=.o)
src/dynarr.obj src/gfxutil.obj src/metasurf.obj src/noise.obj &
src/rbtree.obj src/screen.obj src/tinyfps.obj src/treestor.obj &
src/image.obj src/ts_text.obj src/util.obj src/util_s.obj src/cpuid.obj &
- src/cpuid_s.obj src/darray.obj src/data.obj
+ src/cpuid_s.obj src/darray.obj src/data.obj src/rlebmap.obj
scrobj = src/scr/bump.obj src/scr/fract.obj src/scr/greets.obj &
src/scr/grise.obj src/scr/hairball.obj src/scr/infcubes.obj &
src/scr/metaball.obj src/scr/plasma.obj src/scr/polytest.obj &
src/scr/smoketxt.obj src/scr/thunder.obj src/scr/tilemaze.obj &
- src/scr/tunnel.obj src/scr/cybersun.obj src/scr/raytrace.obj src/scr/rt.obj
+ src/scr/tunnel.obj src/scr/cybersun.obj src/scr/raytrace.obj &
+ src/scr/rt.obj src/scr/minifx.obj
csprobj = cspr/dbgfont.obj cspr/confont.obj
incpath = -Isrc -Isrc/dos -Isrc/3dgfx -Ilibs -Ilibs/imago/src -Ilibs/anim/src &
src\dynarr.obj src\gfxutil.obj src\metasurf.obj src\noise.obj &
src\rbtree.obj src\screen.obj src\tinyfps.obj src\treestor.obj &
src\image.obj src\ts_text.obj src\util.obj src\util_s.obj src\cpuid.obj &
- src\cpuid_s.obj src\darray.obj src\data.obj
+ src\cpuid_s.obj src\darray.obj src\data.obj src\rlebmap.obj
scrobj = src\scr\bump.obj src\scr\fract.obj src\scr\greets.obj &
src\scr\grise.obj src\scr\hairball.obj src\scr\infcubes.obj &
src\scr\metaball.obj src\scr\plasma.obj src\scr\polytest.obj &
src\scr\smoketxt.obj src\scr\thunder.obj src\scr\tilemaze.obj &
- src\scr\tunnel.obj src\scr\cybersun.obj src\scr\raytrace.obj src\scr\rt.obj
+ src\scr\tunnel.obj src\scr\cybersun.obj src\scr\raytrace.obj &
+ src\scr\rt.obj src\scr\minifx.obj
csprobj = cspr\dbgfont.obj cspr\confont.obj
incpath = -Isrc -Isrc\dos -Isrc\3dgfx -Ilibs -Ilibs\imago\src -Ilibs\anim\src &
+++ /dev/null
-#include "demo.h"
-#include "imago2.h"
-#include "screen.h"
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <RleBitmap.h>
-
-/* APPROX. 170 FPS Minimum */
-
-static int init(void);
-static void destroy(void);
-static void start(long trans_time);
-static void stop(long trans_time);
-static void draw(void);
-
-static void updatePropeller(float t, RleBitmap *rle);
-
-static unsigned short *backBuffer;
-
-static unsigned char miniFXBuffer[1024];
-
-static long lastFrameTime = 0;
-
-static struct screen scr = {"minifx", init, destroy, start, 0, draw};
-
-struct screen *minifx_screen(void) {
- return &scr;
-}
-
-static int init(void) {
- /* Allocate back buffer */
- backBuffer = (unsigned short *)calloc(FB_WIDTH * FB_HEIGHT, sizeof(unsigned short));
-
- return 0;
-}
-
-static void destroy(void) {
- free(backBuffer);
- backBuffer = 0;
-}
-
-static void start(long trans_time) { lastFrameTime = time_msec; }
-
-static void draw(void) {
- long lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f;
- lastFrameTime = time_msec;
-
- int clearColor = 0x888888;
- unsigned short clearColor16 = ((clearColor << 8) & 0xF800) /* R */
- | ((clearColor >> 5) & 0x07E0) /* G */
- | ((clearColor >> 19) & 0x001F); /* B */
- for (int i=0; i<FB_WIDTH * FB_HEIGHT; i++) {
- backBuffer[i] = clearColor16;
- }
-
- /* For now create / destroy in each frame. We will manage these later */
- RleBitmap *rle = rleCreate(32, 32);
-
- updatePropeller(time_msec / 1000.0f, rle);
- int stride = FB_WIDTH;
- /*
- rleBlit(rle, backBuffer, FB_WIDTH, FB_HEIGHT, stride,
- 100, 100);
- */
-
- rleBlitScale(rle, backBuffer, FB_WIDTH, FB_HEIGHT, stride, 50,
- 50, 3.0, 3.0);
-
- rleDestroy(rle);
-
- /* Blit effect to framebuffer */
- memcpy(fb_pixels, backBuffer, FB_WIDTH * FB_HEIGHT * sizeof(unsigned short));
- swap_buffers(0);
-}
-
-
-#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, RleBitmap *rle) {
-
- t *= 0.1; /* Slow-mo to see what happens */
- int i, j;
- int cx, cy, count = 0;
- unsigned 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;
- }
- }
-
- /* Then, encode to rle */
- rleEncode(rle, miniFXBuffer, 32, 32);
-
- /* Distribute the produced streaks so that they don't produce garbage when interpolated */
- rleDistributeStreaks(rle);
-}
--- /dev/null
+#include <stdlib.h>
+#include <string.h>
+#include "rlebmap.h"
+
+/* Number of numbers per scanline. Each streak has 2 numbers (start, length) */
+#define RLE_ELEMENTS_PER_SCANLINE RLE_STREAKS_PER_SCANLINE * 2
+
+/* Two RLE_TYPE elements per streak (= start,length) */
+#define RLE_BYTES_PER_SCANLINE RLE_ELEMENTS_PER_SCANLINE * sizeof(RLE_TYPE)
+
+/* RLE_TYPE count required for storing an RLE of w,h */
+static int rleWorstCaseElementCount(int w, int h) {
+ /* Allocate an extra worst case for one scanline, which is w/2 streaks = w
+ * (start,length) elements */
+ return h * RLE_ELEMENTS_PER_SCANLINE + w;
+}
+
+/* Byte count of the 'scans' buffer */
+static int rleScansByteCount(RleBitmap *rle) {
+ return rleWorstCaseElementCount(rle->w, rle->h) * sizeof(RLE_TYPE);
+}
+
+RleBitmap *rleCreate(unsigned int w, unsigned int h) {
+ RleBitmap *ret = malloc(sizeof(RleBitmap));
+ ret->w = w;
+ ret->h = h;
+
+ /* Allocate scans */
+ ret->scans = calloc(rleWorstCaseElementCount(w, h), sizeof(RLE_TYPE));
+
+ return ret;
+}
+
+void rleDestroy(RleBitmap *b) {
+ if (!b)
+ return;
+ free(b->scans);
+ free(b);
+}
+
+void rleClear(RleBitmap *rle) { memset(rle->scans, 0, rleScansByteCount(rle)); }
+
+RleBitmap *rleEncode(RleBitmap *rle, unsigned char *pixels, unsigned int pixelsW,
+ unsigned int pixelsH) {
+ int x = 0;
+ int y = 0;
+ int streakActive = 0;
+ int currentStreakLength = 0;
+ RLE_TYPE *output = 0;
+ unsigned char *currentInputPixel = pixels;
+
+ /* https://www.youtube.com/watch?v=RKMR02o1I88&feature=youtu.be&t=55 */
+ if (!rle)
+ rle = rleCreate(pixelsW, pixelsH);
+ else
+ rleClear(rle); /* The following code assumes cleared array */
+
+ for (y = 0; y < pixelsH; y++) {
+ /* Go to the beginning of the RLE scan */
+ output = rle->scans + y * RLE_ELEMENTS_PER_SCANLINE;
+
+ for (x = 0; x < pixelsW; x++) {
+ if (*currentInputPixel++) {
+ if (streakActive) {
+ if (currentStreakLength >= RLE_MAX_STREAK_LENGTH) {
+ /* Do not allow streaks of more than max length -
+ * close current streak */
+ *output++ = (RLE_TYPE)currentStreakLength;
+
+ /* Begin new streak at current x */
+ *output++ = (RLE_TYPE)x;
+ currentStreakLength = 0;
+ }
+ } else {
+ /* Begin new streak */
+ *output++ = (RLE_TYPE)x;
+ currentStreakLength = 0;
+ streakActive = 1;
+ }
+ currentStreakLength++;
+ } else {
+ if (streakActive) {
+ /* Close current streak */
+ *output++ = (RLE_TYPE)currentStreakLength;
+ currentStreakLength = 0;
+ streakActive = 0;
+ }
+ } /* End if (current pixel on) */
+ } /* End for (all x) */
+
+ /* We reached the end of the scan - close any active streak */
+ if (streakActive) {
+ *output++ = (RLE_TYPE)currentStreakLength;
+ }
+ streakActive = 0;
+ currentStreakLength = 0;
+ } /* End for (all scans */
+
+ return rle;
+}
+
+void rleDistributeStreaks(RleBitmap *rle) {
+ int scanline = 0;
+ int halfW = rle->w >> 1;
+ RLE_TYPE *ptr = 0;
+ RLE_TYPE tmp = 0;
+
+#define LAST_STREAK RLE_STREAKS_PER_SCANLINE
+
+ ptr = rle->scans;
+ for (scanline = 0; scanline < rle->h; scanline++) {
+ if (ptr[0] >= halfW) {
+ /* Exchange first with last streak */
+ tmp = ptr[0];
+ ptr[0] = ptr[LAST_STREAK * 2 - 2];
+ ptr[LAST_STREAK * 2 - 2] = tmp;
+ tmp = ptr[1];
+ ptr[1] = ptr[LAST_STREAK * 2 - 1];
+ ptr[LAST_STREAK * 2 - 1] = tmp;
+ }
+
+ ptr += 8;
+ }
+}
+
+void rleBlit(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
+ int blitY) {
+ int scanline = 0;
+ int streakPos = 0;
+ int streakLength = 0;
+ int streak = 0;
+ RLE_TYPE *input = rle->scans;
+ unsigned short *output;
+ unsigned int *output32;
+
+ dst += blitX + blitY * dstStride;
+
+ for (scanline = blitY; scanline < blitY + rle->h; scanline++) {
+ if (scanline < 0 || scanline >= dstH)
+ continue;
+ for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) {
+ streakPos = (int)*input++;
+ streakLength = (int)*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;
+ }
+}
+
+/* This is madness. We could at least check that we are not interpolating from 0 -> something
+ * (length). This could remove the need for 'distributeScans' */
+void interpolateScan(RLE_TYPE *output, RLE_TYPE *a, RLE_TYPE *b, float t) {
+ static int div = 1 << 23;
+ int ti, i;
+
+ t += 1.0f;
+ ti = (*((unsigned int *)&t)) & 0x7FFFFF;
+
+ for (i = 0; i < RLE_ELEMENTS_PER_SCANLINE; i++) {
+ if (*a == 0) {
+ *output++ = *b++;
+ a++;
+ } else {
+ if (*b == 0) {
+ *output++ = *a++;
+ b++;
+ } else {
+ *output++ = ((*b++ * ti) + (*a++ * (div - ti))) >> 23;
+ }
+ }
+ }
+}
+
+void rleBlitScale(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, 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;
+ int scaleXFixed;
+ static unsigned char scan[512];
+
+ /*int blitW = (int)(rle->w * scaleX + 0.5f);*/
+ int blitH = (int)(rle->h * scaleY + 0.5f);
+
+ /* From this point on, scaleY will be inverted */
+ scaleY = 1.0f / scaleY;
+
+ 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 = rle->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;
+ }
+}
+
+void rleBlitScaleInv(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride,
+ 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;
+ int scaleXFixed;
+ static unsigned char scan[512];
+
+ /*int blitW = (int)(rle->w * scaleX + 0.5f);*/
+ int blitH = (int)(rle->h * scaleY + 0.5f);
+
+ /* From this point on, scaleY will be inverted */
+ scaleY = 1.0f / scaleY;
+
+ 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 = rle->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;
+ }
+}
--- /dev/null
+#ifndef __RLE_BITMAP_H__
+#define __RLE_BITMAP_H__
+
+/* Limit streak count per scanline so we can directly jump to specific scanline
+ */
+#define RLE_STREAKS_PER_SCANLINE 4
+
+/* Streaks will not exceed this many pixels. This allows us to optimize with a
+ * padded framebuffer. If a streak start position happens to lie within
+ * framebuffer, we will blit it without checking for out of bounds */
+#define RLE_MAX_STREAK_LENGTH 32
+
+/* Using the following type for storing start and for storing length in (start,
+ * length) pairs. */
+#define RLE_TYPE unsigned char
+
+/* For now, keep a static fill color. We can change this. Not that much about
+ * speed, but let's keep function definitions more compact. */
+#define RLE_FILL_COLOR 0
+
+/* Two entries of RLE_FILL_COLOR (16 bits) packed one after the other. */
+#define RLE_FILL_COLOR_32 ((RLE_FILL_COLOR << 16) | RLE_FILL_COLOR)
+
+/* For fixed-point arithmetic. Used for scaling. */
+#define RLE_FIXED_BITS 16
+
+/* This is a bitmap (image in 1bpp), encoded as streaks of consecutive pixels.
+ */
+typedef struct {
+ unsigned int w, h;
+
+ /* Each scan is RLE_BYTES_PER_SCANLINE long and contains pairs of
+ * (start, length). */
+ RLE_TYPE *scans;
+} RleBitmap;
+
+/* Constructor */
+RleBitmap *rleCreate(unsigned int w, unsigned int h);
+
+/* Destructor */
+void rleDestroy(RleBitmap *rle);
+
+/* Clears 'rle' to "all transparent" */
+void rleClear(RleBitmap *rle);
+
+/* Encode 'pixels' into 'rle' and also return it. Pixels are either 0 or 1. This
+ * will create an RleBitmap of 'h' scanlines. */
+RleBitmap *rleEncode(RleBitmap *rle, unsigned char *pixels, unsigned int pixelsW,
+ unsigned int pixelsH);
+
+/* Rearranges the streaks to make it less frequent that they produce garbege when interpolated */
+void rleDistributeStreaks(RleBitmap *rle);
+
+/* Blits without scaling */
+void rleBlit(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
+ int blitY);
+
+/* Scaled blit */
+void rleBlitScale(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
+ int blitY, float scaleX, float scaleY);
+
+/* Inverted blit (upside down) */
+void rleBlitScaleInv(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride,
+ int blitX, int blitY, float scaleX, float scaleY);
+
+#endif // __RLE_BITMAP_H__
#include <stdlib.h>
#include <string.h>
-#include <RleBitmap.h>
+#include "rlebmap.h"
/* APPROX. 170 FPS Minimum */
--- /dev/null
+#include "demo.h"
+#include "imago2.h"
+#include "screen.h"
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "rlebmap.h"
+
+/* APPROX. 170 FPS Minimum */
+
+static int init(void);
+static void destroy(void);
+static void start(long trans_time);
+static void stop(long trans_time);
+static void draw(void);
+
+static void updatePropeller(float t, RleBitmap *rle);
+
+static unsigned short *backBuffer;
+
+static unsigned char miniFXBuffer[1024];
+
+static long lastFrameTime = 0;
+
+static struct screen scr = {"minifx", init, destroy, start, 0, draw};
+
+struct screen *minifx_screen(void) {
+ return &scr;
+}
+
+static int init(void) {
+ /* Allocate back buffer */
+ backBuffer = calloc(FB_WIDTH * FB_HEIGHT, sizeof(unsigned short));
+
+ return 0;
+}
+
+static void destroy(void) {
+ free(backBuffer);
+ backBuffer = 0;
+}
+
+static void start(long trans_time) { lastFrameTime = time_msec; }
+
+static void draw(void) {
+ long lastFrameDuration;
+ int i, stride;
+ RleBitmap *rle;
+ int clearColor;
+ unsigned short clearColor16;
+
+ lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f;
+ lastFrameTime = time_msec;
+
+ clearColor = 0x888888;
+ clearColor16 = ((clearColor << 8) & 0xF800) /* R */
+ | ((clearColor >> 5) & 0x07E0) /* G */
+ | ((clearColor >> 19) & 0x001F); /* B */
+
+ for (i=0; i<FB_WIDTH * FB_HEIGHT; i++) {
+ backBuffer[i] = clearColor16;
+ }
+
+ /* For now create / destroy in each frame. We will manage these later */
+ rle = rleCreate(32, 32);
+
+ updatePropeller(time_msec / 1000.0f, rle);
+ stride = FB_WIDTH;
+ /*
+ rleBlit(rle, backBuffer, FB_WIDTH, FB_HEIGHT, stride,
+ 100, 100);
+ */
+
+ rleBlitScale(rle, backBuffer, FB_WIDTH, FB_HEIGHT, stride, 50,
+ 50, 3.0, 3.0);
+
+ rleDestroy(rle);
+
+ /* Blit effect to framebuffer */
+ memcpy(fb_pixels, backBuffer, FB_WIDTH * FB_HEIGHT * sizeof(unsigned short));
+ swap_buffers(0);
+}
+
+
+#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, RleBitmap *rle) {
+
+ int i, j;
+ int cx, cy, count = 0;
+ unsigned 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;
+
+ t *= 0.1; /* Slow-mo to see what happens */
+
+ /* 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;
+ }
+ }
+
+ /* Then, encode to rle */
+ rleEncode(rle, miniFXBuffer, 32, 32);
+
+ /* Distribute the produced streaks so that they don't produce garbage when interpolated */
+ rleDistributeStreaks(rle);
+}
+++ /dev/null
-#include "RleBitmap.h"
-#include <malloc.h>
-#include <string.h>
-
-/* Number of numbers per scanline. Each streak has 2 numbers (start, length) */
-#define RLE_ELEMENTS_PER_SCANLINE RLE_STREAKS_PER_SCANLINE * 2
-
-/* Two RLE_TYPE elements per streak (= start,length) */
-#define RLE_BYTES_PER_SCANLINE RLE_ELEMENTS_PER_SCANLINE * sizeof(RLE_TYPE)
-
-/* RLE_TYPE count required for storing an RLE of w,h */
-static int rleWorstCaseElementCount(int w, int h) {
- /* Allocate an extra worst case for one scanline, which is w/2 streaks = w
- * (start,length) elements */
- return h * RLE_ELEMENTS_PER_SCANLINE + w;
-}
-
-/* Byte count of the 'scans' buffer */
-static int rleScansByteCount(RleBitmap *rle) {
- return rleWorstCaseElementCount(rle->w, rle->h) * sizeof(RLE_TYPE);
-}
-
-RleBitmap *rleCreate(unsigned int w, unsigned int h) {
- RleBitmap *ret = (RleBitmap *)malloc(sizeof(RleBitmap));
- ret->w = w;
- ret->h = h;
-
- /* Allocate scans */
- ret->scans = (RLE_TYPE *)calloc(rleWorstCaseElementCount(w, h), sizeof(RLE_TYPE));
-
- return ret;
-}
-
-void rleDestroy(RleBitmap *b) {
- if (!b)
- return;
- free(b->scans);
- free(b);
-}
-
-void rleClear(RleBitmap *rle) { memset(rle->scans, 0, rleScansByteCount(rle)); }
-
-RleBitmap *rleEncode(RleBitmap *rle, unsigned char *pixels, unsigned int pixelsW,
- unsigned int pixelsH) {
- int x = 0;
- int y = 0;
- int streakActive = 0;
- int currentStreakLength = 0;
- RLE_TYPE *output = 0;
- unsigned char *currentInputPixel = pixels;
-
- /* https://www.youtube.com/watch?v=RKMR02o1I88&feature=youtu.be&t=55 */
- if (!rle)
- rle = rleCreate(pixelsW, pixelsH);
- else
- rleClear(rle); /* The following code assumes cleared array */
-
- for (y = 0; y < pixelsH; y++) {
- /* Go to the beginning of the RLE scan */
- output = rle->scans + y * RLE_ELEMENTS_PER_SCANLINE;
-
- for (x = 0; x < pixelsW; x++) {
- if (*currentInputPixel++) {
- if (streakActive) {
- if (currentStreakLength >= RLE_MAX_STREAK_LENGTH) {
- /* Do not allow streaks of more than max length -
- * close current streak */
- *output++ = (RLE_TYPE)currentStreakLength;
-
- /* Begin new streak at current x */
- *output++ = (RLE_TYPE)x;
- currentStreakLength = 0;
- }
- } else {
- /* Begin new streak */
- *output++ = (RLE_TYPE)x;
- currentStreakLength = 0;
- streakActive = 1;
- }
- currentStreakLength++;
- } else {
- if (streakActive) {
- /* Close current streak */
- *output++ = (RLE_TYPE)currentStreakLength;
- currentStreakLength = 0;
- streakActive = 0;
- }
- } /* End if (current pixel on) */
- } /* End for (all x) */
-
- /* We reached the end of the scan - close any active streak */
- if (streakActive) {
- *output++ = (RLE_TYPE)currentStreakLength;
- }
- streakActive = 0;
- currentStreakLength = 0;
- } /* End for (all scans */
-
- return rle;
-}
-
-void rleDistributeStreaks(RleBitmap *rle) {
- int scanline = 0;
- int halfW = rle->w >> 1;
- RLE_TYPE *ptr = 0;
- RLE_TYPE tmp = 0;
-
-#define LAST_STREAK RLE_STREAKS_PER_SCANLINE
-
- ptr = rle->scans;
- for (scanline = 0; scanline < rle->h; scanline++) {
- if (ptr[0] >= halfW) {
- /* Exchange first with last streak */
- tmp = ptr[0];
- ptr[0] = ptr[LAST_STREAK * 2 - 2];
- ptr[LAST_STREAK * 2 - 2] = tmp;
- tmp = ptr[1];
- ptr[1] = ptr[LAST_STREAK * 2 - 1];
- ptr[LAST_STREAK * 2 - 1] = tmp;
- }
-
- ptr += 8;
- }
-}
-
-void rleBlit(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
- int blitY) {
- int scanline = 0;
- int streakPos = 0;
- int streakLength = 0;
- int streak = 0;
- RLE_TYPE *input = rle->scans;
- unsigned short *output;
- unsigned int *output32;
-
- dst += blitX + blitY * dstStride;
-
- for (scanline = blitY; scanline < blitY + rle->h; scanline++) {
- if (scanline < 0 || scanline >= dstH)
- continue;
- for (streak = 0; streak < RLE_STREAKS_PER_SCANLINE; streak++) {
- streakPos = (int)*input++;
- streakLength = (int)*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;
- }
-}
-
-/* This is madness. We could at least check that we are not interpolating from 0 -> something
- * (length). This could remove the need for 'distributeScans' */
-void interpolateScan(RLE_TYPE *output, RLE_TYPE *a, RLE_TYPE *b, float t) {
- static int div = 1 << 23;
- int ti, i;
-
- t += 1.0f;
- ti = (*((unsigned int *)&t)) & 0x7FFFFF;
-
- for (i = 0; i < RLE_ELEMENTS_PER_SCANLINE; i++) {
- if (*a == 0) {
- *output++ = *b++;
- a++;
- } else {
- if (*b == 0) {
- *output++ = *a++;
- b++;
- } else {
- *output++ = ((*b++ * ti) + (*a++ * (div - ti))) >> 23;
- }
- }
- }
-}
-
-void rleBlitScale(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, 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;
- int scaleXFixed;
- static unsigned char scan[512];
-
- /*int blitW = (int)(rle->w * scaleX + 0.5f);*/
- int blitH = (int)(rle->h * scaleY + 0.5f);
-
- /* From this point on, scaleY will be inverted */
- scaleY = 1.0f / scaleY;
-
- 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 = rle->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;
- }
-}
-
-void rleBlitScaleInv(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride,
- 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;
- int scaleXFixed;
- static unsigned char scan[512];
-
- /*int blitW = (int)(rle->w * scaleX + 0.5f);*/
- int blitH = (int)(rle->h * scaleY + 0.5f);
-
- /* From this point on, scaleY will be inverted */
- scaleY = 1.0f / scaleY;
-
- 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 = rle->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;
- }
-}
+++ /dev/null
-#ifndef __RLE_BITMAP_H__
-#define __RLE_BITMAP_H__
-
-/* Limit streak count per scanline so we can directly jump to specific scanline
- */
-#define RLE_STREAKS_PER_SCANLINE 4
-
-/* Streaks will not exceed this many pixels. This allows us to optimize with a
- * padded framebuffer. If a streak start position happens to lie within
- * framebuffer, we will blit it without checking for out of bounds */
-#define RLE_MAX_STREAK_LENGTH 32
-
-/* Using the following type for storing start and for storing length in (start,
- * length) pairs. */
-#define RLE_TYPE unsigned char
-
-/* For now, keep a static fill color. We can change this. Not that much about
- * speed, but let's keep function definitions more compact. */
-#define RLE_FILL_COLOR 0
-
-/* Two entries of RLE_FILL_COLOR (16 bits) packed one after the other. */
-#define RLE_FILL_COLOR_32 ((RLE_FILL_COLOR << 16) | RLE_FILL_COLOR)
-
-/* For fixed-point arithmetic. Used for scaling. */
-#define RLE_FIXED_BITS 16
-
-/* This is a bitmap (image in 1bpp), encoded as streaks of consecutive pixels.
- */
-typedef struct {
- unsigned int w, h;
-
- /* Each scan is RLE_BYTES_PER_SCANLINE long and contains pairs of
- * (start, length). */
- RLE_TYPE *scans;
-} RleBitmap;
-
-/* Constructor */
-RleBitmap *rleCreate(unsigned int w, unsigned int h);
-
-/* Destructor */
-void rleDestroy(RleBitmap *rle);
-
-/* Clears 'rle' to "all transparent" */
-void rleClear(RleBitmap *rle);
-
-/* Encode 'pixels' into 'rle' and also return it. Pixels are either 0 or 1. This
- * will create an RleBitmap of 'h' scanlines. */
-RleBitmap *rleEncode(RleBitmap *rle, unsigned char *pixels, unsigned int pixelsW,
- unsigned int pixelsH);
-
-/* Rearranges the streaks to make it less frequent that they produce garbege when interpolated */
-void rleDistributeStreaks(RleBitmap *rle);
-
-/* Blits without scaling */
-void rleBlit(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
- int blitY);
-
-/* Scaled blit */
-void rleBlitScale(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride, int blitX,
- int blitY, float scaleX, float scaleY);
-
-/* Inverted blit (upside down) */
-void rleBlitScaleInv(RleBitmap *rle, unsigned short *dst, int dstW, int dstH, int dstStride,
- int blitX, int blitY, float scaleX, float scaleY);
-
-#endif // __RLE_BITMAP_H__
projects / dosdemo / commitdiff