qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-29 23:32:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

not there yet. the lines are debug info :)

Browse source
This commit is contained in:
Bill Currie 2000-11-13 01:43:14 +00:00
parent 2b96ea275e
commit 14d5c349fd
2 changed files with 53 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/gl_rsurf.c
View file

@ -801,12 +801,6 @@ void R_DrawBrushModel (entity_t *e)
// draw texture // draw texture
// //
for (i=0 ; i<clmodel->nummodelsurfaces ; i++, psurf++) { for (i=0 ; i<clmodel->nummodelsurfaces ; i++, psurf++) {
if (psurf->flags & SURF_DRAWSKY) {
psurf->texturechain = sky_chain;
sky_chain = psurf;
return;
}
// find which side of the node we are on // find which side of the node we are on
pplane = psurf->plane; pplane = psurf->plane;
@ -816,6 +810,12 @@ void R_DrawBrushModel (entity_t *e)
if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) || if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) (!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON)))
{ {
if (psurf->flags & SURF_DRAWSKY) {
psurf->texturechain = sky_chain;
sky_chain = psurf;
return;
}
if (psurf->flags & SURF_DRAWTURB) if (psurf->flags & SURF_DRAWTURB)
GL_WaterSurface(psurf); GL_WaterSurface(psurf);
else if (gl_texsort->int_val) else if (gl_texsort->int_val)
@ -931,15 +931,15 @@ void R_RecursiveWorldNode (mnode_t *node)
if (surf->visframe != r_framecount) if (surf->visframe != r_framecount)
continue; continue;
if ((dot < 0) ^ !!(surf->flags & SURF_PLANEBACK))
continue; // wrong side
if (surf->flags & SURF_DRAWSKY) { if (surf->flags & SURF_DRAWSKY) {
surf->texturechain = sky_chain; surf->texturechain = sky_chain;
sky_chain = surf; sky_chain = surf;
continue; continue;
} }
if ((dot < 0) ^ !!(surf->flags & SURF_PLANEBACK))
continue; // wrong side
if (surf->flags & SURF_DRAWTURB) if (surf->flags & SURF_DRAWTURB)
{ {
surf->texturechain = waterchain; surf->texturechain = waterchain;

48
source/gl_sky.c
View file

@ -338,6 +338,7 @@ find_intersect (int face1, vec3_t x1, int face2, vec3_t x2, vec3_t y)
// always on an axis plane. // always on an axis plane.
vec3_t v = {0, 0, 0}; // direction vector of cube edge. always +ve vec3_t v = {0, 0, 0}; // direction vector of cube edge. always +ve
vec_t x_n, v_n; // x.n and v.n vec_t x_n, v_n; // x.n and v.n
vec3_t t;
x[face1 % 3] = 1024 * (1 - 2 * (face1 / 3)); x[face1 % 3] = 1024 * (1 - 2 * (face1 / 3));
x[face2 % 3] = 1024 * (1 - 2 * (face2 / 3)); x[face2 % 3] = 1024 * (1 - 2 * (face2 / 3));
@ -348,8 +349,8 @@ find_intersect (int face1, vec3_t x1, int face2, vec3_t x2, vec3_t y)
x_n = DotProduct (x, n); x_n = DotProduct (x, n);
v_n = DotProduct (v, n); v_n = DotProduct (v, n);
VectorScale (v, x_n / v_n, v); VectorScale (v, x_n / v_n, t);
VectorSubtract (x, v, y); VectorSubtract (x, t, y);
} }
static void static void
@ -392,7 +393,7 @@ R_DrawSkyBoxPoly (glpoly_t *poly)
static int skytex_offs[] = {3, 0, 4, 1, 2, 5}; static int skytex_offs[] = {3, 0, 4, 1, 2, 5};
vec3_t v, last_v; vec3_t v, last_v;
struct { struct {
int tex; int tex, enter, leave;
glpoly_t poly; glpoly_t poly;
float verts[32][VERTEXSIZE]; float verts[32][VERTEXSIZE];
} box[6]; } box[6];
@ -400,8 +401,10 @@ R_DrawSkyBoxPoly (glpoly_t *poly)
int face, prev_face; int face, prev_face;
memset (box, 0, sizeof (box)); memset (box, 0, sizeof (box));
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++) {
box[i].tex = SKY_TEX + skytex_offs[i]; box[i].tex = SKY_TEX + skytex_offs[i];
box[i].enter = box[i].leave = -1;
}
if (poly->numverts>=32) { if (poly->numverts>=32) {
Con_Printf ("too many verts!"); Con_Printf ("too many verts!");
@ -422,6 +425,14 @@ R_DrawSkyBoxPoly (glpoly_t *poly)
find_intersect (prev_face, last_v, face, v, l); find_intersect (prev_face, last_v, face, v, l);
set_vertex(&box[prev_face].poly, l, prev_face); set_vertex(&box[prev_face].poly, l, prev_face);
if (box[prev_face].enter >= 0 && box[prev_face].leave == -1) {
set_vertex(&box[prev_face].poly, , prev_face);
}
box[prev_face].leave = face;
if (box[face].enter == -1 && box[face].leave >= 0) {
set_vertex(&box[face].poly, , face);
}
box[prev_face].leave = face;
set_vertex(&box[face].poly, l, face); set_vertex(&box[face].poly, l, face);
} }
} }
@ -442,6 +453,28 @@ R_DrawSkyBoxPoly (glpoly_t *poly)
} }
glEnd (); glEnd ();
} }
glDisable (GL_TEXTURE_2D);
glColor3f (1, 1, 1);
glBegin (GL_LINES);
for (i=0; i<poly->numverts; i++) {
glVertex3fv (poly->verts[i]);
}
glVertex3fv (poly->verts[0]);
glEnd();
glColor3f (1, 0, 0);
for (i=0; i<6; i++) {
glBegin (GL_LINES);
for (j=0; j<4; j++) {
vec3_t v;
memcpy (v, &skyvec[i][j][2], sizeof(v));
VectorAdd (v, r_refdef.vieworg, v);
glVertex3fv (v);
}
glVertex3fv (&skyvec[i][0][2]);
glEnd ();
}
glColor3ubv (lighthalf_v);
glEnable (GL_TEXTURE_2D);
} }
void void
@ -457,6 +490,13 @@ R_DrawSkyDomePoly (glpoly_t *poly)
glVertex3fv (poly->verts[i]); glVertex3fv (poly->verts[i]);
} }
glEnd (); glEnd ();
glColor3f (1, 1, 1);
glBegin (GL_LINES);
for (i=0; i<poly->numverts; i++) {
glVertex3fv (poly->verts[i]);
}
glVertex3fv (poly->verts[0]);
glEnd ();
glEnable (GL_TEXTURE_2D); glEnable (GL_TEXTURE_2D);
glEnable (GL_BLEND); glEnable (GL_BLEND);
} }