zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-21 11:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved the static sky variables into FLevelLocals and removed the redundant ones for the texture ID.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-11 00:05:07 +01:00
parent 439c36c8f7
commit 1c4e3ae06d
15 changed files with 105 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/c_cmds.cpp
View file

@ -1046,24 +1046,25 @@ CCMD(countitemsnum) // [SP] # of counted items
//-----------------------------------------------------------------------------
CCMD(changesky)
{
const char *sky1name;
if (netgame || argv.argc()<2) return;
sky1name = argv[1];
if (sky1name[0] != 0)
const char *sky1name = argv[1];
ForAllLevels([=](FLevelLocals *Level)
{
FTextureID newsky = TexMan.GetTextureID(sky1name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable | FTextureManager::TEXMAN_ReturnFirst);
if (newsky.Exists())
if (sky1name[0] != 0)
{
sky1texture = level.skytexture1 = newsky;
FTextureID newsky = TexMan.GetTextureID(sky1name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable | FTextureManager::TEXMAN_ReturnFirst);
if (newsky.Exists())
{
Level->skytexture1 = newsky;
}
else
{
Printf("changesky: Texture '%s' not found\n", sky1name);
}
}
else
{
Printf("changesky: Texture '%s' not found\n", sky1name);
}
}
R_InitSkyMap ();
InitSkyMap(Level);
});
}
//-----------------------------------------------------------------------------

3
src/d_main.cpp
View file

@ -361,8 +361,7 @@ CUSTOM_CVAR (Int, dmflags, 0, CVAR_SERVERINFO)
{
// In case DF_NO_FREELOOK was changed, reinitialize the sky
// map. (If no freelook, then no need to stretch the sky.)
if (sky1texture.isValid())
R_InitSkyMap ();
R_InitSkyMap ();
if (self & DF_NO_FREELOOK)
{

4
src/fragglescript/t_load.cpp
View file

@ -143,8 +143,8 @@ void FScriptLoader::ParseInfoCmd(char *line, FString &scriptsrc)
sc.MustGetStringName("=");
sc.MustGetString();
sky2texture = sky1texture = Level->skytexture1 = Level->skytexture2 = TexMan.GetTextureID (sc.String, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
R_InitSkyMap ();
Level->skytexture1 = Level->skytexture2 = TexMan.GetTextureID (sc.String, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
InitSkyMap (Level);
}
else if (sc.Compare("interpic"))
{

18
src/g_level.cpp
View file

@ -1032,12 +1032,6 @@ void G_DoLoadLevel (int position, bool autosave, bool newGame)
// setting one.
skyflatnum = TexMan.GetTextureID (gameinfo.SkyFlatName, ETextureType::Flat, FTextureManager::TEXMAN_Overridable);
// DOOM determines the sky texture to be used
// depending on the current episode and the game version.
// [RH] Fetch sky parameters from FLevelLocals.
sky1texture = level.skytexture1;
sky2texture = level.skytexture2;
// [RH] Set up details about sky rendering
R_InitSkyMap ();
@ -1294,10 +1288,10 @@ void G_WorldDone (FLevelLocals *Level)
}
}
DEFINE_ACTION_FUNCTION(FLevelLocals, WorldDone)
DEFINE_ACTION_FUNCTION(FGameSession, WorldDone)
{
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
G_WorldDone(self);
PARAM_SELF_STRUCT_PROLOGUE(FGameSession);
G_WorldDone(self->Levelinfo[0]);
return 0;
}
@ -2365,9 +2359,9 @@ DEFINE_ACTION_FUNCTION(FLevelLocals, ChangeSky)
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_INT(sky1);
PARAM_INT(sky2);
sky1texture = self->skytexture1 = FSetTextureID(sky1);
sky2texture = self->skytexture2 = FSetTextureID(sky2);
R_InitSkyMap();
self->skytexture1 = FSetTextureID(sky1);
self->skytexture2 = FSetTextureID(sky2);
InitSkyMap(self);
return 0;
}

4
src/g_levellocals.h
View file

@ -215,6 +215,10 @@ struct FLevelLocals : public FLevelData
float skyspeed1; // Scrolling speed of sky textures, in pixels per ms
float skyspeed2;
double sky1pos, sky2pos;
float hw_sky1pos, hw_sky2pos;
bool skystretch;
int total_secrets;
int found_secrets;

18
src/hwrenderer/scene/hw_sky.cpp
View file

@ -72,24 +72,24 @@ void GLSkyInfo::init(HWDrawInfo *di, int sky1, PalEntry FadeColor)
normalsky:
if (di->Level->flags&LEVEL_DOUBLESKY)
{
texture[1] = FMaterial::ValidateTexture(sky1texture, false, true);
x_offset[1] = hw_sky1pos;
texture[1] = FMaterial::ValidateTexture(di->Level->skytexture1, false, true);
x_offset[1] = di->Level->hw_sky1pos;
doublesky = true;
}
if ((di->Level->flags&LEVEL_SWAPSKIES || (sky1 == PL_SKYFLAT) || (di->Level->flags&LEVEL_DOUBLESKY)) &&
sky2texture != sky1texture) // If both skies are equal use the scroll offset of the first!
di->Level->skytexture2 != di->Level->skytexture1) // If both skies are equal use the scroll offset of the first!
{
texture[0] = FMaterial::ValidateTexture(sky2texture, false, true);
skytexno1 = sky2texture;
texture[0] = FMaterial::ValidateTexture(di->Level->skytexture2, false, true);
skytexno1 = di->Level->skytexture2;
sky2 = true;
x_offset[0] = hw_sky2pos;
x_offset[0] = di->Level->hw_sky2pos;
}
else if (!doublesky)
{
texture[0] = FMaterial::ValidateTexture(sky1texture, false, true);
skytexno1 = sky1texture;
x_offset[0] = hw_sky1pos;
texture[0] = FMaterial::ValidateTexture(di->Level->skytexture1, false, true);
skytexno1 = di->Level->skytexture1;
x_offset[0] = di->Level->hw_sky1pos;
}
}
if (di->Level->skyfog > 0)

