*.zip
data
*.a
-\r
-/SDL.dll\r
+*.dll
+*.occ
+*.OCC
baseobj = main.obj
-demoobj = demo.obj screen.obj gfxutil.obj
-scrobj = tunnel.obj fract.obj grise.obj
+demoobj = demo.obj screen.obj gfxutil.obj 3dgfx.obj polyfill.obj
+scrobj = tunnel.obj fract.obj grise.obj polytest.obj
sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
-obj = $(baseobj) $(demoobj) $(sysobj)
+obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
bin = demo.exe
libs = imago.lib
+def = -dM_PI=3.141592653589793
opt = -5 -fp5 -otexan -oh -oi -ei
dbg = -d1
CC = wcc386
CXX = wpp386
ASFLAGS = -fobj
-CFLAGS = $(dbg) $(opt) -zq -bt=dos $(incpath)
+CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
CXXFLAGS = $(CFLAGS)
LDFLAGS = libpath $(libpath) library { $(libs) }
LD = wlink
-$(bin): $(obj) libs/imago/imago.lib
+$(bin): cflags.occ $(obj) libs/imago/imago.lib
%write objects.lnk $(obj)
$(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
.cc: src;src/dos
.asm: src;src/dos
+cflags.occ: Makefile
+ %write $@ $(CFLAGS)
+
+cxxflags.occ: Makefile
+ %write $@ $(CXXFLAGS)
+
.c.obj: .autodepend
- $(CC) -fo=$@ $(CFLAGS) $[*
+ $(CC) -fo=$@ @cflags.occ $[*
.cc.obj: .autodepend
- $(CXX) -fo=$@ $(CXXFLAGS) $[*
+ $(CXX) -fo=$@ @cxxflags.occ $[*
.asm.obj:
$(AS) $(ASFLAGS) -o $@ $[*.asm
clean: .symbolic
del *.obj
+ del *.occ
+ del *.lnk
del $(bin)
CC = wcc386
CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos -Ilibpng -Izlib -Ijpeglib
-$(alib): $(obj)
+$(alib): cflags.occ $(obj)
%write objects.lbc $(obj)
wlib -b -n $@ @objects
.c: src;libpng;jpeglib;zlib
+cflags.occ: Makefile
+ %write $@ $(CFLAGS)
+
.c.obj: .autodepend
- $(CC) -fo=$@ $(CFLAGS) $[*
+ $(CC) -fo=$@ @cflags.occ $[*
clean: .symbolic
del *.obj
+ del *.occ
+ del *.lbc
del $(alib)
g3d_mult_matrix(m);
}
-#define CROSS(res, a, b) \
- do { \
- (res)[0] = (a)[1] * (b)[2] - (a)[2] * (b)[1]; \
- (res)[1] = (a)[2] * (b)[0] - (a)[0] * (b)[2]; \
- (res)[2] = (a)[0] * (b)[1] - (a)[1] * (b)[0]; \
- } while(0)
+const float *g3d_get_matrix(int which, float *m)
+{
+ int top = st->mtop[which];
+
+ if(m) {
+ memcpy(m, st->mat[which][top], 16 * sizeof(float));
+ }
+ return st->mat[which][top];
+}
void g3d_draw(int prim, const struct g3d_vertex *varr, int varr_size)
{
- int i;
+ g3d_draw_indexed(prim, varr, varr_size, 0, 0);
+}
+
+void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
+ const int16_t *iarr, int iarr_size)
+{
+ int i, j, nfaces;
struct pvertex pv[4];
struct g3d_vertex v[4];
int vnum = prim; /* primitive vertex counts correspond to enum values */
memcpy(st->norm_mat, st->mat[G3D_MODELVIEW][mvtop], 16 * sizeof(float));
st->norm_mat[12] = st->norm_mat[13] = st->norm_mat[14] = 0.0f;
- while(varr_size >= vnum) {
- varr_size -= vnum;
+ nfaces = (iarr ? iarr_size : varr_size) / vnum;
+
+ for(j=0; j<nfaces; j++) {
for(i=0; i<vnum; i++) {
- v[i] = *varr++;
+ v[i] = iarr ? varr[*iarr++] : *varr++;
xform4_vec3(st->mat[G3D_MODELVIEW][mvtop], &v[i].x);
xform3_vec3(st->norm_mat, &v[i].nx);
#ifndef THREEDGFX_H_
#define THREEDGFX_H_
+#include "inttypes.h"
+
struct g3d_vertex {
float x, y, z, w;
float nx, ny, nz;
void g3d_frustum(float left, float right, float bottom, float top, float znear, float zfar);
void g3d_perspective(float vfov, float aspect, float znear, float zfar);
+const float *g3d_get_matrix(int which, float *m);
+
void g3d_draw(int prim, const struct g3d_vertex *varr, int varr_size);
+void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
+ const int16_t *iarr, int iarr_size);
#endif /* THREEDGFX_H_ */
int fb_width = 320;
int fb_height = 240;
int fb_bpp = 16;
-void *fb_pixels;
+uint16_t *fb_pixels, *vmem_back, *vmem_front;
unsigned long time_msec;
int mouse_x, mouse_y;
unsigned int mouse_bmask;
{
struct screen *scr;
+ start_scr_name = getenv("START_SCR");
if(argv[1]) {
start_scr_name = argv[1];
}
#ifndef DEMO_H_
#define DEMO_H_
+#include "inttypes.h"
+
extern int fb_width, fb_height, fb_bpp;
-extern void *fb_pixels;
+extern uint16_t *fb_pixels; /* system-RAM pixel buffer: use swap_buffers(fb_pixels) */
+/* video memory pointers. might both point to the front buffer if there is not
+ * enough memory for page flipping. use swap_buffers(0) to flip. */
+extern uint16_t *vmem_back, *vmem_front;
+
extern unsigned long time_msec;
extern int mouse_x, mouse_y;
extern unsigned int mouse_bmask;
void demo_keyboard(int key, int state);
+
/* defined in main_*.c */
void demo_quit(void);
unsigned long get_msec(void);
void set_palette(int idx, int r, int g, int b);
+/* pass 0 to just swap vmem_back/vmem_front with page flipping
+ * pass a pointer to a system-ram pixel buffer to copy it to vmem_front,
+ * instead of flipping.
+ */
+void swap_buffers(void *pixels);
+
#endif /* DEMO_H_ */
static int quit;
static int use_mouse;
+static long fbsize;
int main(int argc, char **argv)
{
- void *vmem;
- long fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
+ fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
init_timer(100);
kb_init(32);
return 1;
}
- if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp))) {
+ if(!(vmem_front = set_video_mode(fb_width, fb_height, fb_bpp))) {
return 1;
}
+ /* TODO implement multiple video memory pages for flipping */
+ vmem_back = vmem_front;
if(demo_init(argc, argv) == -1) {
set_text_mode();
time_msec = get_msec();
demo_draw();
-
- /*wait_vsync();*/
- memcpy(vmem, fb_pixels, fbsize);
}
break_evloop:
{
quit = 1;
}
+
+void swap_buffers(void *pixels)
+{
+ /* TODO implement page flipping */
+ if(pixels) {
+ /*wait_vsync();*/
+ memcpy(vmem_front, pixels, fbsize);
+ }
+}
draw
};
-static long aspect_24x8 = (long)(1.3333333 * 256.0);
+/*static long aspect_24x8 = (long)(1.3333333 * 256.0);*/
static long xscale_24x8 = (long)(1.3333333 * 1.2 * 256.0);
static long yscale_24x8 = (long)(1.2 * 256.0);
static int cx, cy;
}
pixels[mouse_y * fb_width + mouse_x] = 0xffe;
+
+ swap_buffers(fb_pixels);
}
static long normalize_coord(long x, long range)
dst += fb_width;
}
-
+ swap_buffers(fb_pixels);
}
/* src and dst can be the same */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include "screen.h"
#include "demo.h"
#include "3dgfx.h"
struct mesh {
int prim;
struct g3d_vertex *varr;
- unsigned int *iarr;
+ int16_t *iarr;
int vcount, icount;
};
static void draw(void);
static void draw_mesh(struct mesh *mesh);
static int gen_cube(struct mesh *mesh, float sz);
+static int gen_torus(struct mesh *mesh, float rad, float ringrad, int usub, int vsub);
+static void zsort(struct mesh *m);
static struct screen scr = {
"polytest",
draw
};
-static struct mesh cube;
+static struct mesh cube, torus;
struct screen *polytest_screen(void)
{
static int init(void)
{
gen_cube(&cube, 1.0);
+ gen_torus(&torus, 1.0, 0.25, 24, 12);
return 0;
}
static void destroy(void)
{
free(cube.varr);
+ free(torus.varr);
+ free(torus.iarr);
}
static void start(long trans_time)
g3d_rotate(phi, 1, 0, 0);
g3d_rotate(theta, 0, 1, 0);
- draw_mesh(&cube);
+ zsort(&torus);
+ draw_mesh(&torus);
+
+ swap_buffers(fb_pixels);
}
static void draw_mesh(struct mesh *mesh)
{
if(mesh->iarr) {
- /*g3d_draw_indexed(mesh->prim, mesh->iarr, mesh->icount, mesh->varr);*/
+ g3d_draw_indexed(mesh->prim, mesh->varr, mesh->vcount, mesh->iarr, mesh->icount);
} else {
g3d_draw(mesh->prim, mesh->varr, mesh->vcount);
}
return 0;
}
+
+static void torusvec(float *res, float theta, float phi, float mr, float rr)
+{
+ float rx, ry, rz;
+ theta = -theta;
+
+ rx = -cos(phi) * rr + mr;
+ ry = sin(phi) * rr;
+ rz = 0.0f;
+
+ res[0] = rx * sin(theta) + rz * cos(theta);
+ res[1] = ry;
+ res[2] = -rx * cos(theta) + rz * sin(theta);
+}
+
+static int gen_torus(struct mesh *mesh, float rad, float ringrad, int usub, int vsub)
+{
+ int i, j;
+ int nfaces, uverts, vverts;
+ struct g3d_vertex *vptr;
+ int16_t *iptr;
+
+ mesh->prim = G3D_QUADS;
+
+ if(usub < 4) usub = 4;
+ if(vsub < 2) vsub = 2;
+
+ uverts = usub + 1;
+ vverts = vsub + 1;
+
+ mesh->vcount = uverts * vverts;
+ nfaces = usub * vsub;
+ mesh->icount = nfaces * 4;
+
+ if(!(mesh->varr = malloc(mesh->vcount * sizeof *mesh->varr))) {
+ return -1;
+ }
+ if(!(mesh->iarr = malloc(mesh->icount * sizeof *mesh->iarr))) {
+ return -1;
+ }
+ vptr = mesh->varr;
+ iptr = mesh->iarr;
+
+ for(i=0; i<uverts; i++) {
+ float u = (float)i / (float)(uverts - 1);
+ float theta = u * 2.0 * M_PI;
+ float rcent[3];
+
+ torusvec(rcent, theta, 0, rad, 0);
+
+ for(j=0; j<vverts; j++) {
+ float v = (float)j / (float)(vverts - 1);
+ float phi = v * 2.0 * M_PI;
+ int chess = (i & 1) == (j & 1);
+
+ torusvec(&vptr->x, theta, phi, rad, ringrad);
+
+ vptr->nx = (vptr->x - rcent[0]) / ringrad;
+ vptr->ny = (vptr->y - rcent[1]) / ringrad;
+ vptr->nz = (vptr->z - rcent[2]) / ringrad;
+ vptr->u = u;
+ vptr->v = v;
+ vptr->r = chess ? 255 : 64;
+ vptr->g = 128;
+ vptr->b = chess ? 64 : 255;
+ ++vptr;
+
+ if(i < usub && j < vsub) {
+ int idx = i * vverts + j;
+ *iptr++ = idx;
+ *iptr++ = idx + 1;
+ *iptr++ = idx + vverts + 1;
+ *iptr++ = idx + vverts;
+ }
+ }
+ }
+ return 0;
+}
+
+
+static struct {
+ struct g3d_vertex *varr;
+ const float *xform;
+} zsort_cls;
+
+static int zsort_cmp(const void *aptr, const void *bptr)
+{
+ const int16_t *a = (const int16_t*)aptr;
+ const int16_t *b = (const int16_t*)bptr;
+
+ const float *m = zsort_cls.xform;
+
+ const struct g3d_vertex *va = zsort_cls.varr + a[0];
+ const struct g3d_vertex *vb = zsort_cls.varr + b[0];
+
+ float za = m[2] * va->x + m[6] * va->y + m[10] * va->z + m[14];
+ float zb = m[2] * vb->x + m[6] * vb->y + m[10] * vb->z + m[14];
+
+ va = zsort_cls.varr + a[2];
+ vb = zsort_cls.varr + b[2];
+
+ za += m[2] * va->x + m[6] * va->y + m[10] * va->z + m[14];
+ zb += m[2] * vb->x + m[6] * vb->y + m[10] * vb->z + m[14];
+
+ return za - zb;
+}
+
+static void zsort(struct mesh *m)
+{
+ int nfaces = m->icount / m->prim;
+
+ zsort_cls.varr = m->varr;
+ zsort_cls.xform = g3d_get_matrix(G3D_MODELVIEW, 0);
+
+ qsort(m->iarr, nfaces, m->prim * sizeof *m->iarr, zsort_cmp);
+}
trans_dur = 0;
}
- if(cur) {
- if(cur->stop) {
- cur->stop(trans_dur);
- }
-
+ if(cur && cur->stop) {
+ cur->stop(trans_dur);
prev = cur;
next = s;
} else {
fprintf(stderr, "failed to allocate virtual framebuffer\n");
return 1;
}
+ vmem_front = vmem_back = fb_pixels;
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER);
if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, sdl_flags))) {
quit = 1;
}
+void swap_buffers(void *pixels)
+{
+ /* do nothing, all pointers point to the same buffer */
+}
+
static void handle_event(SDL_Event *ev)
{
switch(ev->type) {
static int count_bits(unsigned int x);
static int count_zeros(unsigned int x);
-static unsigned int *gen_test_image(int *wptr, int *hptr);
-
static struct screen scr = {
"tunnel",
init,
int starty = i * num_lines;
int resty = starty + draw_lines;
int rest_lines = num_lines - draw_lines;
- draw_tunnel_range((unsigned short*)fb_pixels, xoffs, yoffs, starty, draw_lines, time_msec);
+ draw_tunnel_range(vmem_back, xoffs, yoffs, starty, draw_lines, time_msec);
if(rest_lines) {
- memset((unsigned short*)fb_pixels + resty * fb_width, 0, rest_lines * fb_width * 2);
+ memset(vmem_back + resty * fb_width, 0, rest_lines * fb_width * 2);
}
}
+
+ swap_buffers(0);
}
static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpacked, int fog)
return num;
}
+/*
static unsigned int *gen_test_image(int *wptr, int *hptr)
{
int i, j;
*hptr = ysz;
return pixels;
}
+*/
projects / dosdemo / commitdiff