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

- changed Duke/RR palette handling to only retrieve the currently active palette right before rendering.

Browse source 
Storing this in the player_struct is pointless and a relic from having to use real hardware palette switches.
With this now just being a translation index being passed to the backend it can be cheaply retrieved right when used and nowhere else.
Also making some changes to how RRRA's psychedelic cactus handles the projection. This fixes issues with occasionally passing a bad matrix.
This commit is contained in:
Christoph Oelckers 2020-11-05 07:16:29 +01:00
parent e8ccd9bc8c
commit d8e331ef0f
16 changed files with 6 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/duke/src/actors.cpp
View file

@ -208,7 +208,6 @@ void clearcamera(player_struct* ps)
ps->posz = ps->oposz;
ps->angle.restore();
updatesector(ps->posx, ps->posy, &ps->cursectnum);
setpal(ps);
DukeStatIterator it(STAT_ACTOR);
while (auto k = it.Next())

3
source/games/duke/src/actors_d.cpp
View file

@ -2150,8 +2150,6 @@ void movetransports_d(void)
changespritesect(act2, Owner->s.sectnum);
setsprite(ps[p].GetActor(), ps[p].posx, ps[p].posy, ps[p].posz + PHEIGHT);
setpal(&ps[p]);
if ((krand() & 255) < 32)
spawn(act2, WATERSPLASH2);
@ -2474,7 +2472,6 @@ static void greenslime(DDukeActor *actor)
ps[p].angle.restore();
updatesector(ps[p].posx, ps[p].posy, &ps[p].cursectnum);
setpal(&ps[p]);
DukeStatIterator it(STAT_ACTOR);
while (auto ac = it.Next())

2
source/games/duke/src/actors_r.cpp
View file

@ -1735,8 +1735,6 @@ void movetransports_r(void)
changespritesect(act2, Owner->s.sectnum);
setpal(&ps[p]);
if ((krand() & 255) < 32)
spawn(ps[p].GetActor(), WATERSPLASH2);
}

2
source/games/duke/src/funct.h
View file

@ -132,7 +132,7 @@ DDukeActor* aim(DDukeActor* s, int aang);
void checkweapons(struct player_struct* const p);
int findotherplayer(int p, int* d);
void quickkill(struct player_struct* p);
void setpal(struct player_struct* p);
int setpal(struct player_struct* p);
int madenoise(int playerNum);
int haskey(int sect, int snum);
void shootbloodsplat(DDukeActor* i, int p, int sx, int sy, int sz, int sa, int atwith, int BIGFORCE, int OOZFILTER, int NEWBEAST);

1
source/games/duke/src/game.cpp
View file

@ -325,7 +325,6 @@ void GameInterface::app_init()
registerosdcommands();
screenpeek = myconnectindex;
ps[myconnectindex].palette = BASEPAL;
for (int j = numplayers; j < ud.multimode; j++)
{

2
source/games/duke/src/game_misc.cpp
View file

@ -586,7 +586,7 @@ bool GameInterface::DrawAutomapPlayer(int cposx, int cposy, int czoom, int cang)
if (j < 22000) j = 22000;
else if (j > (65536 << 1)) j = (65536 << 1);
DrawTexture(twod, tileGetTexture(i), xdim / 2. + x1 / 4096., ydim / 2. + y1 / 4096., DTA_TranslationIndex, TRANSLATION(Translation_Remap + pp.palette, pspr->pal), DTA_CenterOffset, true,
DrawTexture(twod, tileGetTexture(i), xdim / 2. + x1 / 4096., ydim / 2. + y1 / 4096., DTA_TranslationIndex, TRANSLATION(Translation_Remap + setpal(&pp), pspr->pal), DTA_CenterOffset, true,
DTA_Rotate, daang * (-360./2048), DTA_Color, shadeToLight(pspr->shade), DTA_ScaleX, j / 65536., DTA_ScaleY, j / 65536., TAG_DONE);
}
}

2
source/games/duke/src/gameexec.cpp
View file

