eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fixes the seams, allows the mapper to specify a skybox.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1469 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-10-15 20:06:34 +00:00
parent 014eabdbed
commit 65c00d62b5
1 changed files with 55 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
engine/gl/gl_heightmap.c
View file

@ -45,6 +45,15 @@ void GL_DrawHeightmapModel (entity_t *e)
model_t *m = e->model; model_t *m = e->model;
heightmap_t *hm = m->terrain; heightmap_t *hm = m->terrain;
qglColor4f(1, 1, 1, 1);
if (e->model == cl.worldmodel)
{
R_ClearSkyBox();
R_ForceSkyBox();
R_DrawSkyBox(NULL);
}
qglEnable(GL_CULL_FACE);
qglColor4f(1, 1, 1, e->alpha); qglColor4f(1, 1, 1, e->alpha);
for (x = 0; x < hm->numsegs; x++) for (x = 0; x < hm->numsegs; x++)
@ -83,22 +92,22 @@ void GL_DrawHeightmapModel (entity_t *e)
qglBegin(GL_QUADS); qglBegin(GL_QUADS);
for (vx = minx; vx < minx+hm->terrainsize/hm->numsegs; vx++) for (vx = 0; vx < subsize; vx++)
{ {
for (vy = miny; vy < miny+hm->terrainsize/hm->numsegs; vy++) for (vy = 0; vy < subsize; vy++)
{ {
qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, vx/subsize, (vy+1)/subsize); qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, vx/subsize, (vy+1)/subsize);
qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0, 1); qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0, 1);
qglVertex3f((vx)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx + (vy+1)*hm->terrainsize]*hm->heightscale);
qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, (vx+1)/subsize, (vy+1)/subsize); qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, (vx+1)/subsize, (vy+1)/subsize);
qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1, 1); qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1, 1);
qglVertex3f((vx+1)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx+1 + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx+1 + (vy+1)*hm->terrainsize]*hm->heightscale);
qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, (vx+1)/subsize, vy/subsize); qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, (vx+1)/subsize, vy/subsize);
qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1, 0); qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1, 0);
qglVertex3f((vx+1)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx+1 + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx+1 + vy*hm->terrainsize]*hm->heightscale);
qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, vx/subsize, vy/subsize); qglMultiTexCoord2fARB(GL_TEXTURE0_ARB, vx/subsize, vy/subsize);
qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0, 0); qglMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0, 0);
qglVertex3f((vx)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx + vy*hm->terrainsize]*hm->heightscale);
} }
} }
qglEnd(); qglEnd();
@ -113,18 +122,18 @@ void GL_DrawHeightmapModel (entity_t *e)
subsize = hm->terrainsize/hm->numsegs; subsize = hm->terrainsize/hm->numsegs;
minx = x*subsize; minx = x*subsize;
miny = y*subsize; miny = y*subsize;
for (vx = minx; vx < minx+hm->terrainsize/hm->numsegs; vx++) for (vx = 0; vx < subsize; vx++)
{ {
for (vy = miny; vy < miny+hm->terrainsize/hm->numsegs; vy++) for (vy = 0; vy < subsize; vy++)
{ {
qglTexCoord2f(vx/subsize, (vy+1)/subsize); qglTexCoord2f(vx/subsize, (vy+1)/subsize);
qglVertex3f((vx)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx+minx + (vy+miny+1)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f((vx+1)/subsize, (vy+1)/subsize); qglTexCoord2f((vx+1)/subsize, (vy+1)/subsize);
qglVertex3f((vx+1)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx+1 + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx+minx+1 + (vy+miny+1)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f((vx+1)/subsize, vy/subsize); qglTexCoord2f((vx+1)/subsize, vy/subsize);
qglVertex3f((vx+1)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx+1 + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx+minx+1 + (vy+miny)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f(vx/subsize, vy/subsize); qglTexCoord2f(vx/subsize, vy/subsize);
qglVertex3f((vx)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx+minx + (vy+miny)*hm->terrainsize]*hm->heightscale);
} }
} }
qglEnd(); qglEnd();
@ -134,18 +143,18 @@ void GL_DrawHeightmapModel (entity_t *e)
qglBlendFunc (GL_ZERO, GL_SRC_COLOR); qglBlendFunc (GL_ZERO, GL_SRC_COLOR);
qglBegin(GL_QUADS); qglBegin(GL_QUADS);
for (vx = minx; vx < minx+hm->terrainsize/hm->numsegs; vx++) for (vx = 0; vx < subsize; vx++)
{ {
for (vy = miny; vy < miny+hm->terrainsize/hm->numsegs; vy++) for (vy = 0; vy < subsize; vy++)
{ {
qglTexCoord2f(0, 1); qglTexCoord2f(0, 1);
qglVertex3f((vx)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx+minx + (vy+miny+1)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f(1, 1); qglTexCoord2f(1, 1);
qglVertex3f((vx+1)*hm->terrainscale, (vy+1)*hm->terrainscale, hm->heights[vx+1 + (vy+1)*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny+1)*hm->terrainscale, hm->heights[vx+minx+1 + (vy+miny+1)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f(1, 0); qglTexCoord2f(1, 0);
qglVertex3f((vx+1)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx+1 + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx+1)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx+minx+1 + (vy+miny)*hm->terrainsize]*hm->heightscale);
qglTexCoord2f(0, 0); qglTexCoord2f(0, 0);
qglVertex3f((vx)*hm->terrainscale, (vy)*hm->terrainscale, hm->heights[vx + vy*hm->terrainsize]*hm->heightscale); qglVertex3f((vx+minx)*hm->terrainscale, (vy+miny)*hm->terrainscale, hm->heights[vx+minx + (vy+miny)*hm->terrainsize]*hm->heightscale);
} }
} }
qglEnd(); qglEnd();
@ -600,11 +609,14 @@ void GL_LoadHeightmapModel (model_t *mod, void *buffer)
int size; int size;
int x, y; int x, y;
float skyrotate;
vec3_t skyaxis;
char heightmapname[MAX_QPATH]; char heightmapname[MAX_QPATH];
char detailtexname[MAX_QPATH]; char detailtexname[MAX_QPATH];
char basetexname[MAX_QPATH]; char basetexname[MAX_QPATH];
char exttexname[MAX_QPATH]; char exttexname[MAX_QPATH];
char entfile[MAX_QPATH]; char entfile[MAX_QPATH];
char skyname[MAX_QPATH];
float worldsize = 64; float worldsize = 64;
float heightsize = 1/16; float heightsize = 1/16;
int numsegs = 1; int numsegs = 1;
@ -614,6 +626,12 @@ void GL_LoadHeightmapModel (model_t *mod, void *buffer)
*basetexname = '\0'; *basetexname = '\0';
*exttexname = '\0'; *exttexname = '\0';
*entfile = '\0'; *entfile = '\0';
strcpy(skyname, "night");
skyrotate = 0;
skyaxis[0] = 0;
skyaxis[1] = 0;
skyaxis[2] = 0;
buffer = COM_Parse(buffer); buffer = COM_Parse(buffer);
if (strcmp(com_token, "terrain")) if (strcmp(com_token, "terrain"))
@ -659,6 +677,21 @@ void GL_LoadHeightmapModel (model_t *mod, void *buffer)
buffer = COM_Parse(buffer); buffer = COM_Parse(buffer);
Q_strncpyz(entfile, com_token, sizeof(entfile)); Q_strncpyz(entfile, com_token, sizeof(entfile));
} }
else if (!strcmp(com_token, "skybox"))
{
buffer = COM_Parse(buffer);
Q_strncpyz(skyname, com_token, sizeof(skyname));
}
else if (!strcmp(com_token, "skyrotate"))
{
buffer = COM_Parse(buffer);
skyaxis[0] = atof(com_token);
buffer = COM_Parse(buffer);
skyaxis[1] = atof(com_token);
buffer = COM_Parse(buffer);
skyaxis[2] = atof(com_token);
skyrotate = VectorNormalize(skyaxis);
}
else if (!strcmp(com_token, "texturesegments")) else if (!strcmp(com_token, "texturesegments"))
{ {
buffer = COM_Parse(buffer); buffer = COM_Parse(buffer);
@ -702,9 +735,13 @@ void GL_LoadHeightmapModel (model_t *mod, void *buffer)
for (y = 0; y < numsegs; y++) for (y = 0; y < numsegs; y++)
{ {
hm->textures[x+y*SECTIONS] = Mod_LoadHiResTexture(va("%s%02ix%02i%s", basetexname, x, y, exttexname), "", true, true, false); hm->textures[x+y*SECTIONS] = Mod_LoadHiResTexture(va("%s%02ix%02i%s", basetexname, x, y, exttexname), "", true, true, false);
qglTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
qglTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
} }
} }
R_SetSky(skyname, skyrotate, skyaxis);
mod->funcs.Trace = Heightmap_Trace; mod->funcs.Trace = Heightmap_Trace;
mod->funcs.PointContents = Heightmap_PointContents; mod->funcs.PointContents = Heightmap_PointContents;
mod->funcs.LightPointValues = Heightmap_LightPointValues; mod->funcs.LightPointValues = Heightmap_LightPointValues;