diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp index 5c66dc6c97..9b01d6295c 100644 --- a/source/ps/GameSetup/Config.cpp +++ b/source/ps/GameSetup/Config.cpp @@ -21,8 +21,6 @@ bool g_NoGLVBO=false; bool g_NoGLFramebufferObject = false; // flag to switch on shadows bool g_Shadows=false; -// flag to switch off pbuffers -bool g_NoPBuffer=true; // flag to switch on fixed frame timing (RC: I'm using this for profiling purposes) bool g_FixedFrameTiming=false; bool g_VSync = false; @@ -151,8 +149,6 @@ static void ParseCommandLineArgs(int argc, char* argv[]) case 'n': if(strncmp(name, "novbo", 5) == 0) g_ConfigDB.CreateValue(CFG_COMMAND, "novbo")->m_String="true"; - else if(strncmp(name, "nopbuffer", 9) == 0) - g_NoPBuffer = true; break; case 'p': if(strncmp(name, "profile=", 8) == 0) diff --git a/source/ps/GameSetup/Config.h b/source/ps/GameSetup/Config.h index 9ae0e09a8a..f1853d687f 100644 --- a/source/ps/GameSetup/Config.h +++ b/source/ps/GameSetup/Config.h @@ -7,8 +7,6 @@ extern bool g_NoGLVBO; extern bool g_NoGLFramebufferObject; // flag to switch on shadows extern bool g_Shadows; -// flag to switch off pbuffers -extern bool g_NoPBuffer; // flag to switch on fixed frame timing (RC: I'm using this for profiling purposes) extern bool g_FixedFrameTiming; extern bool g_VSync; diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp index faa2470a86..9832875bf5 100644 --- a/source/ps/GameSetup/GameSetup.cpp +++ b/source/ps/GameSetup/GameSetup.cpp @@ -645,7 +645,6 @@ static void InitRenderer() g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO,g_NoGLVBO); g_Renderer.SetOptionBool(CRenderer::OPT_NOFRAMEBUFFEROBJECT,g_NoGLFramebufferObject); g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS,g_Shadows); - g_Renderer.SetOptionBool(CRenderer::OPT_NOPBUFFER,g_NoPBuffer); g_Renderer.SetRenderPath(CRenderer::GetRenderPathByName(g_RenderPath)); g_Renderer.SetOptionFloat(CRenderer::OPT_LODBIAS, g_LodBias); diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index 32a645de29..bec1d2b361 100755 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -301,7 +301,6 @@ CRenderer::CRenderer() m_Options.m_NoVBO=false; m_Options.m_NoFramebufferObject = false; m_Options.m_Shadows=true; - m_Options.m_ShadowColor=RGBAColor(0.4f,0.4f,0.4f,1.0f); m_Options.m_RenderPath = RP_DEFAULT; m_ShadowZBias = 0.001f; @@ -521,9 +520,6 @@ void CRenderer::SetOptionBool(enum Option opt,bool value) case OPT_SHADOWS: m_Options.m_Shadows=value; break; - case OPT_NOPBUFFER: - // NOT IMPLEMENTED - break; default: debug_warn("CRenderer::SetOptionBool: unknown option"); break; @@ -554,9 +550,6 @@ bool CRenderer::GetOptionBool(enum Option opt) const void CRenderer::SetOptionColor(enum Option opt,const RGBAColor& value) { switch (opt) { - case OPT_SHADOWCOLOR: - m_Options.m_ShadowColor=value; - break; default: debug_warn("CRenderer::SetOptionColor: unknown option"); break; @@ -583,8 +576,6 @@ const RGBAColor& CRenderer::GetOptionColor(enum Option opt) const static const RGBAColor defaultColor(1.0f,1.0f,1.0f,1.0f); switch (opt) { - case OPT_SHADOWCOLOR: - return m_Options.m_ShadowColor; default: debug_warn("CRenderer::GetOptionColor: unknown option"); break; diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h index e1f62d509e..a017e8029e 100755 --- a/source/renderer/Renderer.h +++ b/source/renderer/Renderer.h @@ -89,9 +89,7 @@ public: enum Option { OPT_NOVBO, OPT_NOFRAMEBUFFEROBJECT, - OPT_NOPBUFFER, OPT_SHADOWS, - OPT_SHADOWCOLOR, OPT_LODBIAS }; @@ -137,7 +135,6 @@ public: bool m_NoVBO; bool m_NoFramebufferObject; bool m_Shadows; - RGBAColor m_ShadowColor; float m_LodBias; RenderPath m_RenderPath; } m_Options;