zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix r_clearbuffer color not being used

This commit is contained in:
Magnus Norddahl 2016-08-22 01:52:51 +02:00
parent 3e01039bbb
commit 302f59ea33
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl/renderer/gl_renderer.h
View File

@ -116,6 +116,8 @@ public:
bool mDrawingScene2D = false; bool mDrawingScene2D = false;
float mCameraExposure = 1.0f; float mCameraExposure = 1.0f;
float mSceneClearColor[3];
FGLRenderer(OpenGLFrameBuffer *fb); FGLRenderer(OpenGLFrameBuffer *fb);
~FGLRenderer() ; ~FGLRenderer() ;

10
src/gl/scene/gl_scene.cpp
View File

@ -178,7 +178,7 @@ void FGLRenderer::Set3DViewport(bool mainview)
// This is faster on newer hardware because it allows the GPU to skip // This is faster on newer hardware because it allows the GPU to skip
// reading from slower memory where the full buffers are stored. // reading from slower memory where the full buffers are stored.
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClearColor(mSceneClearColor[0], mSceneClearColor[1], mSceneClearColor[2], 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
const auto &bounds = mSceneViewport; const auto &bounds = mSceneViewport;
@ -775,6 +775,9 @@ void FGLRenderer::SetFixedColormap (player_t *player)
sector_t * FGLRenderer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, float fov, float ratio, float fovratio, bool mainview, bool toscreen) sector_t * FGLRenderer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, float fov, float ratio, float fovratio, bool mainview, bool toscreen)
{ {
sector_t * retval; sector_t * retval;
mSceneClearColor[0] = 0.0f;
mSceneClearColor[1] = 0.0f;
mSceneClearColor[2] = 0.0f;
R_SetupFrame (camera); R_SetupFrame (camera);
SetViewArea(); SetViewArea();
@ -1251,8 +1254,9 @@ int FGLInterface::GetMaxViewPitch(bool down)
void FGLInterface::ClearBuffer(int color) void FGLInterface::ClearBuffer(int color)
{ {
PalEntry pe = GPalette.BaseColors[color]; PalEntry pe = GPalette.BaseColors[color];
glClearColor(pe.r/255.f, pe.g/255.f, pe.b/255.f, 1.f); GLRenderer->mSceneClearColor[0] = pe.r / 255.f;
glClear(GL_COLOR_BUFFER_BIT); GLRenderer->mSceneClearColor[1] = pe.g / 255.f;
GLRenderer->mSceneClearColor[2] = pe.b / 255.f;
} }
//=========================================================================== //===========================================================================