zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 13:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused (and broken in swrenderer) back boolean from FakeFlat interface

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-03 18:55:12 +01:00
parent e7ab5dddb6
commit aa11534033
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/am_map.cpp
View file

@ -1934,7 +1934,7 @@ void AM_drawSubsectors()
points[j].Y = float(f_y + (f_h - (pt.y - m_y) * scale)); points[j].Y = float(f_y + (f_h - (pt.y - m_y) * scale));
} }
// For lighting and texture determination // For lighting and texture determination
sector_t *sec = Renderer->FakeFlat(subsectors[i].render_sector, &tempsec, &floorlight, &ceilinglight, false); sector_t *sec = Renderer->FakeFlat(subsectors[i].render_sector, &tempsec, &floorlight, &ceilinglight);
// Find texture origin. // Find texture origin.
originpt.x = -sec->GetXOffset(sector_t::floor); originpt.x = -sec->GetXOffset(sector_t::floor);
originpt.y = sec->GetYOffset(sector_t::floor); originpt.y = sec->GetYOffset(sector_t::floor);

6
src/gl/scene/gl_scene.cpp
View file

@ -1005,7 +1005,7 @@ struct FGLInterface : public FRenderer
void StartSerialize(FSerializer &arc) override; void StartSerialize(FSerializer &arc) override;
void EndSerialize(FSerializer &arc) override; void EndSerialize(FSerializer &arc) override;
void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, int fov) override; void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, int fov) override;
sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back) override; sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel) override;
void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog) override; void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override; void CleanLevelData() override;
@ -1362,7 +1362,7 @@ void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, in
// //
//========================================================================== //==========================================================================
sector_t *FGLInterface::FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back) sector_t *FGLInterface::FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel)
{ {
if (floorlightlevel != NULL) if (floorlightlevel != NULL)
{ {
@ -1372,7 +1372,7 @@ sector_t *FGLInterface::FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlig
{ {
*ceilinglightlevel = sec->GetCeilingLight (); *ceilinglightlevel = sec->GetCeilingLight ();
} }
return gl_FakeFlat(sec, tempsec, back); return gl_FakeFlat(sec, tempsec, false);
} }
//=========================================================================== //===========================================================================

2
src/r_renderer.h
View file

@ -60,7 +60,7 @@ struct FRenderer
virtual void SetupFrame(player_t *player) {} virtual void SetupFrame(player_t *player) {}
virtual void CopyStackedViewParameters() {} virtual void CopyStackedViewParameters() {}
virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) = 0; virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) = 0;
virtual sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back) = 0; virtual sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel) = 0;
virtual void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog) {} virtual void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog) {}
virtual void PreprocessLevel() {} virtual void PreprocessLevel() {}
virtual void CleanLevelData() {} virtual void CleanLevelData() {}

10
src/swrenderer/r_swrenderer.cpp
View file

@ -482,14 +482,8 @@ void FSoftwareRenderer::RenderTextureView (FCanvasTexture *tex, AActor *viewpoin
realfixedcolormap = savecm; realfixedcolormap = savecm;
} }
//========================================================================== sector_t *FSoftwareRenderer::FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel)
//
//
//
//==========================================================================
sector_t *FSoftwareRenderer::FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back)
{ {
return R_FakeFlat(sec, tempsec, floorlightlevel, ceilinglightlevel, back); return R_FakeFlat(sec, tempsec, floorlightlevel, ceilinglightlevel, nullptr, 0, 0, 0, 0);
} }

2
src/swrenderer/r_swrenderer.h
View file

@ -42,7 +42,7 @@ struct FSoftwareRenderer : public FRenderer
void SetupFrame(player_t *player) override; void SetupFrame(player_t *player) override;
void CopyStackedViewParameters() override; void CopyStackedViewParameters() override;
void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) override; void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, int fov) override;
sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back) override; sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel) override;
void StateChanged(AActor *actor) override void StateChanged(AActor *actor) override
{ {