teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-27 22:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split r3159..r3161, part 13: Poly{mer,most}, engine changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3179 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-15 14:28:44 +00:00
parent 107fa9cc39
commit 6144a2e18c
3 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/src/engine.c
View file

@ -4362,7 +4362,7 @@ static void parascan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat, i
int32_t dapyscale; int32_t dapyscale;
int16_t dapskybits; int16_t dapskybits;
static const int16_t zeropskyoff[MAXPSKYTILES]; static const int16_t zeropskyoff[MAXPSKYTILES] = { 0 };
const int16_t *dapskyoff; const int16_t *dapskyoff;
UNREFERENCED_PARAMETER(dax1); UNREFERENCED_PARAMETER(dax1);

62
polymer/eduke32/build/src/polymer.c
View file

@ -782,9 +782,7 @@ void polymer_uninit(void)
void polymer_setaspect(int32_t ang) void polymer_setaspect(int32_t ang)
{ {
float aspect; float aspect;
float fang = ang; float fang = (float)ang * atanf((float)viewingrange/65536.0f)/(PI/4);
fang *= atanf((float)viewingrange/65536.0f)/(PI/4);
if (pr_customaspect != 0.0f) if (pr_customaspect != 0.0f)
aspect = pr_customaspect; aspect = pr_customaspect;
@ -3467,7 +3465,7 @@ void polymer_updatesprite(int32_t snum)
{ {
int32_t curpicnum, xsize, ysize, tilexoff, tileyoff, xoff, yoff, i, j, cs; int32_t curpicnum, xsize, ysize, tilexoff, tileyoff, xoff, yoff, i, j, cs;
spritetype *tspr = tspriteptr[snum]; spritetype *tspr = tspriteptr[snum];
float xratio, yratio, ang; float xratio, yratio, ang, f;
float spos[3]; float spos[3];
const GLfloat *inbuffer; const GLfloat *inbuffer;
uint8_t flipu, flipv; uint8_t flipu, flipv;
@ -3523,7 +3521,8 @@ void polymer_updatesprite(int32_t snum)
s->plane.material.diffusemodulation[3] = 0xAA; s->plane.material.diffusemodulation[3] = 0xAA;
} }
s->plane.material.diffusemodulation[3] *= (1.0f - spriteext[tspr->owner].alpha); f = s->plane.material.diffusemodulation[3] * (1.0f - spriteext[tspr->owner].alpha);
s->plane.material.diffusemodulation[3] = (GLubyte)f;
if (searchit == 2) if (searchit == 2)
{ {
@ -4098,7 +4097,7 @@ static void polymer_drawmdsprite(spritetype *tspr)
color = mdspritematerial.diffusemodulation; color = mdspritematerial.diffusemodulation;
color[0] = color[1] = color[2] = color[0] = color[1] = color[2] =
((float)(numshades-min(max((tspr->shade * shadescale)+m->shadeoff,0),numshades)))/((float)numshades) * 0xFF; (GLubyte)(((float)(numshades-min(max((tspr->shade * shadescale)+m->shadeoff,0),numshades)))/((float)numshades) * 0xFF);
usinghighpal = (pr_highpalookups && usinghighpal = (pr_highpalookups &&
prhighpalookups[curbasepal][tspr->pal].map); prhighpalookups[curbasepal][tspr->pal].map);
@ -4109,9 +4108,14 @@ static void polymer_drawmdsprite(spritetype *tspr)
{ {
if (!(m->flags&1) || (!(tspr->owner >= MAXSPRITES) && sector[sprite[tspr->owner].sectnum].floorpal!=0)) if (!(m->flags&1) || (!(tspr->owner >= MAXSPRITES) && sector[sprite[tspr->owner].sectnum].floorpal!=0))
{ {
color[0] *= (float)hictinting[tspr->pal].r / 255.0; double f;
color[1] *= (float)hictinting[tspr->pal].g / 255.0;
color[2] *= (float)hictinting[tspr->pal].b / 255.0; f = color[0] * (float)hictinting[tspr->pal].r / 255.0;
color[0] = (GLubyte)f;
f = color[1] * (float)hictinting[tspr->pal].g / 255.0;
color[1] = (GLubyte)f;
f = color[2] * (float)hictinting[tspr->pal].b / 255.0;
color[2] = (GLubyte)f;
} }
else globalnoeffect=1; //mdloadskin reads this else globalnoeffect=1; //mdloadskin reads this
} }
@ -4122,9 +4126,14 @@ static void polymer_drawmdsprite(spritetype *tspr)
hictinting[MAXPALOOKUPS-1].g != 255 || hictinting[MAXPALOOKUPS-1].g != 255 ||
hictinting[MAXPALOOKUPS-1].b != 255)) hictinting[MAXPALOOKUPS-1].b != 255))
{ {
color[0] *= hictinting[MAXPALOOKUPS-1].r / 255.0; double f;
color[1] *= hictinting[MAXPALOOKUPS-1].g / 255.0;
color[2] *= hictinting[MAXPALOOKUPS-1].b / 255.0; f = color[0] * hictinting[MAXPALOOKUPS-1].r / 255.0;
color[0] = (GLubyte)f;
f = color[1] * hictinting[MAXPALOOKUPS-1].g / 255.0;
color[1] = (GLubyte)f;
f = color[2] * hictinting[MAXPALOOKUPS-1].b / 255.0;
color[2] = (GLubyte)f;
} }
if (tspr->cstat & 2) if (tspr->cstat & 2)
@ -4136,7 +4145,10 @@ static void polymer_drawmdsprite(spritetype *tspr)
} else } else
color[3] = 0xFF; color[3] = 0xFF;
color[3] *= (1.0f - spriteext[tspr->owner].alpha); {
double f = color[3] * (1.0f - spriteext[tspr->owner].alpha);
color[3] = (GLubyte)f;
}
if (searchit == 2) if (searchit == 2)
{ {
@ -4481,24 +4493,34 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
material->diffusemodulation[0] = material->diffusemodulation[0] =
material->diffusemodulation[1] = material->diffusemodulation[1] =
material->diffusemodulation[2] = material->diffusemodulation[2] =
((float)(numshades-min(max((shade * shadescale),0),numshades)))/((float)numshades) * 0xFF; (GLubyte)(((float)(numshades-min(max((shade * shadescale),0),numshades)))/((float)numshades) * 0xFF);
if (pth->flags & 2) if (pth->flags & 2)
{ {
if (pth->palnum != pal) if (pth->palnum != pal)
{ {
material->diffusemodulation[0] *= (float)hictinting[pal].r / 255.0; double f;
material->diffusemodulation[1] *= (float)hictinting[pal].g / 255.0;
material->diffusemodulation[2] *= (float)hictinting[pal].b / 255.0; f = material->diffusemodulation[0] * (float)hictinting[pal].r / 255.0;
material->diffusemodulation[0] = (GLubyte)f;
f = material->diffusemodulation[1] * (float)hictinting[pal].g / 255.0;
material->diffusemodulation[1] = (GLubyte)f;
f = material->diffusemodulation[2] * (float)hictinting[pal].b / 255.0;
material->diffusemodulation[2] = (GLubyte)f;
} }
// fullscreen tint on global palette change... this is used for nightvision and underwater tinting // fullscreen tint on global palette change... this is used for nightvision and underwater tinting
// if ((hictinting[MAXPALOOKUPS-1].r + hictinting[MAXPALOOKUPS-1].g + hictinting[MAXPALOOKUPS-1].b) != 0x2FD) // if ((hictinting[MAXPALOOKUPS-1].r + hictinting[MAXPALOOKUPS-1].g + hictinting[MAXPALOOKUPS-1].b) != 0x2FD)
if (!usinghighpal && ((uint32_t)hictinting[MAXPALOOKUPS-1].r & 0xFFFFFF00) != 0xFFFFFF00) if (!usinghighpal && ((uint32_t)hictinting[MAXPALOOKUPS-1].r & 0xFFFFFF00) != 0xFFFFFF00)
{ {
material->diffusemodulation[0] *= hictinting[MAXPALOOKUPS-1].r / 255.0; double f;
material->diffusemodulation[1] *= hictinting[MAXPALOOKUPS-1].g / 255.0;
material->diffusemodulation[2] *= hictinting[MAXPALOOKUPS-1].b / 255.0; f = material->diffusemodulation[0] * hictinting[MAXPALOOKUPS-1].r / 255.0;
material->diffusemodulation[0] = (GLubyte)f;
f = material->diffusemodulation[1] * hictinting[MAXPALOOKUPS-1].g / 255.0;
material->diffusemodulation[1] = (GLubyte)f;
f = material->diffusemodulation[2] * hictinting[MAXPALOOKUPS-1].b / 255.0;
material->diffusemodulation[2] = (GLubyte)f;
} }
} }

2
polymer/eduke32/build/src/polymost.c
View file

@ -3372,7 +3372,7 @@ static void polymost_drawalls(int32_t bunch)
int32_t i, x, y, z, cz, fz, wallnum, sectnum, nextsectnum; int32_t i, x, y, z, cz, fz, wallnum, sectnum, nextsectnum;
int16_t dapskybits; int16_t dapskybits;
static const int16_t zeropskyoff[MAXPSKYTILES]; static const int16_t zeropskyoff[MAXPSKYTILES] = { 0 };
const int16_t *dapskyoff; const int16_t *dapskyoff;
sectnum = thesector[bunchfirst[bunch]]; sec = &sector[sectnum]; sectnum = thesector[bunchfirst[bunch]]; sec = &sector[sectnum];