6
src/p_acs.cpp
View file

@ -9794,13 +9794,13 @@ scriptwait:
sky2name = Level->Behaviors.LookupString (STACK(1));
if (sky1name[0] != 0)
{
sky1texture = Level->skytexture1 = TexMan.GetTextureID(sky1name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
Level->skytexture1 = TexMan.GetTextureID(sky1name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
}
if (sky2name[0] != 0)
{
sky2texture = Level->skytexture2 = TexMan.GetTextureID(sky2name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
Level->skytexture2 = TexMan.GetTextureID(sky2name, ETextureType::Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst);
}
R_InitSkyMap ();
InitSkyMap (Level);
sp -= 2;
}
break;

4
src/p_saveg.cpp
View file

@ -956,9 +956,7 @@ void G_SerializeLevel(FSerializer &arc, FLevelLocals *Level, bool hubload)
if (arc.isReading())
{
sky1texture = Level->skytexture1;
sky2texture = Level->skytexture2;
R_InitSkyMap();
InitSkyMap(Level);
}
Level->Behaviors.SerializeModuleStates(arc);

15
src/p_setup.cpp
View file

@ -170,20 +170,14 @@ static void PrecacheLevel(FLevelLocals *Level)
AddToList(hitlist.Data(), Level->sides[i].GetTexture(side_t::bottom), FTextureManager::HIT_Wall);
}
// Sky texture is always present.
// Note that F_SKY1 is the name used to
// indicate a sky floor/ceiling as a flat,
// while the sky texture is stored like
// a wall texture, with an episode dependant
// name.
if (sky1texture.isValid())
if (Level->skytexture1.isValid())
{
AddToList(hitlist.Data(), sky1texture, FTextureManager::HIT_Sky);
AddToList(hitlist.Data(), Level->skytexture1, FTextureManager::HIT_Sky);
}
if (sky2texture.isValid())
if (Level->skytexture2.isValid())
{
AddToList(hitlist.Data(), sky2texture, FTextureManager::HIT_Sky);
AddToList(hitlist.Data(), Level->skytexture2, FTextureManager::HIT_Sky);
}
for (auto n : gameinfo.PrecachedTextures)
@ -355,7 +349,6 @@ void P_FreeLevelData ()
// [ZZ] delete per-map event handlers
E_Shutdown(true);
R_FreePastViewers();
level.ClearLevelData();
}

