projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backported from rtxon: check_clip_poly (needed for new BSP code)
[dosdemo]
/
src
/
3dgfx.c
diff --git
a/src/3dgfx.c
b/src/3dgfx.c
index
17ddd93
..
044ab66
100644
(file)
--- a/
src/3dgfx.c
+++ b/
src/3dgfx.c
@@
-3,6
+3,11
@@
#include <string.h>
#include <math.h>
#include <assert.h>
#include <string.h>
#include <math.h>
#include <assert.h>
+#if defined(__WATCOMC__) || defined(_MSC_VER) || defined(__DJGPP__)
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
#include "3dgfx.h"
#include "gfxutil.h"
#include "polyfill.h"
#include "3dgfx.h"
#include "gfxutil.h"
#include "polyfill.h"
@@
-396,20
+401,22
@@
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,
}
void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
- const int16_t *iarr, int iarr_size)
+ const uint16_t *iarr, int iarr_size)
{
{
- int i, j, nfaces;
+ int i, j, vnum, nfaces;
struct pvertex pv[16];
struct g3d_vertex v[16];
struct pvertex pv[16];
struct g3d_vertex v[16];
- int vnum = prim; /* primitive vertex counts correspond to enum values */
int mvtop = st->mtop[G3D_MODELVIEW];
int ptop = st->mtop[G3D_PROJECTION];
int mvtop = st->mtop[G3D_MODELVIEW];
int ptop = st->mtop[G3D_PROJECTION];
+ struct g3d_vertex *tmpv;
+
+ tmpv = alloca(prim * 6 * sizeof *tmpv);
/* calc the normal matrix */
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;
/* calc the normal matrix */
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;
- nfaces = (iarr ? iarr_size : varr_size) / vnum;
+ nfaces = (iarr ? iarr_size : varr_size) / prim;
for(j=0; j<nfaces; j++) {
vnum = prim; /* reset vnum for each iteration */
for(j=0; j<nfaces; j++) {
vnum = prim; /* reset vnum for each iteration */
@@
-423,12
+430,15
@@
void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
if(st->opt & G3D_LIGHTING) {
shade(v + i);
}
if(st->opt & G3D_LIGHTING) {
shade(v + i);
}
+ if(st->opt & G3D_TEXTURE_GEN) {
+ v[i].u = v[i].nx * 0.5 + 0.5;
+ v[i].v = v[i].ny * 0.5 + 0.5;
+ }
xform4_vec3(st->mat[G3D_PROJECTION][ptop], &v[i].x);
}
/* clipping */
for(i=0; i<6; i++) {
xform4_vec3(st->mat[G3D_PROJECTION][ptop], &v[i].x);
}
/* clipping */
for(i=0; i<6; i++) {
- struct g3d_vertex tmpv[16];
memcpy(tmpv, v, vnum * sizeof *v);
if(clip_frustum(v, &vnum, tmpv, vnum, i) < 0) {
memcpy(tmpv, v, vnum * sizeof *v);
if(clip_frustum(v, &vnum, tmpv, vnum, i) < 0) {
@@
-470,7
+480,7
@@
void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
int32_t ay = pv[1].y - pv[0].y;
int32_t bx = pv[2].x - pv[0].x;
int32_t by = pv[2].y - pv[0].y;
int32_t ay = pv[1].y - pv[0].y;
int32_t bx = pv[2].x - pv[0].x;
int32_t by = pv[2].y - pv[0].y;
- int32_t cross_z = ax * (by >> 8) - ay * (bx >> 8);
+ int32_t cross_z = (ax >> 4) * (by >> 4) - (ay >> 4) * (bx >> 4);
int sign = (cross_z >> 31) & 1;
if(!(sign ^ st->frontface)) {
int sign = (cross_z >> 31) & 1;
if(!(sign ^ st->frontface)) {