OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

added per-sector sky UDMF properties.

Browse source 
(Hardware rendering only, the SW renderer is not in a state where this is easily done.)
This commit is contained in:
Christoph Oelckers 2023-10-29 17:49:59 +01:00
commit bdee1f3d34
14 changed files with 63 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/hwrenderer/scene/hw_portal.cpp
View file

@ -1029,7 +1029,7 @@ void HWEEHorizonPortal::DrawContents(HWDrawInfo *di, FRenderState &state)
sector->GetTexture(sector_t::ceiling) == skyflatnum)
{
HWSkyInfo skyinfo;
skyinfo.init(di, sector->sky, 0);
skyinfo.init(di, sector, sector_t::ceiling, sector->skytransfer, 0);
HWSkyPortal sky(screen->mSkyData, mState, &skyinfo, true);
sky.DrawContents(di, state);
}

2
src/rendering/hwrenderer/scene/hw_portal.h
View file

@ -30,7 +30,7 @@ struct HWSkyInfo
{
return !!memcmp(this, &inf, sizeof(*this));
}
void init(HWDrawInfo *di, int sky1, PalEntry fadecolor);
void init(HWDrawInfo *di, sector_t* sec, int skypos, int sky1, PalEntry fadecolor);
};
struct HWHorizonInfo

31
src/rendering/hwrenderer/scene/hw_sky.cpp
View file

@ -37,13 +37,26 @@
CVAR(Bool,gl_noskyboxes, false, 0)
//===========================================================================
//
//
//
//===========================================================================
FTextureID GetSkyTexture(sector_t* sec, int plane, int second)
{
auto tex = sec->planes[plane].skytexture[second];
if (tex.isValid()) return tex;
return second ? sec->Level->skytexture2 : sec->Level->skytexture1;
}
//==========================================================================
//
// Set up the skyinfo struct
//
//==========================================================================
void HWSkyInfo::init(HWDrawInfo *di, int sky1, PalEntry FadeColor)
void HWSkyInfo::init(HWDrawInfo *di, sector_t* sec, int skypos, int sky1, PalEntry FadeColor)
{
memset(this, 0, sizeof(*this));
if ((sky1 & PL_SKYFLAT) && (sky1 & (PL_SKYFLAT - 1)))
@ -73,25 +86,27 @@ void HWSkyInfo::init(HWDrawInfo *di, int sky1, PalEntry FadeColor)
else
{
normalsky:
auto skytex1 = GetSkyTexture(sec, skypos, false);
auto skytex2 = GetSkyTexture(sec, skypos, true);
if (di->Level->flags&LEVEL_DOUBLESKY)
{
auto tex1 = TexMan.GetGameTexture(di->Level->skytexture1, true);
auto tex1 = TexMan.GetGameTexture(skytex1);
texture[1] = tex1;
x_offset[1] = di->Level->hw_sky1pos;
doublesky = true;
}
if ((di->Level->flags&LEVEL_SWAPSKIES || (sky1 == PL_SKYFLAT) || (di->Level->flags&LEVEL_DOUBLESKY)) &&
di->Level->skytexture2 != di->Level->skytexture1) // If both skies are equal use the scroll offset of the first!
skytex2 != skytex1) // If both skies are equal use the scroll offset of the first!
{
texture[0] = TexMan.GetGameTexture(di->Level->skytexture2, true);
skytexno1 = di->Level->skytexture2;
texture[0] = TexMan.GetGameTexture(skytex2, true);
skytexno1 = skytex2;
sky2 = true;
x_offset[0] = di->Level->hw_sky2pos;
}
else if (!doublesky)
{
texture[0] = TexMan.GetGameTexture(di->Level->skytexture1, true);
texture[0] = TexMan.GetGameTexture(skytex1, true);
skytexno1 = di->Level->skytexture1;
x_offset[0] = di->Level->hw_sky1pos;
}
@ -125,7 +140,7 @@ void HWWall::SkyPlane(HWWallDispatcher *di, sector_t *sector, int plane, bool al
if (di->di)
{
HWSkyInfo skyinfo;
skyinfo.init(di->di, sector->sky, Colormap.FadeColor);
skyinfo.init(di->di, sector, plane, sector->skytransfer, Colormap.FadeColor);
ptype = PORTALTYPE_SKY;
sky = &skyinfo;
}
@ -199,7 +214,7 @@ void HWWall::SkyLine(HWWallDispatcher *di, sector_t *fs, line_t *line)
}
else
{
if (di->di) skyinfo.init(di->di, fs->sky, Colormap.FadeColor);
if (di->di) skyinfo.init(di->di, fs, sector_t::ceiling, fs->skytransfer, Colormap.FadeColor);
ptype = PORTALTYPE_SKY;
sky = &skyinfo;
}

8
src/rendering/swrenderer/scene/r_opaque_pass.cpp
View file

@ -555,7 +555,7 @@ namespace swrenderer
frontsector->GetAlpha(sector_t::ceiling),
!!(frontsector->GetFlags(sector_t::ceiling) & PLANEF_ADDITIVE),
frontsector->planes[sector_t::ceiling].xform,
frontsector->sky,
frontsector->skytransfer,
portal,
basecolormap,
Fake3DOpaque::Normal,
@ -595,7 +595,7 @@ namespace swrenderer
frontsector->GetAlpha(sector_t::floor),
!!(frontsector->GetFlags(sector_t::floor) & PLANEF_ADDITIVE),
frontsector->planes[sector_t::floor].xform,
frontsector->sky,
frontsector->skytransfer,
portal,
basecolormap,
Fake3DOpaque::Normal,
@ -732,7 +732,7 @@ namespace swrenderer
tempsec.GetAlpha(sector_t::floor),
!!(clip3d->fakeFloor->fakeFloor->flags & FF_ADDITIVETRANS),
tempsec.planes[position].xform,
tempsec.sky,
tempsec.skytransfer,
nullptr,
basecolormap,
Fake3DOpaque::FakeFloor,
@ -800,7 +800,7 @@ namespace swrenderer
tempsec.GetAlpha(sector_t::ceiling),
!!(clip3d->fakeFloor->fakeFloor->flags & FF_ADDITIVETRANS),
tempsec.planes[position].xform,
tempsec.sky,
tempsec.skytransfer,
nullptr,
basecolormap,
Fake3DOpaque::FakeCeiling,