From d842ad9c89a20a7b43968507bfbb5d21b254c343 Mon Sep 17 00:00:00 2001 From: "fabricio.costa@moldeointeractive.com.ar" Date: Wed, 19 Aug 2015 17:00:22 -0300 Subject: [PATCH] [FIX #2] Fixed i3/i5 intel hd graphics bugs: copying texture after each effects has strange effects --- libmoldeo/moConsole.cpp | 4 ++-- libmoldeo/moEffect.cpp | 7 ++++--- libmoldeo/moRenderManager.cpp | 6 +++--- moldeoversion.txt | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libmoldeo/moConsole.cpp b/libmoldeo/moConsole.cpp index e90fe9e..59da8a5 100644 --- a/libmoldeo/moConsole.cpp +++ b/libmoldeo/moConsole.cpp @@ -1568,12 +1568,12 @@ moConsole::Draw() { RenderMan->BeginDrawEffect(); pEffect->Draw(&m_ConsoleState.tempo); RenderMan->EndDrawEffect(); - RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX); + //RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX); } } } - //RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX); + RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX); } //sedibujan los post Effects diff --git a/libmoldeo/moEffect.cpp b/libmoldeo/moEffect.cpp index 3402d6e..ce1b3ce 100644 --- a/libmoldeo/moEffect.cpp +++ b/libmoldeo/moEffect.cpp @@ -93,7 +93,7 @@ moEffect::PreInit() { devicecode = NULL; m_EffectState.Init(); - glewInit(); + //glewInit(); /** Crea INLETS INTERNOS, es decir que no tienen un parametro asociado... (especificamente para su uso generico*/ moInlet* Inlet = new moInlet(); @@ -282,10 +282,11 @@ void moEffect::EndDraw() { if (m_pResourceManager->GetGLMan()) m_pResourceManager->GetGLMan()->CheckErrors( GetName()+"::"+GetConfigName()+"::"+GetLabelName() ); */ - +/* if (m_pResourceManager) if (m_pResourceManager->GetRenderMan()) - m_pResourceManager->GetRenderMan()->EndDrawEffect(); + m_pResourceManager->GetRenderMan()->EndDrawEffect(); +*/ } diff --git a/libmoldeo/moRenderManager.cpp b/libmoldeo/moRenderManager.cpp index 42370ac..edfdc75 100644 --- a/libmoldeo/moRenderManager.cpp +++ b/libmoldeo/moRenderManager.cpp @@ -305,8 +305,8 @@ void moRenderManager::BeginUpdateObject() void moRenderManager::EndUpdateObject() { - m_pGLManager->RestoreGLState(); - Unlock(); + m_pGLManager->RestoreGLState(); + Unlock(); } void moRenderManager::BeginDraw() @@ -317,7 +317,7 @@ void moRenderManager::BeginDraw() void moRenderManager::BeginDrawEffect() { - Lock(); + Lock(); if (m_pGLManager) m_pGLManager->SaveGLState(); if (m_pGLManager) m_pGLManager->SetPerspectiveView(m_render_width, m_render_height); m_saved_screen = false; diff --git a/moldeoversion.txt b/moldeoversion.txt index c378bd2..b76869b 100644 --- a/moldeoversion.txt +++ b/moldeoversion.txt @@ -1,5 +1,5 @@ - + - 1.0 beta (build 137) + 1.0 beta (build 138) \ No newline at end of file