- deleting some unused stuff

This commit is contained in:
Christoph Oelckers 2018-04-02 00:28:25 +02:00
parent 64b504ee7f
commit d84554f093
6 changed files with 1 additions and 37 deletions

View file

@ -42,7 +42,6 @@
#include "po_man.h" #include "po_man.h"
#include "r_utility.h" #include "r_utility.h"
#include "p_local.h" #include "p_local.h"
#include "gl/gl_functions.h"
#include "serializer.h" #include "serializer.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "events.h" #include "events.h"
@ -1003,11 +1002,8 @@ struct FGLInterface : public FRenderer
void Precache(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitlist) override; void Precache(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitlist) override;
void RenderView(player_t *player) override; void RenderView(player_t *player) override;
void WriteSavePic (player_t *player, FileWriter *file, int width, int height) override; void WriteSavePic (player_t *player, FileWriter *file, int width, int height) override;
void StartSerialize(FSerializer &arc) override;
void EndSerialize(FSerializer &arc) override;
void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override; void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, double fov) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override;
int GetMaxViewPitch(bool down) override; int GetMaxViewPitch(bool down) override;
void SetClearColor(int color) override; void SetClearColor(int color) override;
@ -1026,20 +1022,6 @@ void FGLInterface::Precache(uint8_t *texhitlist, TMap<PClassActor*, bool> &actor
gl_PrecacheTexture(texhitlist, actorhitlist); gl_PrecacheTexture(texhitlist, actorhitlist);
} }
//===========================================================================
//
// notify the renderer that serialization of the curent level is about to start/end
//
//===========================================================================
void FGLInterface::StartSerialize(FSerializer &arc)
{
}
void FGLInterface::EndSerialize(FSerializer &arc)
{
}
//=========================================================================== //===========================================================================
// //
// Get max. view angle (renderer specific information so it goes here now) // Get max. view angle (renderer specific information so it goes here now)
@ -1147,16 +1129,12 @@ void FGLInterface::RenderTextureView (FCanvasTexture *tex, AActor *Viewpoint, do
// //
// //
//=========================================================================== //===========================================================================
void gl_PreprocessLevel();
void FGLInterface::PreprocessLevel() void FGLInterface::PreprocessLevel()
{ {
gl_PreprocessLevel(); gl_PreprocessLevel();
} }
void FGLInterface::CleanLevelData()
{
}
uint32_t FGLInterface::GetCaps() uint32_t FGLInterface::GetCaps()
{ {
// describe our basic feature set // describe our basic feature set

View file

@ -943,7 +943,6 @@ void G_SerializeLevel(FSerializer &arc, bool hubload)
} }
arc("saveversion", SaveVersion); arc("saveversion", SaveVersion);
Renderer->StartSerialize(arc);
if (arc.isReading()) if (arc.isReading())
{ {
DThinker::DestroyAllThinkers(); DThinker::DestroyAllThinkers();
@ -1025,6 +1024,4 @@ void G_SerializeLevel(FSerializer &arc, bool hubload)
} }
AActor::RecreateAllAttachedLights(); AActor::RecreateAllAttachedLights();
InitPortalGroups(); InitPortalGroups();
Renderer->EndSerialize(arc);
} }

View file

@ -3532,7 +3532,6 @@ void P_FreeLevelData ()
AActor::ClearTIDHashes(); AActor::ClearTIDHashes();
interpolator.ClearInterpolations(); // [RH] Nothing to interpolate on a fresh level. interpolator.ClearInterpolations(); // [RH] Nothing to interpolate on a fresh level.
Renderer->CleanLevelData();
FPolyObj::ClearAllSubsectorLinks(); // can't be done as part of the polyobj deletion process. FPolyObj::ClearAllSubsectorLinks(); // can't be done as part of the polyobj deletion process.
SN_StopAllSequences (); SN_StopAllSequences ();
DThinker::DestroyAllThinkers (); DThinker::DestroyAllThinkers ();

View file

@ -40,17 +40,12 @@ struct FRenderer
// draws player sprites with hardware acceleration (only useful for software rendering) // draws player sprites with hardware acceleration (only useful for software rendering)
virtual void DrawRemainingPlayerSprites() {} virtual void DrawRemainingPlayerSprites() {}
// notify the renderer that serialization of the curent level is about to start/end
virtual void StartSerialize(FSerializer &arc) {}
virtual void EndSerialize(FSerializer &arc) {}
virtual int GetMaxViewPitch(bool down) = 0; // return value is in plain degrees virtual int GetMaxViewPitch(bool down) = 0; // return value is in plain degrees
virtual void OnModeSet () {} virtual void OnModeSet () {}
virtual void SetClearColor(int color) = 0; virtual void SetClearColor(int color) = 0;
virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0; virtual void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) = 0;
virtual void PreprocessLevel() {} virtual void PreprocessLevel() {}
virtual void CleanLevelData() {}
virtual uint32_t GetCaps() { return 0; } virtual uint32_t GetCaps() { return 0; }
}; };

View file

@ -365,10 +365,6 @@ void FSoftwareRenderer::PreprocessLevel()
} }
} }
void FSoftwareRenderer::CleanLevelData()
{
}
uint32_t FSoftwareRenderer::GetCaps() uint32_t FSoftwareRenderer::GetCaps()
{ {
ActorRenderFeatureFlags FlagSet = 0; ActorRenderFeatureFlags FlagSet = 0;

View file

@ -31,7 +31,6 @@ struct FSoftwareRenderer : public FRenderer
void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) override; void RenderTextureView (FCanvasTexture *tex, AActor *viewpoint, double fov) override;
void PreprocessLevel() override; void PreprocessLevel() override;
void CleanLevelData() override;
uint32_t GetCaps() override; uint32_t GetCaps() override;