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

Polymer light tweaks

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5477 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-12-23 04:05:31 +00:00
parent 48254ccb3d
commit 760ea6c313
2 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
polymer/eduke32/source/actors.c
View file

@ -777,7 +777,7 @@ static void A_MoveSector(int i)
// this is the same crap as in game.c's tspr manipulation. puke. // this is the same crap as in game.c's tspr manipulation. puke.
// XXX: may access tilesizy out-of-bounds by bad user code. // XXX: may access tilesizy out-of-bounds by bad user code.
#define LIGHTRAD (s->yrepeat * tilesiz[s->picnum + LIGHTRAD_PICOFS].y) #define LIGHTRAD (s->yrepeat * tilesiz[s->picnum + LIGHTRAD_PICOFS].y)
#define LIGHTRAD2 (((s->yrepeat) + (rand() % (s->yrepeat >> 2))) * tilesiz[s->picnum + LIGHTRAD_PICOFS].y) #define LIGHTRAD2 ((s->yrepeat + ((rand() % s->yrepeat)>>2)) * tilesiz[s->picnum + LIGHTRAD_PICOFS].y)
void G_AddGameLight(int32_t radius, int32_t srcsprite, int32_t zoffset, int32_t range, int32_t color, int32_t priority) void G_AddGameLight(int32_t radius, int32_t srcsprite, int32_t zoffset, int32_t range, int32_t color, int32_t priority)
{ {
@ -7934,8 +7934,9 @@ static void A_DoLight(int32_t i)
spritetype *const s = &sprite[i]; spritetype *const s = &sprite[i];
int32_t numsavedfires = 0; int32_t numsavedfires = 0;
if ((sprite[i].picnum != SECTOREFFECTOR && ((s->cstat & 32768) || s->yrepeat < 4)) || A_CheckSpriteFlags(i, SFLAG_NOLIGHT) || if (((sector[s->sectnum].floorz - sector[s->sectnum].ceilingz) < 16) || s->z > sector[s->sectnum].floorz || s->z > actor[i].floorz ||
(A_CheckSpriteFlags(i, SFLAG_USEACTIVATOR) && sector[sprite[i].sectnum].lotag & 16384)) (s->picnum != SECTOREFFECTOR && ((s->cstat & 32768) || s->yrepeat < 4)) ||
A_CheckSpriteFlags(i, SFLAG_NOLIGHT) || (A_CheckSpriteFlags(i, SFLAG_USEACTIVATOR) && sector[s->sectnum].lotag & 16384))
{ {
if (actor[i].lightptr != NULL) if (actor[i].lightptr != NULL)
A_DeleteLight(i); A_DeleteLight(i);
@ -7955,10 +7956,10 @@ static void A_DoLight(int32_t i)
for (ii=0; ii<2; ii++) for (ii=0; ii<2; ii++)
{ {
if (sprite[i].picnum <= 0) // oob safety if (s->picnum <= 0) // oob safety
break; break;
switch (DYNAMICTILEMAP(sprite[i].picnum-1+ii)) switch (DYNAMICTILEMAP(s->picnum-1+ii))
{ {
case DIPSWITCH__STATIC: case DIPSWITCH__STATIC:
case DIPSWITCH2__STATIC: case DIPSWITCH2__STATIC:
@ -7976,9 +7977,6 @@ static void A_DoLight(int32_t i)
case ACCESSSWITCH__STATIC: case ACCESSSWITCH__STATIC:
case ACCESSSWITCH2__STATIC: case ACCESSSWITCH2__STATIC:
{ {
int32_t dx = sintable[(s->ang+512)&2047];
int32_t dy = sintable[(s->ang)&2047];
if ((s->cstat & 32768) || A_CheckSpriteFlags(i, SFLAG_NOLIGHT)) if ((s->cstat & 32768) || A_CheckSpriteFlags(i, SFLAG_NOLIGHT))
{ {
if (actor[i].lightptr != NULL) if (actor[i].lightptr != NULL)
@ -7986,33 +7984,32 @@ static void A_DoLight(int32_t i)
break; break;
} }
s->x += dx>>7; vec2_t const d = { sintable[(s->ang+512)&2047]>>7, sintable[(s->ang)&2047]>>7 };
s->y += dy>>7;
s->x += d.x;
s->y += d.y;
int16_t sectnum = s->sectnum; int16_t sectnum = s->sectnum;
updatesector(s->x, s->y, &sectnum); updatesector(s->x, s->y, &sectnum);
if ((unsigned) sectnum >= MAXSECTORS || s->z > sector[sectnum].floorz) if ((unsigned) sectnum >= MAXSECTORS || s->z > sector[sectnum].floorz || s->z < sector[sectnum].ceilingz)
{ goto POOP;
s->x -= dx>>7;
s->y -= dy>>7;
break;
}
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 1024-ii*256, G_AddGameLight(0, i, (s->yrepeat*tilesiz[s->picnum].y)<<1, 512-ii*128,
ii==0 ? (48+(255<<8)+(48<<16)) : 255+(48<<8)+(48<<16), PR_LIGHT_PRIO_LOW); ii==0 ? (172+(200<<8)+(104<<16)) : 216+(52<<8)+(20<<16), PR_LIGHT_PRIO_LOW);
s->x -= dx>>7; POOP:
s->y -= dy>>7; s->x -= d.x;
s->y -= d.y;
} }
break; break;
} }
} }
switch (DYNAMICTILEMAP(sprite[i].picnum)) switch (DYNAMICTILEMAP(s->picnum))
{ {
case ATOMICHEALTH__STATIC: case ATOMICHEALTH__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD2 * 3, 128+(128<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD2, 128+(128<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case FIRE__STATIC: case FIRE__STATIC:
@ -8035,7 +8032,7 @@ static void A_DoLight(int32_t i)
case 1: color = 128+(128<<8)+(255<<16); break; case 1: color = 128+(128<<8)+(255<<16); break;
case 2: color = 255+(48<<8)+(48<<16); break; case 2: color = 255+(48<<8)+(48<<16); break;
case 8: color = 48+(255<<8)+(48<<16); break; case 8: color = 48+(255<<8)+(48<<16); break;
default: color = 255+(95<<8); break; default: color = 240+(160<<8)+(80<<16); break;
} }
for (jj=numsavedfires-1; jj>=0; jj--) for (jj=numsavedfires-1; jj>=0; jj--)
@ -8058,12 +8055,12 @@ static void A_DoLight(int32_t i)
case OOZFILTER__STATIC: case OOZFILTER__STATIC:
if (s->xrepeat > 4) if (s->xrepeat > 4)
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 4096, 128+(255<<8)+(128<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 4096, 176+(252<<8)+(120<<16),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case FLOORFLAME__STATIC: case FLOORFLAME__STATIC:
case FIREBARREL__STATIC: case FIREBARREL__STATIC:
case FIREVASE__STATIC: case FIREVASE__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD, 255+(95<<8),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<2), LIGHTRAD2>>1, 255+(95<<8),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case EXPLOSION2__STATIC: case EXPLOSION2__STATIC:
@ -8076,7 +8073,7 @@ static void A_DoLight(int32_t i)
s->x -= x; s->x -= x;
s->y -= y; s->y -= y;
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD, 255+(95<<8), G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD, 240+(160<<8)+(80<<16),
s->yrepeat > 32 ? PR_LIGHT_PRIO_HIGH_GAME : PR_LIGHT_PRIO_LOW_GAME); s->yrepeat > 32 ? PR_LIGHT_PRIO_HIGH_GAME : PR_LIGHT_PRIO_LOW_GAME);
s->x += x; s->x += x;
@ -8095,7 +8092,7 @@ static void A_DoLight(int32_t i)
s->x -= x; s->x -= x;
s->y -= y; s->y -= y;
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 2048, 255+(95<<8),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 1024, 216+(52<<8)+(20<<16),PR_LIGHT_PRIO_HIGH_GAME);
s->x += x; s->x += x;
s->y += y; s->y += y;
@ -8109,20 +8106,20 @@ static void A_DoLight(int32_t i)
s->x -= x; s->x -= x;
s->y -= y; s->y -= y;
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 2048, 128+(255<<8)+(128<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 2048, 176+(252<<8)+(120<<16),PR_LIGHT_PRIO_HIGH_GAME);
s->x += x; s->x += x;
s->y += y; s->y += y;
} }
break; break;
case FREEZEBLAST__STATIC: case FREEZEBLAST__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD<<2, 128+(128<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD<<2, 72+(88<<8)+(140<<16),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case COOLEXPLOSION1__STATIC: case COOLEXPLOSION1__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD<<2, 128+(0<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD<<2, 128+(0<<8)+(255<<16),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case SHRINKSPARK__STATIC: case SHRINKSPARK__STATIC:
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD, 128+(255<<8)+(128<<16),PR_LIGHT_PRIO_HIGH_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), LIGHTRAD, 176+(252<<8)+(120<<16),PR_LIGHT_PRIO_HIGH_GAME);
break; break;
case FIRELASER__STATIC: case FIRELASER__STATIC:
if (s->statnum == STAT_PROJECTILE) if (s->statnum == STAT_PROJECTILE)
@ -8140,7 +8137,7 @@ static void A_DoLight(int32_t i)
s->x -= x; s->x -= x;
s->y -= y; s->y -= y;
G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 16 * s->yrepeat, 255+(95<<8),PR_LIGHT_PRIO_LOW_GAME); G_AddGameLight(0, i, ((s->yrepeat*tilesiz[s->picnum].y)<<1), 8 * s->yrepeat, 240+(160<<8)+(80<<16),PR_LIGHT_PRIO_LOW_GAME);
actor[i].lightcount = 1; actor[i].lightcount = 1;
s->x += x; s->x += x;

