projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clipping bugs...
[dosdemo]
/
src
/
3dgfx.c
diff --git
a/src/3dgfx.c
b/src/3dgfx.c
index
46cc9ab
..
a90da7a
100644
(file)
--- a/
src/3dgfx.c
+++ b/
src/3dgfx.c
@@
-98,9
+98,7
@@
void g3d_framebuffer(int width, int height, void *pixels)
pfill_fb.width = width;
pfill_fb.height = height;
pfill_fb.width = width;
pfill_fb.height = height;
- st->vport[0] = st->vport[1] = 0;
- st->vport[2] = width;
- st->vport[3] = height;
+ g3d_viewport(0, 0, width, height);
}
void g3d_viewport(int x, int y, int w, int h)
}
void g3d_viewport(int x, int y, int w, int h)
@@
-404,6
+402,7
@@
void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
nfaces = (iarr ? iarr_size : varr_size) / vnum;
for(j=0; j<nfaces; j++) {
nfaces = (iarr ? iarr_size : varr_size) / vnum;
for(j=0; j<nfaces; j++) {
+ vnum = prim; /* reset vnum for each iteration */
for(i=0; i<vnum; i++) {
v[i] = iarr ? varr[*iarr++] : *varr++;
for(i=0; i<vnum; i++) {
v[i] = iarr ? varr[*iarr++] : *varr++;
@@
-419,15
+418,18
@@
void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
/* clipping */
for(i=0; i<6; i++) {
/* clipping */
for(i=0; i<6; i++) {
- struct g3d_vertex orig[16];
- memcpy(orig, v, vnum * sizeof *v);
+ struct g3d_vertex tmpv[16];
+ memcpy(tmpv, v, vnum * sizeof *v);
- if(clip_frustum(v, &vnum, orig, vnum, i) < 0) {
+ if(clip_frustum(v, &vnum, tmpv, vnum, i) < 0) {
/* polygon completely outside of view volume. discard */
/* polygon completely outside of view volume. discard */
- return;
+ vnum = 0;
+ break;
}
}
}
}
+ if(!vnum) continue;
+
for(i=0; i<vnum; i++) {
if(v[i].w != 0.0f) {
v[i].x /= v[i].w;
for(i=0; i<vnum; i++) {
if(v[i].w != 0.0f) {
v[i].x /= v[i].w;