@ -2054,7 +2054,6 @@ int ParseState::parse(void)
ps[g_p].posz = ps[g_p].oposz;
ps[g_p].angle.restore();
updatesector(ps[g_p].posx,ps[g_p].posy,&ps[g_p].cursectnum);
setpal(&ps[g_p]);
DukeStatIterator it(STAT_ACTOR);
while (auto j = it.Next())
@ -2273,7 +2272,6 @@ int ParseState::parse(void)
resetinventory(g_p);
resetweapons(g_p);
}
setpal(&ps[g_p]);
break;
case concmd_ifcoop:
parseifelse(ud.coop || numplayers > 2);

1
source/games/duke/src/input.cpp
View file

@ -136,7 +136,6 @@ void hud_input(int plnum)
if (GetGameVarID(g_iReturnVarID, nullptr, plnum) == 0 && p->heat_amount > 0)
{
p->heat_on = !p->heat_on;
setpal(p);
p->inven_icon = 5;
S_PlayActorSound(NITEVISION_ONOFF, pact);
FTA(106 + (!p->heat_on), p);

4
source/games/duke/src/player.cpp
View file

@ -125,7 +125,7 @@ void calcviewpitch(player_struct *p, double factor)
//
//---------------------------------------------------------------------------
void setpal(struct player_struct* p)
int setpal(struct player_struct* p)
{
int palette;
if (p->DrugMode) palette = DRUGPAL;
@ -134,7 +134,7 @@ void setpal(struct player_struct* p)
else if (sector[p->cursectnum].ceilingpicnum >= TILE_FLOORSLIME && sector[p->cursectnum].ceilingpicnum <= TILE_FLOORSLIME + 2) palette = SLIMEPAL;
else if (sector[p->cursectnum].lotag == ST_2_UNDERWATER) palette = WATERPAL;
else palette = BASEPAL;
p->palette = palette;
return palette;
}
//---------------------------------------------------------------------------

1
source/games/duke/src/player_d.cpp
View file

@ -1474,7 +1474,6 @@ int doincrements_d(struct player_struct* p)
p->heat_on = 0;
checkavailinven(p);
S_PlayActorSound(NITEVISION_ONOFF, pact);
setpal(p);
}
}

4
source/games/duke/src/premap.cpp
View file

