freeminer
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move matrix setup after program use, such that the program is effective at that point. 2d works again without problems. 

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3803 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-06-06 15:00:50 +00:00
parent 36ee723141
commit b69ab963cd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/Irrlicht/COGLES2Driver.cpp
View File

@ -1932,6 +1932,14 @@ namespace video
if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
}
if (!OverrideMaterial2DEnabled)
{
setBasicRenderStates(InitMaterial2D, LastMaterial, true);
LastMaterial = InitMaterial2D;
}
TwoDRenderer->useProgram(); //Fixed Pipeline Shader needed to render 2D
if (Transformation3DChanged)
{
const core::dimension2d<u32>& renderTargetSize = getCurrentRenderTargetSize();
@ -1943,13 +1951,6 @@ namespace video
Transformation3DChanged = false;
}
if (!OverrideMaterial2DEnabled)
{
setBasicRenderStates(InitMaterial2D, LastMaterial, true);
LastMaterial = InitMaterial2D;
}
TwoDRenderer->useProgram(); //Fixed Pipeline Shader needed to render 2D
}
if (OverrideMaterial2DEnabled)
{