6
polymer/eduke32/source/gamevars.c
View file

@ -1424,7 +1424,7 @@ static weapondata_t weapondefaults[MAX_WEAPONS] = {
SHRINKER_WEAPON, 0, 0, 10, /*NAM_WW2GI?30:*/12, 0, SHRINKER_WEAPON, 0, 0, 10, /*NAM_WW2GI?30:*/12, 0,
WEAPON_GLOWS, WEAPON_GLOWS,
SHRINKER__STATIC, 0, 0, 0, SHRINKER_FIRE__STATIC, 0, 0, 0, SHRINKER__STATIC, 0, 0, 0, SHRINKER_FIRE__STATIC, 0, 0, 0,
EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 128+(255<<8)+(128<<16) EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 176+(252<<8)+(120<<16)
}, },
{ {
@ -1445,7 +1445,7 @@ static weapondata_t weapondefaults[MAX_WEAPONS] = {
FREEZE_WEAPON, 0, 0, 3, 5, 0, FREEZE_WEAPON, 0, 0, 3, 5, 0,
WEAPON_RESET, WEAPON_RESET,
FREEZEBLAST__STATIC, 0, 0, 0, CAT_FIRE__STATIC, CAT_FIRE__STATIC, 0, 0, FREEZEBLAST__STATIC, 0, 0, 0, CAT_FIRE__STATIC, CAT_FIRE__STATIC, 0, 0,
EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 128+(128<<8)+(255<<16) EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 72+(88<<8)+(140<<16)
}, },
{ {
@ -1459,7 +1459,7 @@ static weapondata_t weapondefaults[MAX_WEAPONS] = {
GROW_WEAPON, 0, 0, 3, /*NAM_WW2GI?30:*/5, 0, GROW_WEAPON, 0, 0, 3, /*NAM_WW2GI?30:*/5, 0,
WEAPON_GLOWS, WEAPON_GLOWS,
GROWSPARK__STATIC, /*NAM_WW2GI?2:*/0, /*NAM_WW2GI?SHELL:*/0, 0, 0, /*NAM_WW2GI?0:*/EXPANDERSHOOT__STATIC, 0, 0, GROWSPARK__STATIC, /*NAM_WW2GI?2:*/0, /*NAM_WW2GI?SHELL:*/0, 0, 0, /*NAM_WW2GI?0:*/EXPANDERSHOOT__STATIC, 0, 0,
EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 255+(95<<8) EJECT_CLIP__STATIC, INSERT_CLIP__STATIC, SELECT_WEAPON__STATIC, 216+(52<<8)+(20<<16)
}, },
}; };