Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update walls on texZ change #128

Closed
wants to merge 1 commit into from
Closed

update walls on texZ change #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/gamedata/r_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,15 +1008,7 @@ struct sector_t

if (val != old)
{
//not sure actually what TexZ does, so changing passing this as "Other"
if(pos)
{
LevelMeshUpdater->SectorChangedOther(this);
}
else
{
LevelMeshUpdater->SectorChangedOther(this);
}
LevelMeshUpdater->SectorChangedTexZ(this);
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/levelmeshhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ void UpdateLevelMesh::SectorChangedOther(sector_t* sector)
PropagateCorrelations(this, &UpdateLevelMesh::OnSectorChangedOther, sector);
}

void UpdateLevelMesh::SectorChangedTexZ(sector_t* sector)
{
PropagateCorrelations(this, &UpdateLevelMesh::OnSectorChangedTexZ, sector);
}

void UpdateLevelMesh::SideTextureChanged(side_t* side, int section)
{
OnSideTextureChanged(side, section);
Expand Down Expand Up @@ -98,6 +103,7 @@ struct NullLevelMeshUpdater : UpdateLevelMesh
void OnCeilingTextureChanged(sector_t* sector) override {}

void OnSectorChangedOther(sector_t* sector) override {}
void OnSectorChangedTexZ(sector_t* sector) override {}

void OnSideTextureChanged(side_t* side, int section) override {}
void OnSideDecalsChanged(side_t* side) override {}
Expand Down
2 changes: 2 additions & 0 deletions src/levelmeshhelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ struct UpdateLevelMesh
void CeilingTextureChanged(sector_t *sector);

void SectorChangedOther(sector_t *sector);
void SectorChangedTexZ(sector_t *sector);

void SideTextureChanged(side_t *side, int section);
void SideDecalsChanged(side_t* side);
Expand All @@ -34,6 +35,7 @@ struct UpdateLevelMesh
virtual void OnCeilingTextureChanged(sector_t *sector) = 0;

virtual void OnSectorChangedOther(sector_t *sector) = 0;
virtual void OnSectorChangedTexZ(sector_t *sector) = 0;

virtual void OnSideTextureChanged(side_t *side, int section) = 0;
virtual void OnSideDecalsChanged(side_t* side) = 0;
Expand Down
12 changes: 12 additions & 0 deletions src/rendering/hwrenderer/doom_levelmesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,18 @@ void DoomLevelMesh::OnSectorChangedOther(sector_t* sector)
UpdateFlat(sector->Index(), SurfaceUpdateType::Full);
}

void DoomLevelMesh::OnSectorChangedTexZ(sector_t* sector)
{
UpdateFlat(sector->Index(), SurfaceUpdateType::Full);
for (line_t* line : sector->Lines)
{
if (line->sidedef[0] && line->sidedef[0]->sector == sector)
UpdateSide(line->sidedef[0]->Index(), SurfaceUpdateType::LightsOnly);
else if (line->sidedef[1] && line->sidedef[1]->sector == sector)
UpdateSide(line->sidedef[1]->Index(), SurfaceUpdateType::LightsOnly);
}
}

void DoomLevelMesh::OnSideTextureChanged(side_t* side, int section)
{
UpdateSide(side->Index(), SurfaceUpdateType::Full);
Expand Down
1 change: 1 addition & 0 deletions src/rendering/hwrenderer/doom_levelmesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class DoomLevelMesh : public LevelMesh, public UpdateLevelMesh
void OnFloorTextureChanged(sector_t* sector) override;
void OnCeilingTextureChanged(sector_t* sector) override;
void OnSectorChangedOther(sector_t* sector) override;
void OnSectorChangedTexZ(sector_t* sector) override;
void OnSideTextureChanged(side_t* side, int section) override;
void OnSideDecalsChanged(side_t* side) override;
void OnSectorLightChanged(sector_t* sector) override;
Expand Down
Loading