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

- Exhumed: Standardise horizon on 100 and remove backend extern'd polymostcenterhoriz variable.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-21 18:41:56 +10:00
parent 3de787235d
commit bdc53ed7b0
7 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/polymost.h
View file

@ -45,8 +45,6 @@ enum {
extern float curpolygonoffset; extern float curpolygonoffset;
extern int32_t polymostcenterhoriz;
extern int16_t globalpicnum; extern int16_t globalpicnum;
#define POLYMOST_CHOOSE_FOG_PAL(fogpal, pal) \ #define POLYMOST_CHOOSE_FOG_PAL(fogpal, pal) \

1
source/build/src/engine.cpp
View file

@ -48,7 +48,6 @@ int32_t r_rortexture = 0;
int32_t r_rortexturerange = 0; int32_t r_rortexturerange = 0;
int32_t r_rorphase = 0; int32_t r_rorphase = 0;
int32_t mdtims, omdtims; int32_t mdtims, omdtims;
int32_t polymostcenterhoriz = 100;
float fcosglobalang, fsinglobalang; float fcosglobalang, fsinglobalang;
float fxdim, fydim, fydimen, fviewingrange; float fxdim, fydim, fydimen, fviewingrange;

4
source/build/src/polymost.cpp
View file

@ -2484,7 +2484,7 @@ void polymost_drawrooms()
ghalfy = (float)(ydimen>>1); ghalfy = (float)(ydimen>>1);
grhalfxdown10 = 1.f/(ghalfx*1024.f); grhalfxdown10 = 1.f/(ghalfx*1024.f);
ghoriz = FixedToFloat(qglobalhoriz); ghoriz = FixedToFloat(qglobalhoriz);
ghorizcorrect = FixedToFloat((100-polymostcenterhoriz)*divscale16(xdimenscale, viewingrange)); ghorizcorrect = FixedToFloat(divscale16(xdimenscale, viewingrange));
GLInterface.SetShadeInterpolate(hw_shadeinterpolate); GLInterface.SetShadeInterpolate(hw_shadeinterpolate);
@ -2884,7 +2884,7 @@ void polymost_prepareMirror(int32_t dax, int32_t day, int32_t daz, fixed_t daang
ghalfy = (float)(ydimen>>1); ghalfy = (float)(ydimen>>1);
grhalfxdown10 = 1.f/(ghalfx*1024.f); grhalfxdown10 = 1.f/(ghalfx*1024.f);
ghoriz = FixedToFloat(qglobalhoriz); ghoriz = FixedToFloat(qglobalhoriz);
ghorizcorrect = FixedToFloat((100-polymostcenterhoriz)*divscale16(xdimenscale, viewingrange)); ghorizcorrect = FixedToFloat(divscale16(xdimenscale, viewingrange));
resizeglcheck(); resizeglcheck();
if (r_yshearing) if (r_yshearing)
{ {

5
source/exhumed/src/exhumed.cpp
View file

@ -425,8 +425,8 @@ void GameInterface::Ticker()
{ {
bLockPan = false; bLockPan = false;
bPlayerPan = false; bPlayerPan = false;
//PlayerList[nLocalPlayer].q16horiz = IntToFixed(92); //PlayerList[nLocalPlayer].q16horiz = IntToFixed(100);
nDestVertPan[nLocalPlayer] = IntToFixed(92); nDestVertPan[nLocalPlayer] = IntToFixed(100);
} }
if (localInput.actions & SB_TURNAROUND) if (localInput.actions & SB_TURNAROUND)
{ {
@ -528,7 +528,6 @@ void GameInterface::app_init()
TileFiles.SetBackup(); TileFiles.SetBackup();
InitView();
InitFX(); InitFX();
seq_LoadSequences(); seq_LoadSequences();
InitStatus(); InitStatus();

18
source/exhumed/src/player.cpp
View file

@ -437,8 +437,8 @@ void RestartPlayer(short nPlayer)
nYDamage[nPlayer] = 0; nYDamage[nPlayer] = 0;
nXDamage[nPlayer] = 0; nXDamage[nPlayer] = 0;
PlayerList[nPlayer].q16horiz = IntToFixed(92); PlayerList[nPlayer].q16horiz = IntToFixed(100);
nDestVertPan[nPlayer] = IntToFixed(92); nDestVertPan[nPlayer] = IntToFixed(100);
nBreathTimer[nPlayer] = 90; nBreathTimer[nPlayer] = 90;
nTauntTimer[nPlayer] = RandomSize(3) + 3; nTauntTimer[nPlayer] = RandomSize(3) + 3;
@ -539,7 +539,7 @@ void StartDeathSeq(int nPlayer, int nVal)
StopFiringWeapon(nPlayer); StopFiringWeapon(nPlayer);
PlayerList[nPlayer].q16horiz = IntToFixed(92); PlayerList[nPlayer].q16horiz = IntToFixed(100);
oeyelevel[nPlayer] = eyelevel[nPlayer] = -14080; oeyelevel[nPlayer] = eyelevel[nPlayer] = -14080;
nPlayerInvisible[nPlayer] = 0; nPlayerInvisible[nPlayer] = 0;
dVertPan[nPlayer] = 15; dVertPan[nPlayer] = 15;
@ -1036,7 +1036,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
PlayerList[nPlayer].q16angle = IntToFixed(GetAngleToSprite(nPlayerSprite, nSpiritSprite) & kAngleMask); PlayerList[nPlayer].q16angle = IntToFixed(GetAngleToSprite(nPlayerSprite, nSpiritSprite) & kAngleMask);
sprite[nPlayerSprite].ang = FixedToInt(PlayerList[nPlayer].q16angle); sprite[nPlayerSprite].ang = FixedToInt(PlayerList[nPlayer].q16angle);
PlayerList[nPlayer].q16horiz = IntToFixed(92); PlayerList[nPlayer].q16horiz = IntToFixed(100);
lPlayerXVel = 0; lPlayerXVel = 0;
lPlayerYVel = 0; lPlayerYVel = 0;
@ -1054,7 +1054,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
StopLocalSound(); StopLocalSound();
InitSpiritHead(); InitSpiritHead();
nDestVertPan[nPlayer] = IntToFixed(92); nDestVertPan[nPlayer] = IntToFixed(100);
if (currentLevel->levelNumber == 11) if (currentLevel->levelNumber == 11)
{ {
@ -1091,7 +1091,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
} }
if (zVelB > 512 && !bLockPan) { if (zVelB > 512 && !bLockPan) {
nDestVertPan[nPlayer] = IntToFixed(92); nDestVertPan[nPlayer] = IntToFixed(100);
} }
} }
@ -1192,7 +1192,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
loc_1AB8E: loc_1AB8E:
if (!bPlayerPan && !bLockPan) if (!bPlayerPan && !bLockPan)
{ {
fixed_t nPanVal = IntToFixed(spr_z - sprite[nPlayerSprite].z) / 32 + IntToFixed(92); fixed_t nPanVal = IntToFixed(spr_z - sprite[nPlayerSprite].z) / 32 + IntToFixed(100);
if (nPanVal < 0) { if (nPanVal < 0) {
nPanVal = 0; nPanVal = 0;
@ -2791,7 +2791,7 @@ loc_1BD2E:
} }
else else
{ {
if (PlayerList[nPlayer].q16horiz < IntToFixed(92)) if (PlayerList[nPlayer].q16horiz < IntToFixed(100))
{ {
PlayerList[nPlayer].q16horiz = IntToFixed(91); PlayerList[nPlayer].q16horiz = IntToFixed(91);
eyelevel[nPlayer] -= (dVertPan[nPlayer] << 8); eyelevel[nPlayer] -= (dVertPan[nPlayer] << 8);
@ -2803,7 +2803,7 @@ loc_1BD2E:
{ {
PlayerList[nPlayer].q16horiz = IntToFixed(199); PlayerList[nPlayer].q16horiz = IntToFixed(199);
} }
else if (PlayerList[nPlayer].q16horiz <= IntToFixed(92)) else if (PlayerList[nPlayer].q16horiz <= IntToFixed(100))
{ {
if (!(SectFlag[sprite[nPlayerSprite].sectnum] & kSectUnderwater)) if (!(SectFlag[sprite[nPlayerSprite].sectnum] & kSectUnderwater))
{ {

9
source/exhumed/src/view.cpp
View file

@ -120,11 +120,6 @@ void viewRestoreInterpolations(void) //Stick at end of drawscreen
for (; i>=0; i--) *curipos[i] = bakipos[i]; for (; i>=0; i--) *curipos[i] = bakipos[i];
} }
void InitView()
{
polymostcenterhoriz = 92;
}
// NOTE - not to be confused with Ken's analyzesprites() // NOTE - not to be confused with Ken's analyzesprites()
static void analyzesprites() static void analyzesprites()
{ {
@ -297,7 +292,7 @@ void DrawView(double smoothRatio, bool sceneonly)
{ {
if (nSnakeCam >= 0 && !sceneonly) if (nSnakeCam >= 0 && !sceneonly)
{ {
pan = IntToFixed(92); pan = IntToFixed(100);
viewz = playerZ; viewz = playerZ;
} }
else else
@ -321,7 +316,7 @@ void DrawView(double smoothRatio, bool sceneonly)
-2000 * Sin(inita), -2000 * Sin(inita),
4, 0, 0, CLIPMASK1); 4, 0, 0, CLIPMASK1);
pan = IntToFixed(92); pan = IntToFixed(100);
viewz = playerZ; viewz = playerZ;
} }

1
source/exhumed/src/view.h
View file

@ -27,7 +27,6 @@ extern short bSubTitles;
extern short besttarget; extern short besttarget;
extern short bCamera; extern short bCamera;
void InitView();
void DrawStatusBar(); void DrawStatusBar();
void DrawView(double smoothRatio, bool sceneonly = false); void DrawView(double smoothRatio, bool sceneonly = false);
void ResetView(); void ResetView();