zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Corrected parallax problems. (_zoo and e3l10).

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@704 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2008-04-12 08:16:01 +00:00
parent c247c3540b
commit 22dc84d4ca
2 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/build/include/polymer.h
View file

@ -88,6 +88,7 @@ typedef struct s_prwall {
GLfloat* overbuffer; GLfloat* overbuffer;
GLfloat* portal; GLfloat* portal;
GLfloat* bigportal; GLfloat* bigportal;
GLfloat* cap;
GLdouble plane[4]; GLdouble plane[4];
// attributes // attributes
GLfloat wallcolor[4], overcolor[4], maskcolor[4]; GLfloat wallcolor[4], overcolor[4], maskcolor[4];

49
polymer/build/src/polymer.c
View file

@ -502,6 +502,7 @@ static void polymer_displayrooms(short dacursectnum)
{ {
sectortype *sec, *nextsec; sectortype *sec, *nextsec;
walltype *wal, *nextwal; walltype *wal, *nextwal;
_prwall *w;
int i, j; int i, j;
GLint result; GLint result;
int front; int front;
@ -571,7 +572,7 @@ static void polymer_displayrooms(short dacursectnum)
while (front != back) while (front != back)
{ {
if ((front >= firstback) && (pr_occlusionculling) && (!querydelay[sectorqueue[front]])) if ((front >= firstback) && (pr_occlusionculling) && (querydelay[sectorqueue[front]] > 0))
{ {
bglGetQueryObjectivARB(queryid[sectorqueue[front]], bglGetQueryObjectivARB(queryid[sectorqueue[front]],
GL_QUERY_RESULT_ARB, GL_QUERY_RESULT_ARB,
@ -585,6 +586,8 @@ static void polymer_displayrooms(short dacursectnum)
else else
querydelay[sectorqueue[front]] = pr_occlusionculling-1; querydelay[sectorqueue[front]] = pr_occlusionculling-1;
} }
else if (querydelay[sectorqueue[front]] == -1)
querydelay[sectorqueue[front]] = pr_occlusionculling-1;
else if ((front >= firstback) && (pr_occlusionculling) && (querydelay[sectorqueue[front]])) else if ((front >= firstback) && (pr_occlusionculling) && (querydelay[sectorqueue[front]]))
querydelay[sectorqueue[front]]--; querydelay[sectorqueue[front]]--;
@ -618,6 +621,14 @@ static void polymer_displayrooms(short dacursectnum)
nextsec = &sector[wal->nextsector]; nextsec = &sector[wal->nextsector];
nextwal = &wall[nextsec->wallptr]; nextwal = &wall[nextsec->wallptr];
if (nextsec->floorz == nextsec->ceilingz)
{
querydelay[wal->nextsector] = -1;
i++;
wal = &wall[sec->wallptr + i];
continue;
}
bglDisable(GL_TEXTURE_2D); bglDisable(GL_TEXTURE_2D);
bglDisable(GL_FOG); bglDisable(GL_FOG);
bglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); bglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
@ -630,12 +641,23 @@ static void polymer_displayrooms(short dacursectnum)
while (j < nextsec->wallnum) while (j < nextsec->wallnum)
{ {
if ((nextwal->nextwall == (sec->wallptr + i)) || if ((nextwal->nextwall == (sec->wallptr + i)) ||
((nextwal->nextwall != -1) && ((nextwal->nextwall != -1) &&
(wallvisible(nextwal->nextwall)) && (wallvisible(nextwal->nextwall)) &&
(polymer_portalinfrustum(nextwal->nextwall, frustum)))) (polymer_portalinfrustum(nextwal->nextwall, frustum))))
{ {
bglVertexPointer(3, GL_FLOAT, 5 * sizeof(GLfloat), prwalls[nextwal->nextwall]->portal); w = prwalls[nextwal->nextwall];
bglVertexPointer(3, GL_FLOAT, 5 * sizeof(GLfloat), w->portal);
bglDrawArrays(GL_QUADS, 0, 4); bglDrawArrays(GL_QUADS, 0, 4);
if ((w->underover & 1) && (w->underover & 4))
{
bglVertexPointer(3, GL_FLOAT, 5 * sizeof(GLfloat), w->wallbuffer);
bglDrawArrays(GL_QUADS, 0, 4);
}
if ((w->underover & 2) && (w->underover & 8))
{
bglVertexPointer(3, GL_FLOAT, 5 * sizeof(GLfloat), w->overbuffer);
bglDrawArrays(GL_QUADS, 0, 4);
}
} }
j++; j++;
@ -1152,7 +1174,7 @@ static int polymer_buildfloor(short sectnum)
sectortype *sec; sectortype *sec;
int i; int i;
if (pr_verbosity >= 0) OSD_Printf("PR : Tesselating floor of sector %i...\n", sectnum); if (pr_verbosity >= 2) OSD_Printf("PR : Tesselating floor of sector %i...\n", sectnum);
s = prsectors[sectnum]; s = prsectors[sectnum];
sec = &sector[sectnum]; sec = &sector[sectnum];
@ -1245,6 +1267,8 @@ static int polymer_initwall(short wallnum)
w->portal = calloc(4, sizeof(GLfloat) * 5); w->portal = calloc(4, sizeof(GLfloat) * 5);
if (w->bigportal == NULL) if (w->bigportal == NULL)
w->bigportal = calloc(4, sizeof(GLfloat) * 3); w->bigportal = calloc(4, sizeof(GLfloat) * 3);
if (w->cap == NULL)
w->cap = calloc(4, sizeof(GLfloat) * 3);
w->controlstate = 2; w->controlstate = 2;
@ -1678,6 +1702,13 @@ static void polymer_updatewall(short wallnum)
memcpy(&w->bigportal[6], &s->ceilbuffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(&w->bigportal[6], &s->ceilbuffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->bigportal[9], &s->ceilbuffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3); memcpy(&w->bigportal[9], &s->ceilbuffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->cap[0], &s->ceilbuffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->cap[3], &s->ceilbuffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->cap[6], &s->ceilbuffer[(wal->point2 - sec->wallptr) * 5], sizeof(GLfloat) * 3);
memcpy(&w->cap[9], &s->ceilbuffer[(wallnum - sec->wallptr) * 5], sizeof(GLfloat) * 3);
w->cap[7] += 1048576; // this number is the result of 1048574 + 2
w->cap[10] += 1048576; // this one is arbitrary
polymer_buffertoplane(w->bigportal, NULL, 4, w->plane); polymer_buffertoplane(w->bigportal, NULL, 4, w->plane);
w->controlstate = 1; w->controlstate = 1;
@ -1705,6 +1736,16 @@ static void polymer_drawwall(short sectnum, short wallnum)
w->overbuffer, NULL, 0, w->plane); w->overbuffer, NULL, 0, w->plane);
} }
if ((sector[sectnum].ceilingstat & 1) &&
((wall[wallnum].nextsector == -1) ||
!(sector[wall[wallnum].nextsector].ceilingstat & 1)))
{
bglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
bglVertexPointer(3, GL_FLOAT, 0, w->cap);
bglDrawArrays(GL_QUADS, 0, 4);
bglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
if (pr_verbosity >= 3) OSD_Printf("PR : Finished drawing wall %i...\n", wallnum); if (pr_verbosity >= 3) OSD_Printf("PR : Finished drawing wall %i...\n", wallnum);
} }