@ -128,7 +128,6 @@ void resetplayerstats(int snum)
p->random_club_frame= 0;
p->on_warping_sector = 0;
p->spritebridge = 0;
p->palette = 0;
if(p->steroids_amount < 400 )
{
@ -166,7 +165,6 @@ void resetplayerstats(int snum)
p->knuckle_incs = 1;
p->fist_incs = 0;
p->knee_incs = 0;
setpal(p);
p->stairs = 0;
p->noise_x = 0;
p->noise_y = 0;
@ -962,7 +960,6 @@ void enterlevel(MapRecord *mi, int gamemode)
}
}
resetmys();
setpal(&ps[myconnectindex]);
everyothertime = 0;
global_random = 0;
@ -1063,7 +1060,6 @@ void exitlevel(MapRecord *nextlevel)
{
bool endofgame = nextlevel == nullptr;
STAT_Update(endofgame);
setpal(&ps[myconnectindex]);
StopCommentary();
dobonus(endofgame? -1 : 0, [=](bool)

15
source/games/duke/src/render.cpp
View file

@ -323,16 +323,13 @@ void setdrugmode(player_struct *p, int oyrepeat)
var_8c = oyrepeat + p->drug_stat[1] * 5000;
if (oyrepeat * 3 < var_8c)
{
renderSetAspect(oyrepeat * 3, yxaspect);
p->drug_aspect = oyrepeat * 3;
p->drug_stat[0] = 2;
}
else
{
renderSetAspect(var_8c, yxaspect);
p->drug_aspect = var_8c;
}
setpal(p);
}
else if (p->drug_stat[0] == 3)
{
@ -340,7 +337,6 @@ void setdrugmode(player_struct *p, int oyrepeat)
var_8c = oyrepeat + p->drug_stat[1] * 5000;
if (var_8c < oyrepeat)
{
renderSetAspect(oyrepeat, yxaspect);
p->DrugMode = 0;
p->drug_stat[0] = 0;
p->drug_stat[2] = 0;
@ -348,10 +344,8 @@ void setdrugmode(player_struct *p, int oyrepeat)
}
else
{
renderSetAspect(var_8c, yxaspect);
p->drug_aspect = var_8c;
}
setpal(p);
}
else if (p->drug_stat[0] == 2)
{
@ -362,9 +356,7 @@ void setdrugmode(player_struct *p, int oyrepeat)
else
{
p->drug_stat[2]++;
renderSetAspect(p->drug_stat[2] * 500 + oyrepeat * 3, yxaspect);
p->drug_aspect = oyrepeat * 3 + p->drug_stat[2] * 500;
setpal(p);
}
}
else
@ -379,17 +371,14 @@ void setdrugmode(player_struct *p, int oyrepeat)
else
{
p->drug_stat[2]--;
renderSetAspect(p->drug_stat[2] * 500 + oyrepeat * 3, yxaspect);
p->drug_aspect = oyrepeat * 3 + p->drug_stat[2] * 500;
setpal(p);
}
}
}
}
else if (p->DrugMode > 0)
if (p->DrugMode > 0)
{
renderSetAspect(p->drug_aspect, yxaspect);
setpal(p);
}
}
@ -514,7 +503,7 @@ void displayrooms(int snum, double smoothratio)
// The camera texture must be rendered with the base palette, so this is the only place where the current global palette can be set.
// The setting here will be carried over to the rendering of the weapon sprites, but other 2D content will always default to the main palette.
setgamepalette(p->palette);
setgamepalette(setpal(p));
if (ud.cameraactor)
{
spritetype* s;

2
source/games/duke/src/savegame.cpp
View file

@ -133,7 +133,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w,
("angle", w.angle)
("horizon", w.horizon)
("gotweapon", w.gotweapon)
("palette", w.palette)
("pals", w.pals)
("fricx", w.fric.x)
("fricy", w.fric.y)
@ -476,7 +475,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
cameraclock = 0;
ps[myconnectindex].over_shoulder_on = 1;
}
setpal(&ps[myconnectindex]);
memset(gotpic, 0, sizeof(gotpic));
if (isRR()) cacheit_r(); else cacheit_d();

3
source/games/duke/src/sectors_d.cpp
View file

@ -1458,7 +1458,6 @@ void checkhitsprite_d(DDukeActor* targ, DDukeActor* proj)
ps[p].angle.restore();
updatesector(ps[p].posx, ps[p].posy, &ps[p].cursectnum);
setpal(&ps[p]);
DukeStatIterator it(STAT_ACTOR);
while (auto j = it.Next())
@ -1715,7 +1714,6 @@ void checksectors_d(int snum)
j = p->cursectnum;
p->cursectnum = spr->sectnum;
setpal(p);
p->cursectnum = j;
// parallaxtype = 2;
@ -1736,7 +1734,6 @@ void checksectors_d(int snum)
p->newOwner = nullptr;
updatesector(p->posx, p->posy, &p->cursectnum);
setpal(p);
DukeStatIterator it(STAT_ACTOR);
while (auto act = it.Next())

1
source/games/duke/src/sectors_r.cpp
View file

@ -2406,7 +2406,6 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
ps[p].posz = ps[p].oposz;
updatesector(ps[p].posx, ps[p].posy, &ps[p].cursectnum);
setpal(&ps[p]);
DukeStatIterator it(STAT_EFFECTOR);
while (auto act = it.Next())

1
source/games/duke/src/types.h
View file

@ -177,7 +177,6 @@ struct player_struct
FixedBitArray<MAX_WEAPONS> gotweapon;
// Palette management uses indices into the engine's palette table now.
unsigned int palette;
PalEntry pals;
// this was a global variable originally.