#include <math.h>
#include <assert.h>
#include <imago2.h>
+#ifndef NO_THREADS
#include "tpool.h"
+#endif
#include "demo.h"
#include "screen.h"
+#define VSCALE 1.5
+
#define TEX_FNAME "data/grid.png"
#define TEX_USCALE 4
#define TEX_VSCALE 2
-#define USCALE 2
-#define VSCALE 1
+#define NUM_WORK_ITEMS 8
+
+static struct work {
+ void *pixels;
+ int starty, num_lines;
+ long tm;
+ int xoffs, yoffs;
+} work[NUM_WORK_ITEMS];
static int init(void);
static void destroy(void);
static void stop(long trans_time);
static void draw(void);
-static void (*draw_tunnel_range)(void*, int, int, long);
+static void (*draw_tunnel_range)(void*, int, int, int, int, long);
-static void draw_tunnel_range16(void *pixels, int starty, int num_lines, long tm);
-static void draw_tunnel_range32(void *pixels, int starty, int num_lines, long tm);
+static void draw_tunnel_range16(void *pixels, int xoffs, int yoffs, int starty, int num_lines, long tm);
+static void draw_tunnel_range32(void *pixels, int xoffs, int yoffs, int starty, int num_lines, long tm);
static int count_bits(unsigned int x);
static int count_zeros(unsigned int x);
draw
};
+struct tunmap {
+ int u, v;
+ unsigned char fog;
+};
+
static int xsz, ysz, vxsz, vysz;
-static unsigned int *tunnel_map;
-static unsigned char *tunnel_fog;
+static int pan_width, pan_height;
+static struct tunmap *tunnel_map;
static int tex_xsz, tex_ysz;
static unsigned int *tex_pixels;
static int tex_xshift, tex_yshift;
static unsigned int tex_xmask, tex_ymask;
+#ifndef NO_THREADS
static struct thread_pool *tpool;
+#endif
static long trans_start, trans_dur;
static int trans_dir;
static int init(void)
{
int i, j, n;
- unsigned int *tmap;
- unsigned char *fog;
+ struct tunmap *tmap;
float aspect = (float)fb_width / (float)fb_height;
switch(fb_depth) {
return -1;
}
- xsz = fb_width;
+ xsz = fb_width / 2;
ysz = fb_height;
- vxsz = xsz / USCALE;
- vysz = ysz / VSCALE;
+ vxsz = xsz * VSCALE;
+ vysz = ysz * VSCALE;
+
+ pan_width = vxsz - xsz;
+ pan_height = vysz - ysz;
if(!(tunnel_map = malloc(vxsz * vysz * sizeof *tunnel_map))) {
fprintf(stderr, "failed to allocate tunnel map\n");
return -1;
}
- if(!(tunnel_fog = malloc(vxsz * vysz))) {
- fprintf(stderr, "failed to allocate tunnel fog map\n");
- return -1;
- }
tmap = tunnel_map;
- fog = tunnel_fog;
for(i=0; i<vysz; i++) {
float y = 2.0 * (float)i / (float)vysz - 1.0;
float d = sqrt(x * x + y * y);
float tv = d == 0.0 ? 0.0 : 1.0 / d;
- int tx = (int)(tu * 65535.0 * TEX_USCALE) & 0xffff;
- int ty = (int)(tv * 65535.0 * TEX_VSCALE) & 0xffff;
-
- int f = (int)(d * 95.0);
+ int fog = (int)(d * 128.0f);
- *tmap++ = (tx << 16) | ty;
- *fog++ = f > 255 ? 255 : f;
+ tmap->u = (int)(tu * 65535.0 * TEX_USCALE) & 0xffff;
+ tmap->v = (int)(tv * 65535.0 * TEX_VSCALE) & 0xffff;
+ tmap->fog = fog > 255 ? 255 : fog;
+ tmap++;
}
}
}
tex_yshift = n;
+#ifndef NO_THREADS
if(!(tpool = tpool_create(0))) {
fprintf(stderr, "failed to create thread pool\n");
return -1;
}
+#endif
+
+ /* initialize the constant part of all work items */
+ for(i=0; i<NUM_WORK_ITEMS; i++) {
+ int num_lines = ysz / NUM_WORK_ITEMS;
+ work[i].pixels = fb_pixels;
+ work[i].starty = i * num_lines;
+ }
return 0;
}
static void destroy(void)
{
+#ifndef NO_THREADS
tpool_destroy(tpool);
+#endif
free(tunnel_map);
- free(tunnel_fog);
}
static void start(long trans_time)
{
- trans_start = time_msec;
- trans_dur = trans_time;
- trans_dir = 1;
+ if(trans_time) {
+ trans_start = time_msec;
+ trans_dur = trans_time;
+ trans_dir = 1;
+ }
}
static void stop(long trans_time)
{
- trans_start = time_msec;
- trans_dur = trans_time;
- trans_dir = -1;
+ if(trans_time) {
+ trans_start = time_msec;
+ trans_dur = trans_time;
+ trans_dir = -1;
+ }
}
-#define NUM_WORK_ITEMS 32
-
-static struct work {
- void *pixels;
- int starty, num_lines;
- long tm;
-} work[NUM_WORK_ITEMS];
static void work_func(void *cls)
{
struct work *w = (struct work*)cls;
- draw_tunnel_range(w->pixels, w->starty, w->num_lines, w->tm);
+ draw_tunnel_range(w->pixels, w->xoffs, w->yoffs, w->starty, w->num_lines, w->tm);
}
static void draw(void)
{
- int i, num_lines = vysz / NUM_WORK_ITEMS;
+ int i, num_lines = ysz / NUM_WORK_ITEMS;
int draw_lines = num_lines;
+ float t;
+ int xoffs, yoffs;
if(trans_dir) {
long interval = time_msec - trans_start;
}
}
+ t = time_msec / 10000.0;
+ xoffs = (int)(cos(t * 3.0) * pan_width / 2) + pan_width / 2;
+ yoffs = (int)(sin(t * 4.0) * pan_height / 2) + pan_height / 2;
+
for(i=0; i<NUM_WORK_ITEMS; i++) {
- work[i].pixels = fb_pixels;
- work[i].starty = i * num_lines;
work[i].num_lines = draw_lines;
work[i].tm = time_msec;
+ work[i].xoffs = xoffs;
+ work[i].yoffs = yoffs;
+#ifdef NO_THREADS
+ work_func(work + i);
+ }
+#else
tpool_enqueue(tpool, work + i, work_func, 0);
}
tpool_wait(tpool);
+#endif
}
-static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpacked, int fog)
+static void tunnel_color(int *rp, int *gp, int *bp, long toffs, struct tunmap *tmap)
{
int r, g, b;
unsigned int col;
- unsigned int tx = (((tpacked >> 16) & 0xffff) << tex_xshift) >> 16;
- unsigned int ty = ((tpacked & 0xffff) << tex_yshift) >> 16;
+ unsigned int tx = (tmap->u << tex_xshift) >> 16;
+ unsigned int ty = (tmap->v << tex_yshift) >> 16;
tx += toffs;
ty += toffs << 1;
g = (col >> 8) & 0xff;
b = (col >> 16) & 0xff;
- *rp = (r * fog) >> 8;
- *gp = (g * fog) >> 8;
- *bp = (b * fog) >> 8;
+ *rp = (r * tmap->fog) >> 8;
+ *gp = (g * tmap->fog) >> 8;
+ *bp = (b * tmap->fog) >> 8;
}
#define PACK_RGB16(r, g, b) \
#define PACK_RGB32(r, g, b) \
((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
-static void draw_tunnel_range16(void *pix, int starty, int num_lines, long tm)
+static void draw_tunnel_range16(void *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
{
int i, j;
- unsigned int *tmap = tunnel_map + starty * vxsz;
- unsigned char *fog = tunnel_fog + starty * vxsz;
+ struct tunmap *tmap = tunnel_map + (starty + yoffs) * vxsz + xoffs;
long toffs = tm / 4;
- unsigned int *pixels = (unsigned int*)pix + starty * (xsz >> 1);
+ unsigned int *pixels = (unsigned int*)pix + starty * (fb_width >> 1);
for(i=0; i<num_lines; i++) {
- for(j=0; j<vxsz; j++) {
+ for(j=0; j<xsz; j++) {
unsigned int col;
int r, g, b;
- tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+ tunnel_color(&r, &g, &b, toffs, tmap + j);
col = PACK_RGB16(r, g, b);
- *pixels++ = col;
+ *pixels++ = (col << 16) | col;
}
+ tmap += vxsz;
}
}
-static void draw_tunnel_range32(void *pix, int starty, int num_lines, long tm)
+static void draw_tunnel_range32(void *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
{
int i, j;
- unsigned int *tmap = tunnel_map + starty * vxsz;
- unsigned char *fog = tunnel_fog + starty * vxsz;
+ struct tunmap *tmap = tunnel_map + (starty + yoffs) * vxsz + xoffs;
long toffs = tm / 4;
- unsigned int *pixels = (unsigned int*)pix + starty * xsz * VSCALE;
+ unsigned int *pixels = (unsigned int*)pix + starty * fb_width;
for(i=0; i<num_lines; i++) {
- for(j=0; j<vxsz; j++) {
+ for(j=0; j<xsz; j++) {
unsigned int col;
int r, g, b;
- tunnel_color(&r, &g, &b, toffs, *tmap++, *fog++);
+ tunnel_color(&r, &g, &b, toffs, tmap + j);
col = PACK_RGB32(r, g, b);
*pixels++ = col;
*pixels++ = col;
}
+ tmap += vxsz;
}
}
projects / fbgfx / blobdiff