21
src/polyrenderer/scene/poly_sky.cpp
View file

@ -291,9 +291,10 @@ void PolySkySetup::Update()
double skyscale = 0.0;
float skyiscale = 0.0f;
fixed_t sky1cyl = 0, sky2cyl = 0;
auto Level = PolyRenderer::Instance()->Level;
auto skytex1 = TexMan.GetPalettedTexture(sky1texture, true);
auto skytex2 = TexMan.GetPalettedTexture(sky2texture, true);
auto skytex1 = TexMan.GetPalettedTexture(Level->skytexture1, true);
auto skytex2 = TexMan.GetPalettedTexture(Level->skytexture2, true);
if (skytex1)
{
@ -307,7 +308,7 @@ void PolySkySetup::Update()
}
else if (skyheight > 200)
{
skytexturemid = (200 - skyheight) * sskytex1->GetScale().Y + ((r_skymode == 2 && !(PolyRenderer::Instance()->Level->flags & LEVEL_FORCETILEDSKY)) ? skytex1->GetSkyOffset() : 0);
skytexturemid = (200 - skyheight) * sskytex1->GetScale().Y + ((r_skymode == 2 && !(Level->flags & LEVEL_FORCETILEDSKY)) ? skytex1->GetSkyOffset() : 0);
}
if (viewwidth != 0 && viewheight != 0)
@ -319,7 +320,7 @@ void PolySkySetup::Update()
skyscale *= float(90. / r_viewpoint.FieldOfView.Degrees);
}
if (skystretch)
if (Level->skystretch)
{
skyscale *= (double)SKYSTRETCH_HEIGHT / skyheight;
skyiscale *= skyheight / (float)SKYSTRETCH_HEIGHT;
@ -339,13 +340,13 @@ void PolySkySetup::Update()
if ((PolyRenderer::Instance()->Level->flags & LEVEL_SWAPSKIES) && !(PolyRenderer::Instance()->Level->flags & LEVEL_DOUBLESKY))
{
sky1tex = sky2texture;
sky1tex = Level->skytexture2;
}
else
{
sky1tex = sky1texture;
sky1tex = Level->skytexture1;
}
sky2tex = sky2texture;
sky2tex = Level->skytexture2;
skymid = skytexturemid;
skyangle = 0;
@ -360,8 +361,8 @@ void PolySkySetup::Update()
else
backskytex = nullptr;
skyflip = false;
frontdpos = sky1pos;
backdpos = sky2pos;
frontdpos = Level->sky1pos;
backdpos = Level->sky2pos;
frontcyl = sky1cyl;
backcyl = sky2cyl;
}
@ -371,7 +372,7 @@ void PolySkySetup::Update()
backskytex = nullptr;
frontcyl = sky2cyl;
skyflip = false;
frontdpos = sky2pos;
frontdpos = Level->sky2pos;
}
else
{ // MBF's linedef-controlled skies

53
src/r_sky.cpp
View file

@ -43,10 +43,6 @@
// sky mapping
//
FTextureID skyflatnum;
FTextureID sky1texture, sky2texture;
double sky1pos, sky2pos;
float hw_sky1pos, hw_sky2pos;
bool skystretch;
// [RH] Stretch sky texture if not taller than 128 pixels?
// Also now controls capped skies. 0 = normal, 1 = stretched, 2 = capped
@ -65,31 +61,32 @@ CVAR(Float, skyoffset, 0, 0) // for testing
//
//==========================================================================
void R_InitSkyMap()
void InitSkyMap(FLevelLocals *Level)
{
int skyheight;
FTexture *skytex1, *skytex2;
// Do not allow the null texture which has no bitmap and will crash.
if (sky1texture.isNull())
if (Level->skytexture1.isNull())
{
sky1texture = TexMan.CheckForTexture("-noflat-", ETextureType::Any);
Level->skytexture1 = TexMan.CheckForTexture("-noflat-", ETextureType::Any);
}
if (sky2texture.isNull())
if (Level->skytexture2.isNull())
{
sky2texture = TexMan.CheckForTexture("-noflat-", ETextureType::Any);
Level->skytexture2 = TexMan.CheckForTexture("-noflat-", ETextureType::Any);
}
skytex1 = TexMan.GetTexture(sky1texture, false);
skytex2 = TexMan.GetTexture(sky2texture, false);
skytex1 = TexMan.GetTexture(Level->skytexture1, false);
skytex2 = TexMan.GetTexture(Level->skytexture2, false);
if (skytex1 == nullptr)
return;
if ((level.flags & LEVEL_DOUBLESKY) && skytex1->GetDisplayHeight() != skytex2->GetDisplayHeight())
if ((Level->flags & LEVEL_DOUBLESKY) && skytex1->GetDisplayHeight() != skytex2->GetDisplayHeight())
{
Printf(TEXTCOLOR_BOLD "Both sky textures must be the same height." TEXTCOLOR_NORMAL "\n");
sky2texture = sky1texture;
Level->flags &= ~LEVEL_DOUBLESKY;
Level->skytexture1 = Level->skytexture2;
}
// There are various combinations for sky rendering depending on how tall the sky is:
@ -109,14 +106,20 @@ void R_InitSkyMap()
if (skyheight >= 128 && skyheight < 200)
{
skystretch = (r_skymode == 1
Level->skystretch = (r_skymode == 1
&& skyheight >= 128
&& level.IsFreelookAllowed()
&& !(level.flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
&& Level->IsFreelookAllowed()
&& !(Level->flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
}
else skystretch = false;
else Level->skystretch = false;
}
void R_InitSkyMap()
{
ForAllLevels(InitSkyMap);
}
//==========================================================================
//
// R_UpdateSky
@ -127,14 +130,16 @@ void R_InitSkyMap()
void R_UpdateSky (uint64_t mstime)
{
// Scroll the sky
double ms = (double)mstime * FRACUNIT;
sky1pos = ms * level.skyspeed1;
sky2pos = ms * level.skyspeed2;
// The hardware renderer uses a different value range and clamps it to a single rotation
hw_sky1pos = (float)(fmod((double(mstime) * level.skyspeed1), 1024.) * (90. / 256.));
hw_sky2pos = (float)(fmod((double(mstime) * level.skyspeed2), 1024.) * (90. / 256.));
ForAllLevels([=](FLevelLocals *Level)
{
// Scroll the sky
Level->sky1pos = ms * level.skyspeed1;
Level->sky2pos = ms * level.skyspeed2;
// The hardware renderer uses a different value range and clamps it to a single rotation
Level->hw_sky1pos = (float)(fmod((double(mstime) * level.skyspeed1), 1024.) * (90. / 256.));
Level->hw_sky2pos = (float)(fmod((double(mstime) * level.skyspeed2), 1024.) * (90. / 256.));
});
}

7
src/r_sky.h
View file

@ -30,16 +30,15 @@
#include "textures/textures.h"
struct FLevelLocals;
extern FTextureID skyflatnum;
extern FTextureID sky1texture, sky2texture;
extern double sky1pos, sky2pos;
extern float hw_sky1pos, hw_sky2pos;
extern bool skystretch;
extern int freelookviewheight;
#define SKYSTRETCH_HEIGHT 228
// Called whenever the sky changes.
void InitSkyMap(FLevelLocals *Level);
void R_InitSkyMap ();
void R_UpdateSky (uint64_t mstime);

20
src/swrenderer/plane/r_skyplane.cpp
View file

@ -72,8 +72,8 @@ namespace swrenderer
Thread = thread;
auto Level = Thread->Viewport->GetLevel();
auto skytex1 = TexMan.GetPalettedTexture(sky1texture, true);
auto skytex2 = TexMan.GetPalettedTexture(sky2texture, true);
auto skytex1 = TexMan.GetPalettedTexture(Level->skytexture1, true);
auto skytex2 = TexMan.GetPalettedTexture(Level->skytexture2, true);
if (skytex1 == nullptr)
return;
@ -100,7 +100,7 @@ namespace swrenderer
skyscale *= float(90. / r_viewpoint.FieldOfView.Degrees);
}
if (skystretch)
if (Level->skystretch)
{
skyscale *= (double)SKYSTRETCH_HEIGHT / skyheight;
skyiscale *= skyheight / (float)SKYSTRETCH_HEIGHT;
@ -123,13 +123,13 @@ namespace swrenderer
if ((Level->flags & LEVEL_SWAPSKIES) && !(Level->flags & LEVEL_DOUBLESKY))
{
sky1tex = sky2texture;
sky1tex = Level->skytexture2;
}
else
{
sky1tex = sky1texture;
sky1tex = Level->skytexture1;
}
sky2tex = sky2texture;
sky2tex = Level->skytexture2;
skymid = skytexturemid;
skyangle = Thread->Viewport->viewpoint.Angles.Yaw.BAMs();
@ -144,8 +144,8 @@ namespace swrenderer
else
backskytex = NULL;
skyflip = 0;
frontdpos = sky1pos;
backdpos = sky2pos;
frontdpos = Level->sky1pos;
backdpos = Level->sky2pos;
frontcyl = sky1cyl;
backcyl = sky2cyl;
}
@ -155,7 +155,7 @@ namespace swrenderer
backskytex = NULL;
frontcyl = sky2cyl;
skyflip = 0;
frontdpos = sky2pos;
frontdpos = Level->sky2pos;
}
else
{ // MBF's linedef-controlled skies
@ -202,7 +202,7 @@ namespace swrenderer
int frontxscale = int(frontskytex->GetScale().X * 1024);
frontcyl = MAX(frontskytex->GetWidth(), frontxscale);
if (skystretch)
if (Level->skystretch)
{
skymid = skymid * frontskytex->GetScaledHeightDouble() / SKYSTRETCH_HEIGHT;
}

4
wadsrc/static/zscript/base.txt
View file

@ -623,6 +623,8 @@ struct DropItem native
struct GameSession native
{
native void WorldDone();
// all open levels. The first entry in this list is the primary one where gameplay takes place.
native Array<LevelLocals> LevelInfo;
native readonly String F1Pic;
@ -723,7 +725,7 @@ struct LevelLocals native
native int ExecuteSpecial(int special, Actor activator, line linedef, bool lineside, int arg1 = 0, int arg2 = 0, int arg3 = 0, int arg4 = 0, int arg5 = 0);
native void GiveSecret(Actor activator, bool printmsg = true, bool playsound = true);
native void StartSlideshow(Name whichone = 'none');
native void WorldDone();
deprecated("3.8") static void WorldDone() { currentSession.WorldDone(); }
native static void RemoveAllBots(bool fromlist);
native static Vector2 GetAutomapPosition();
native void SetInterMusic(String nextmap);

10
wadsrc/static/zscript/statscreen/statscreen.txt
View file

@ -407,7 +407,7 @@ class StatusScreen abstract play version("2.5")
//Added by mc
if (deathmatch)
{
level.RemoveAllBots (consoleplayer != Net_Arbitrator);
LevelLocals.RemoveAllBots (consoleplayer != Net_Arbitrator);
}
}
@ -467,7 +467,7 @@ class StatusScreen abstract play version("2.5")
if (cnt == 0)
{
End();
level.WorldDone();
currentSession.WorldDone();
}
}
@ -483,7 +483,7 @@ class StatusScreen abstract play version("2.5")
{
// Last map in episode - there is no next location!
End();
level.WorldDone();
currentSession.WorldDone();
return;
}
@ -614,7 +614,7 @@ class StatusScreen abstract play version("2.5")
virtual void StartMusic()
{
level.SetInterMusic(wbs.next);
currentSession.LevelInfo[0].SetInterMusic(wbs.next);
}
//====================================================================
@ -712,7 +712,7 @@ class StatusScreen abstract play version("2.5")
Par = TexMan.CheckForTexture("WIPAR", TexMan.Type_MiscPatch); // "par"
// Use the local level structure which can be overridden by hubs
lnametexts[0] = level.LevelName;
lnametexts[0] = currentSession.LevelInfo[0].LevelName;
lnametexts[1] = wbstartstruct.nextname;
bg = InterBackground.Create(wbs);