projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
partial zbuffer implementation #2
[dosdemo]
/
src
/
scr
/
polytest.c
diff --git
a/src/scr/polytest.c
b/src/scr/polytest.c
index
0b05313
..
ca04256
100644
(file)
--- a/
src/scr/polytest.c
+++ b/
src/scr/polytest.c
@@
-10,6
+10,7
@@
#include "cfgopt.h"
#include "mesh.h"
#include "bsptree.h"
#include "cfgopt.h"
#include "mesh.h"
#include "bsptree.h"
+#include "util.h"
static int init(void);
static void destroy(void);
static int init(void);
static void destroy(void);
@@
-66,11
+67,11
@@
static int init(void)
}
*/
}
*/
- gen_texture(&tex, 128, 128);
+ gen_texture(&tex, 64, 64);
#ifdef DEBUG_POLYFILL
#ifdef DEBUG_POLYFILL
- lowres_width = fb_width / LOWRES_SCALE;
- lowres_height = fb_height / LOWRES_SCALE;
+ lowres_width = FB_WIDTH / LOWRES_SCALE;
+ lowres_height = FB_HEIGHT / LOWRES_SCALE;
lowres_pixels = malloc(lowres_width * lowres_height * 2);
scr.draw = draw_debug;
#endif
lowres_pixels = malloc(lowres_width * lowres_height * 2);
scr.draw = draw_debug;
#endif
@@
-101,6
+102,8
@@
static void start(long trans_time)
g3d_polygon_mode(G3D_GOURAUD);
g3d_enable(G3D_TEXTURE_2D);
g3d_polygon_mode(G3D_GOURAUD);
g3d_enable(G3D_TEXTURE_2D);
+
+ g3d_enable(G3D_DEPTH_TEST);
}
static void update(void)
}
static void update(void)
@@
-116,7
+119,9
@@
static void draw(void)
update();
update();
- memset(fb_pixels, 0, fb_width * fb_height * 2);
+ //memset16(fb_pixels, PACK_RGB16(20, 30, 50), FB_WIDTH * FB_HEIGHT);
+ g3d_clear_color(20, 30, 50);
+ g3d_clear(G3D_COLOR_BUFFER_BIT | G3D_DEPTH_BUFFER_BIT);
g3d_matrix_mode(G3D_MODELVIEW);
g3d_load_identity();
g3d_matrix_mode(G3D_MODELVIEW);
g3d_load_identity();
@@
-128,9
+133,8
@@
static void draw(void)
g3d_rotate(cam_theta, 0, 1, 0);
}
g3d_rotate(cam_theta, 0, 1, 0);
}
- g3d_light_pos(0, -10, 10, 20);
-
- g3d_mtl_diffuse(0.4, 0.7, 1.0);
+ g3d_light_dir(0, -10, 10, 10);
+ g3d_mtl_diffuse(1.0, 1.0, 1.0);
g3d_set_texture(tex.width, tex.height, tex.pixels);
if(use_bsp) {
g3d_set_texture(tex.width, tex.height, tex.pixels);
if(use_bsp) {
@@
-143,10
+147,18
@@
static void draw(void)
draw_bsp(&torus_bsp, vdir[0], vdir[1], vdir[2]);
} else {
draw_bsp(&torus_bsp, vdir[0], vdir[1], vdir[2]);
} else {
- zsort_mesh(&torus);
+ //zsort_mesh(&torus);
draw_mesh(&torus);
}
draw_mesh(&torus);
}
+ /*{
+ int i;
+ for(i=0; i<FB_WIDTH*FB_HEIGHT; i++) {
+ unsigned int z = pfill_zbuf[i];
+ fb_pixels[i] = z;
+ }
+ }*/
+
/*draw_mesh(&cube);*/
swap_buffers(fb_pixels);
}
/*draw_mesh(&cube);*/
swap_buffers(fb_pixels);
}
@@
-170,7
+182,7
@@
static void draw_debug(void)
draw_lowres_raster();
draw_lowres_raster();
- g3d_framebuffer(fb_width, fb_height, fb_pixels);
+ g3d_framebuffer(FB_WIDTH, FB_HEIGHT, fb_pixels);
g3d_polygon_mode(G3D_WIRE);
draw_mesh(&cube);
g3d_polygon_mode(G3D_WIRE);
draw_mesh(&cube);
@@
-201,10
+213,10
@@
static void draw_lowres_raster(void)
for(i=0; i<lowres_height; i++) {
for(j=0; j<lowres_width; j++) {
for(i=0; i<lowres_height; i++) {
for(j=0; j<lowres_width; j++) {
- draw_huge_pixel(dptr, fb_width, *sptr++);
+ draw_huge_pixel(dptr, FB_WIDTH, *sptr++);
dptr += LOWRES_SCALE;
}
dptr += LOWRES_SCALE;
}
- dptr += fb_width * LOWRES_SCALE - fb_width;
+ dptr += FB_WIDTH * LOWRES_SCALE - FB_WIDTH;
}
}
}
}
@@
-230,9
+242,12
@@
static int gen_texture(struct pimage *img, int xsz, int ysz)
for(i=0; i<ysz; i++) {
for(j=0; j<xsz; j++) {
for(i=0; i<ysz; i++) {
for(j=0; j<xsz; j++) {
- int val = i ^ j;
+ int val = (i << 2) ^ (j << 2);
+ uint16_t r = val;
+ uint16_t g = val << 1;
+ uint16_t b = val << 2;
- *pix++ = PACK_RGB16(val, val, val);
+ *pix++ = PACK_RGB16(r, g, b);
}
}
}
}