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

Fix 2d init material setting for OpenGL. Add new file to project file. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3030 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2009-12-08 22:57:11 +00:00
parent 6a7b142b49
commit c9c108ea6d
4 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Irrlicht/CNullDriver.h
View File

@ -676,8 +676,6 @@ namespace video
core::dimension2d<u32> size;
};
core::array<SSurface> Textures;
core::array<video::IImageLoader*> SurfaceLoader;
core::array<video::IImageWriter*> SurfaceWriter;
@ -726,6 +724,3 @@ namespace video
#endif

58
source/Irrlicht/COpenGLDriver.cpp
View File

@ -2778,6 +2778,15 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
}
//! Enable the 2d override material
void COpenGLDriver::enableInitMaterial2D(bool enable)
{
if (!enable)
CurrentRenderMode = ERM_NONE;
CNullDriver::enableInitMaterial2D(enable);
}
//! sets the needed renderstates
void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
{
@ -2788,7 +2797,32 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
{
if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
SMaterial mat(InitMaterial2D);
}
if (Transformation3DChanged)
{
glMatrixMode(GL_PROJECTION);
const core::dimension2d<u32>& renderTargetSize = getCurrentRenderTargetSize();
core::matrix4 m;
m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-(s32)(renderTargetSize.Height)), -1.0, 1.0);
m.setTranslation(core::vector3df(-1,1,0));
glLoadMatrixf(m.pointer());
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0.375, 0.375, 0.0);
// Make sure we set first texture matrix
if (MultiTextureExtension)
extGlActiveTexture(GL_TEXTURE0_ARB);
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
Transformation3DChanged = false;
}
if (!InitMaterial2DEnabled)
{
SMaterial mat;
mat.Lighting=false;
mat.ZBuffer=ECFN_NEVER;
mat.ZWriteEnable=false;
@ -2796,28 +2830,8 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
LastMaterial = mat;
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
glMatrixMode(GL_PROJECTION);
const core::dimension2d<u32>& renderTargetSize = getCurrentRenderTargetSize();
core::matrix4 m;
m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-(s32)(renderTargetSize.Height)), -1.0, 1.0);
m.setTranslation(core::vector3df(-1,1,0));
glLoadMatrixf(m.pointer());
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0.375, 0.375, 0.0);
// Make sure we set first texture matrix
if (MultiTextureExtension)
extGlActiveTexture(GL_TEXTURE0_ARB);
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
Transformation3DChanged = false;
}
else if (InitMaterial2DEnabled)
if (InitMaterial2DEnabled)
{
SMaterial mat(InitMaterial2D);
mat.Lighting=false;

3
source/Irrlicht/COpenGLDriver.h
View File

@ -336,6 +336,9 @@ namespace video
//! \param enable: If true, enable the clipping plane else disable it.
virtual void enableClipPlane(u32 index, bool enable);
//! Enable the 2d override material
virtual void enableInitMaterial2D(bool enable=true);
//! Returns the graphics card vendor name.
virtual core::stringc getVendorInfo() {return VendorName;}

4
source/Irrlicht/Irrlicht9.0.vcproj
View File

@ -959,6 +959,10 @@
RelativePath="..\..\include\EMeshWriterEnums.h"
>
</File>
<File
RelativePath="..\..\include\EPrimitiveTypes.h"
>
</File>
<File
RelativePath="..\..\include\ESceneNodeAnimatorTypes.h"
>