This commit is contained in:
Tleety
2016-03-07 23:35:58 +01:00
parent 5c0d9070c7
commit 6b7f598c4d
3 changed files with 4 additions and 1 deletions
+2
View File
@@ -57,6 +57,8 @@ private:
Texture* m_ErrorTexture;
Texture* m_WhiteTexture;
GLuint m_CombinedTexture;
Model* m_ScreenQuad;
Model* m_UnitQuad;
Model* m_UnitSphere;
+1 -1
View File
@@ -283,7 +283,6 @@ void DrawFinalPass::Draw(RenderScene& scene, BlurHUD* blurHUDPass)
//Generate blur texture.
m_FullBlurredTexture = blurHUDPass->Draw(m_SceneTexture, scene);
//Combine nonblur and blur texture
m_CombinedTexture = blurHUDPass->CombineTextures(m_SceneTexture, m_FullBlurredTexture);
//Draw Transparen objects
//state->BlendFunc(GL_ONE, GL_ONE);
@@ -292,6 +291,7 @@ void DrawFinalPass::Draw(RenderScene& scene, BlurHUD* blurHUDPass)
GLERROR("TransparentObjects");
//state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
DrawSprites(scene.Jobs.SpriteJob, scene);
GLERROR("SpriteJobs");
delete state;
+1
View File
@@ -162,6 +162,7 @@ void Renderer::Draw(RenderFrame& frame)
m_DrawFinalPass->Draw(*scene, m_BlurHUDPass);
GLERROR("Draw Geometry+Light");
//m_DrawScenePass->Draw(*scene);
m_CombinedTexture = m_BlurHUDPass->CombineTextures(m_DrawFinalPass->SceneTexture(), m_DrawFinalPass->FullBlurredTexture());
PerformanceTimer::StartTimerAndStopPrevious("Renderer-Draw Text");
m_TextPass->Draw(*scene, *m_DrawFinalPass->FinalPassFrameBuffer());