teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-03-21 17:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Simon 2023-02-06 19:36:00 +00:00
commit 0778e73f9f
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/common/statusbar/base_sbar.cpp
View file

@ -368,7 +368,7 @@ void DStatusBarCore::SetScale()
double screenaspect = w / double(h);
double aspectscale = 1.0;
double ViewportAspect = ViewportPixelAspect();
const double ViewportAspect = 1. / ViewportPixelAspect();
if ((horz == 320 && vert == 200) || (horz == 640 && vert == 400))
{
@ -387,9 +387,9 @@ void DStatusBarCore::SetScale()
refw = h * refaspect;
}
refw *= hud_scalefactor;
refh *= hud_scalefactor * aspectscale / ViewportAspect;
refh *= hud_scalefactor * aspectscale * ViewportAspect;
int sby = vert - int(RelTop * hud_scalefactor * aspectscale / ViewportAspect);
int sby = vert - int(RelTop * hud_scalefactor * aspectscale * ViewportAspect);
// Use full pixels for destination size.
ST_X = xs_CRoundToInt((w - refw) / 2);

14
source/core/rendering/hw_entrypoint.cpp
View file

@ -165,10 +165,18 @@ void RenderViewpoint(FRenderViewpoint& mainvp, IntRect* bounds, float fov, float
// Stereo mode specific perspective projection
di->VPUniforms.mProjectionMatrix = eye.GetProjection(fov, ratio, fovratio);
// Stereo mode specific viewpoint adjustment
vp.Pos += eye.GetViewShift(vp.HWAngles);
di->SetupView(RenderState, vp.Pos.X, vp.Pos.Y, vp.Pos.Z, false, false);
// Stereo mode specific viewpoint adjustment
if (eye.mShiftFactor != 0)
{
vp.Pos += eye.GetViewShift(vp.HWAngles);
sectortype* sect = &sector[vp.SectCount];
updatesector(DVector2(vp.Pos.X, -vp.Pos.Y), &sect);
vp.SectCount = sectindex(sect);
}
di->SetupView(RenderState, vp.Pos.X, vp.Pos.Y, vp.Pos.Z, false, false);
di->ProcessScene(toscreen);
if (mainview)

6
wadsrc/static/zscript/games/duke/actors/destructibles.zs
View file

@ -43,6 +43,12 @@ class DukeStatueFlash : DukeActor
{
pic "STATUEFLASH";
}
override void Initialize()
{
self.clipdist = 32;
self.cstat |= CSTAT_SPRITE_BLOCK_ALL;
}
override void OnHit(DukeActor proj)
{