OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- add messages for sector light change, thinker creation, and destruction

Browse source
This commit is contained in:
Rachael Alexanderson 2024-08-11 15:58:33 -04:00
commit a4e3aca33c
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
7 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gamedata/r_defs.h
View file

@ -1038,11 +1038,13 @@ public:
void ChangeLightLevel(int newval)
{
lightlevel = ClampLight(lightlevel + newval);
LevelMeshUpdater->SectorLightChanged(this);
}
void SetLightLevel(int newval)
{
lightlevel = ClampLight(newval);
LevelMeshUpdater->SectorLightChanged(this);
}
int GetLightLevel() const

4
src/levelmeshhelper.cpp
View file

@ -13,6 +13,10 @@ struct NullLevelMeshUpdater : UpdateLevelMesh
virtual void SectorChangedOther(struct sector_t* sector) {};
virtual void SideTextureChanged(struct side_t* side, int section) {};
virtual void SectorLightChanged(struct sector_t* sector) {};
virtual void SectorLightThinkerCreated(struct sector_t* sector, class DLighting* lightthinker) {};
virtual void SectorLightThinkerDestroyed(struct sector_t* sector, class DLighting* lightthinker) {};
};
static NullLevelMeshUpdater nullUpdater;

4
src/levelmeshhelper.h
View file

@ -14,6 +14,10 @@ struct UpdateLevelMesh
virtual void SectorChangedOther(struct sector_t *sector) = 0;
virtual void SideTextureChanged(struct side_t *side, int section) = 0;
virtual void SectorLightChanged(struct sector_t* sector) = 0;
virtual void SectorLightThinkerCreated(struct sector_t* sector, class DLighting* lightthinker) = 0;
virtual void SectorLightThinkerDestroyed(struct sector_t* sector, class DLighting* lightthinker) = 0;
};
extern UpdateLevelMesh* LevelMeshUpdater;

16
src/playsim/mapthinkers/a_lights.cpp
View file

@ -57,6 +57,12 @@ static FRandom pr_fireflicker ("FireFlicker");
IMPLEMENT_CLASS(DLighting, false, false)
void DLighting::OnDestroy()
{
LevelMeshUpdater->SectorLightThinkerDestroyed(this->GetSector(), this);
Super::OnDestroy();
}
//-----------------------------------------------------------------------------
//
// FIRELIGHT FLICKER
@ -110,6 +116,7 @@ void DFireFlicker::Construct(sector_t *sector)
m_MaxLight = sector->lightlevel;
m_MinLight = sector_t::ClampLight(FindMinSurroundingLight(sector, sector->lightlevel) + 16);
m_Count = 4;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
void DFireFlicker::Construct(sector_t *sector, int upper, int lower)
@ -118,6 +125,7 @@ void DFireFlicker::Construct(sector_t *sector, int upper, int lower)
m_MaxLight = sector_t::ClampLight(upper);
m_MinLight = sector_t::ClampLight(lower);
m_Count = 4;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------
@ -173,6 +181,7 @@ void DFlicker::Construct(sector_t *sector, int upper, int lower)
m_MinLight = sector_t::ClampLight(lower);
sector->lightlevel = m_MaxLight;
m_Count = (pr_flicker()&64)+1;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------
@ -232,6 +241,7 @@ void DLightFlash::Construct(sector_t *sector)
m_MaxTime = 64;
m_MinTime = 7;
m_Count = (pr_lightflash() & m_MaxTime) + 1;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
void DLightFlash::Construct (sector_t *sector, int min, int max)
@ -243,6 +253,7 @@ void DLightFlash::Construct (sector_t *sector, int min, int max)
m_MaxTime = 64;
m_MinTime = 7;
m_Count = (pr_lightflash() & m_MaxTime) + 1;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
@ -301,6 +312,7 @@ void DStrobe::Construct(sector_t *sector, int upper, int lower, int utics, int l
m_MaxLight = sector_t::ClampLight(upper);
m_MinLight = sector_t::ClampLight(lower);
m_Count = 1; // Hexen-style is always in sync
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------
@ -322,6 +334,7 @@ void DStrobe::Construct(sector_t *sector, int utics, int ltics, bool inSync)
m_MinLight = 0;
m_Count = inSync ? 1 : (pr_strobeflash() & 7) + 1;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
@ -391,6 +404,7 @@ void DGlow::Construct(sector_t *sector)
m_MinLight = FindMinSurroundingLight (sector, sector->lightlevel);
m_MaxLight = sector->lightlevel;
m_Direction = -1;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------
@ -453,6 +467,7 @@ void DGlow2::Construct(sector_t *sector, int start, int end, int tics, bool ones
m_MaxTics = tics;
m_Tics = -1;
m_OneShot = oneshot;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------
@ -550,6 +565,7 @@ void DPhased::Construct (sector_t *sector, int baselevel, int phase)
Super::Construct(sector);
m_BaseLevel = baselevel;
m_Phase = phase;
LevelMeshUpdater->SectorLightThinkerCreated(sector, this);
}
//-----------------------------------------------------------------------------

1
src/playsim/mapthinkers/a_lights.h
View file

@ -5,6 +5,7 @@ class DLighting : public DSectorEffect
DECLARE_CLASS(DLighting, DSectorEffect)
public:
static const int DEFAULT_STAT = STAT_LIGHT;
void OnDestroy() override;
};
class DFireFlicker : public DLighting

12
src/rendering/hwrenderer/doom_levelmesh.cpp
View file

@ -416,6 +416,18 @@ void DoomLevelMesh::SideTextureChanged(struct side_t* side, int section)
// UpdateSide(level, side->Index());
}
void DoomLevelMesh::SectorLightChanged(struct sector_t* sector)
{
};
void DoomLevelMesh::SectorLightThinkerCreated(struct sector_t* sector, class DLighting* lightthinker)
{
};
void DoomLevelMesh::SectorLightThinkerDestroyed(struct sector_t* sector, class DLighting* lightthinker)
{
};
void DoomLevelMesh::UpdateSide(FLevelLocals& doomMap, unsigned int sideIndex)
{
FreeSide(doomMap, sideIndex);

3
src/rendering/hwrenderer/doom_levelmesh.h
View file

@ -74,6 +74,9 @@ public:
void CeilingTextureChanged(struct sector_t* sector) override;
void SectorChangedOther(struct sector_t* sector) override;
void SideTextureChanged(struct side_t* side, int section) override;
void SectorLightChanged(struct sector_t* sector) override;
void SectorLightThinkerCreated(struct sector_t* sector, class DLighting* lightthinker) override;
void SectorLightThinkerDestroyed(struct sector_t* sector, class DLighting* lightthinker) override;
private:
void CreateSurfaces(FLevelLocals& doomMap);