minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-24 17:50:31 +01:00
Code Issues Projects Releases Wiki Activity

Material.ZWriteEnable is now of type E_ZWRITE instead of bool and ZWriteFineControl get removed (or merged into ZWriteEnable).

Browse Source 
This breaks compiling. To have old values replace false with EZW_OFF and true with EWZ_AUTO.

There's a bit history to this change. ZWriteFineControl got introduced after 1.8 so it was never in a released version.
Basically it was needed after some changes had been made to allow shaders to have zwrite enabled independent
of the material-type (which worked badly for shaders). This had caused other problems as it was then enabled too often instead. 
So to quickly fix those bugs and avoid breaking compatibility I had introduced a new enum ZWriteFineControl in SMaterial.
This worked and didn't break compiling - but I noticed by now that introducing a second flag for this made maintainance for an already 
very hard to understand problem (figuring out the implementation of transparency and zwriting) even more complicated. 
So to keep maintance somewhat sane I decided to break compiling now and merge those two flags. 
The behavior should not be affected by this commit - except for users which set this flag already in their code and have to switch to the enum now.

Serialization is switched on loading old files (so SMaterial has enum already and writes that out).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6026 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-01-02 15:34:52 +00:00
parent fc37b383ed
commit 2928a632a4
22 changed files with 85 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -1,5 +1,7 @@
-------------------------- --------------------------
Changes in 1.9 (not yet released) Changes in 1.9 (not yet released)
- Material.ZWriteEnable is now of type E_ZWRITE instead of bool. This allows now setting materials to always "on" independent of material type and transparency.
This breaks compiling. To have old values replace false with EZW_OFF and true with EWZ_AUTO.
- Materials EMT_REFLECTION_2_LAYER and EMT_TRANSPARENT_REFLECTION_2_LAYER on OpenGL are now same as in D3D9. Before GL used a sphere-map for those instead of reflection. - Materials EMT_REFLECTION_2_LAYER and EMT_TRANSPARENT_REFLECTION_2_LAYER on OpenGL are now same as in D3D9. Before GL used a sphere-map for those instead of reflection.
- Bugfix: CGUIToolBar automatic placement no longer outside of screen when there are modals screens when creating it. - Bugfix: CGUIToolBar automatic placement no longer outside of screen when there are modals screens when creating it.
Or when there are other window elements going over full window-size. Or when there are other window elements going over full window-size.

59
include/SMaterial.h
View File

@ -247,16 +247,33 @@ namespace video
0 0
}; };
//! Fine-tuning for SMaterial.ZWriteFineControl //! For SMaterial.ZWriteEnable
enum E_ZWRITE_FINE_CONTROL enum E_ZWRITE
{ {
//! Default. Only write zbuffer when SMaterial::ZWriteEnable is true and SMaterial::isTransparent() returns false. //! zwrite always disabled for this material
EZI_ONLY_NON_TRANSPARENT, EZW_OFF = 0,
//! Writing will just be based on SMaterial::ZWriteEnable value, transparency is ignored.
//! Needed mostly for certain shader materials where SMaterial::isTransparent always returns false. //! This is the default setting for SMaterial and tries to handle things automatically.
EZI_ZBUFFER_FLAG //! This is also the value which is set when SMaterial::setFlag(EMF_ZWRITE_ENABLE) is enabled.
//! Usually zwriting is enabled non-transparent materials - as far as Irrlicht can recognize those.
//! Basically Irrlicht tries to handle the zwriting for you and assumes transparent materials don't need it.
//! This is addionally affected by IVideoDriver::setAllowZWriteOnTransparent
EZW_AUTO,
//! zwrite always enabled for this material
EZW_ON
}; };
//! Names for E_ZWRITE
const c8* const ZWriteNames[] =
{
"Off",
"Auto",
"On",
0
};
//! Maximum number of texture an SMaterial can have. //! Maximum number of texture an SMaterial can have.
/** SMaterial might ignore some textures in most function, like assignment and comparison, /** SMaterial might ignore some textures in most function, like assignment and comparison,
@ -296,9 +313,8 @@ namespace video
PolygonOffsetFactor(0), PolygonOffsetDirection(EPO_FRONT), PolygonOffsetFactor(0), PolygonOffsetDirection(EPO_FRONT),
PolygonOffsetDepthBias(0.f), PolygonOffsetSlopeScale(0.f), PolygonOffsetDepthBias(0.f), PolygonOffsetSlopeScale(0.f),
Wireframe(false), PointCloud(false), GouraudShading(true), Wireframe(false), PointCloud(false), GouraudShading(true),
Lighting(true), ZWriteEnable(true), BackfaceCulling(true), FrontfaceCulling(false), Lighting(true), ZWriteEnable(EZW_AUTO), BackfaceCulling(true), FrontfaceCulling(false),
FogEnable(false), NormalizeNormals(false), UseMipMaps(true), FogEnable(false), NormalizeNormals(false), UseMipMaps(true)
ZWriteFineControl(EZI_ONLY_NON_TRANSPARENT)
{ } { }
//! Copy constructor //! Copy constructor
@ -354,7 +370,6 @@ namespace video
PolygonOffsetDepthBias = other.PolygonOffsetDepthBias; PolygonOffsetDepthBias = other.PolygonOffsetDepthBias;
PolygonOffsetSlopeScale = other.PolygonOffsetSlopeScale; PolygonOffsetSlopeScale = other.PolygonOffsetSlopeScale;
UseMipMaps = other.UseMipMaps; UseMipMaps = other.UseMipMaps;
ZWriteFineControl = other.ZWriteFineControl;
return *this; return *this;
} }
@ -508,12 +523,10 @@ namespace video
//! Will this material be lighted? Default: true //! Will this material be lighted? Default: true
bool Lighting:1; bool Lighting:1;
//! Is the zbuffer writable or is it read-only. Default: true. //! Is the zbuffer writable or is it read-only. Default: EZW_AUTO.
/** This flag is forced to false if the MaterialType is a /** If this parameter is not EZW_OFF, you probably also want to set ZBuffer
transparent type and the scene parameter to values other than ECFN_DISABLED */
ALLOW_ZWRITE_ON_TRANSPARENT is not set. If you set this parameter E_ZWRITE ZWriteEnable:2;
to true, make sure that ZBuffer value is other than ECFN_DISABLED */
bool ZWriteEnable:1;
//! Is backface culling enabled? Default: true //! Is backface culling enabled? Default: true
bool BackfaceCulling:1; bool BackfaceCulling:1;
@ -532,11 +545,6 @@ namespace video
/** Sometimes, disabling mipmap usage can be useful. Default: true */ /** Sometimes, disabling mipmap usage can be useful. Default: true */
bool UseMipMaps:1; bool UseMipMaps:1;
//! Give more control how the ZWriteEnable flag is interpreted
/** Note that there is also the global flag AllowZWriteOnTransparent
which when set acts like all materials have set EZI_ALLOW_ON_TRANSPARENT. */
E_ZWRITE_FINE_CONTROL ZWriteFineControl:1;
//! Gets the texture transformation matrix for level i //! Gets the texture transformation matrix for level i
/** \param i The desired level. Must not be larger than MATERIAL_MAX_TEXTURES /** \param i The desired level. Must not be larger than MATERIAL_MAX_TEXTURES
\return Texture matrix for texture level i. */ \return Texture matrix for texture level i. */
@ -603,7 +611,7 @@ namespace video
case EMF_ZBUFFER: case EMF_ZBUFFER:
ZBuffer = value; break; ZBuffer = value; break;
case EMF_ZWRITE_ENABLE: case EMF_ZWRITE_ENABLE:
ZWriteEnable = value; break; ZWriteEnable = value ? EZW_AUTO : EZW_OFF; break;
case EMF_BACK_FACE_CULLING: case EMF_BACK_FACE_CULLING:
BackfaceCulling = value; break; BackfaceCulling = value; break;
case EMF_FRONT_FACE_CULLING: case EMF_FRONT_FACE_CULLING:
@ -684,7 +692,7 @@ namespace video
case EMF_ZBUFFER: case EMF_ZBUFFER:
return ZBuffer!=ECFN_DISABLED; return ZBuffer!=ECFN_DISABLED;
case EMF_ZWRITE_ENABLE: case EMF_ZWRITE_ENABLE:
return ZWriteEnable; return ZWriteEnable != EZW_OFF;
case EMF_BACK_FACE_CULLING: case EMF_BACK_FACE_CULLING:
return BackfaceCulling; return BackfaceCulling;
case EMF_FRONT_FACE_CULLING: case EMF_FRONT_FACE_CULLING:
@ -756,8 +764,7 @@ namespace video
PolygonOffsetDirection != b.PolygonOffsetDirection || PolygonOffsetDirection != b.PolygonOffsetDirection ||
PolygonOffsetDepthBias != b.PolygonOffsetDepthBias || PolygonOffsetDepthBias != b.PolygonOffsetDepthBias ||
PolygonOffsetSlopeScale != b.PolygonOffsetSlopeScale || PolygonOffsetSlopeScale != b.PolygonOffsetSlopeScale ||
UseMipMaps != b.UseMipMaps || UseMipMaps != b.UseMipMaps
ZWriteFineControl != b.ZWriteFineControl;
; ;
for (u32 i=0; (i<MATERIAL_MAX_TEXTURES_USED) && !different; ++i) for (u32 i=0; (i<MATERIAL_MAX_TEXTURES_USED) && !different; ++i)
{ {

10
source/Irrlicht/CB3DMeshFileLoader.cpp
View File

@ -962,7 +962,7 @@ bool CB3DMeshFileLoader::readChunkBRUS()
else else
{ {
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
B3dMaterial.Material.ZWriteEnable = false; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
} }
} }
else if (B3dMaterial.Textures[0]) //One texture: else if (B3dMaterial.Textures[0]) //One texture:
@ -971,7 +971,7 @@ bool CB3DMeshFileLoader::readChunkBRUS()
if (B3dMaterial.Textures[0]->Flags & 0x2) //(Alpha mapped) if (B3dMaterial.Textures[0]->Flags & 0x2) //(Alpha mapped)
{ {
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
B3dMaterial.Material.ZWriteEnable = false; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
} }
else if (B3dMaterial.Textures[0]->Flags & 0x4) //(Masked) else if (B3dMaterial.Textures[0]->Flags & 0x4) //(Masked)
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // TODO: create color key texture B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // TODO: create color key texture
@ -984,7 +984,7 @@ bool CB3DMeshFileLoader::readChunkBRUS()
else else
{ {
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
B3dMaterial.Material.ZWriteEnable = false; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
} }
} }
else //No texture: else //No texture:
@ -994,7 +994,7 @@ bool CB3DMeshFileLoader::readChunkBRUS()
else else
{ {
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
B3dMaterial.Material.ZWriteEnable = false; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
} }
} }
@ -1023,7 +1023,7 @@ bool CB3DMeshFileLoader::readChunkBRUS()
if (B3dMaterial.fx & 32) //force vertex alpha-blending if (B3dMaterial.fx & 32) //force vertex alpha-blending
{ {
B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
B3dMaterial.Material.ZWriteEnable = false; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
} }
B3dMaterial.Material.Shininess = B3dMaterial.shininess; B3dMaterial.Material.Shininess = B3dMaterial.shininess;

2
source/Irrlicht/CBurningShader_Raster_Reference.cpp
View File

@ -655,7 +655,7 @@ void CBurningShader_Raster_Reference::setMaterial ( const SBurningShaderMaterial
} }
// depth buffer write // depth buffer write
ShaderParam.SetRenderState( BD3DRS_ZWRITEENABLE, m.ZWriteEnable ); ShaderParam.SetRenderState( BD3DRS_ZWRITEENABLE, m.ZWriteEnable != video::EZW_OFF );
} }
/*! /*!

4
source/Irrlicht/CColladaFileLoader.cpp
View File

@ -1541,7 +1541,7 @@ void CColladaFileLoader::readEffect(io::IXMLReaderUTF8* reader, SColladaEffect *
if ((effect->Transparency != 0.0f) && (effect->Transparency != 1.0f)) if ((effect->Transparency != 0.0f) && (effect->Transparency != 1.0f))
{ {
effect->Mat.MaterialType = irr::video::EMT_TRANSPARENT_VERTEX_ALPHA; effect->Mat.MaterialType = irr::video::EMT_TRANSPARENT_VERTEX_ALPHA;
effect->Mat.ZWriteEnable = false; effect->Mat.ZWriteEnable = video::EZW_OFF;
} }
video::E_TEXTURE_CLAMP twu = video::ETC_REPEAT; video::E_TEXTURE_CLAMP twu = video::ETC_REPEAT;
@ -1658,7 +1658,7 @@ void CColladaFileLoader::readBindMaterialSection(io::IXMLReaderUTF8* reader, con
if ((material->Transparency!=0.0f) && (material->Transparency!=1.0f)) if ((material->Transparency!=0.0f) && (material->Transparency!=1.0f))
{ {
toBind[i]->getMaterial().MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; toBind[i]->getMaterial().MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
toBind[i]->getMaterial().ZWriteEnable = false; toBind[i]->getMaterial().ZWriteEnable = video::EZW_OFF;
} }
} }
SceneManager->getMeshManipulator()->setVertexColors(&tmpmesh,material->Mat.DiffuseColor); SceneManager->getMeshManipulator()->setVertexColors(&tmpmesh,material->Mat.DiffuseColor);

2
source/Irrlicht/CGeometryCreator.cpp
View File

@ -1065,7 +1065,7 @@ IMesh* CGeometryCreator::createVolumeLightMesh(
Buffer->Material.MaterialTypeParam = pack_textureBlendFunc( video::EBF_SRC_COLOR, video::EBF_SRC_ALPHA, video::EMFN_MODULATE_1X ); Buffer->Material.MaterialTypeParam = pack_textureBlendFunc( video::EBF_SRC_COLOR, video::EBF_SRC_ALPHA, video::EMFN_MODULATE_1X );
Buffer->Material.Lighting = false; Buffer->Material.Lighting = false;
Buffer->Material.ZWriteEnable = false; Buffer->Material.ZWriteEnable = video::EZW_OFF;
Buffer->setDirty(EBT_VERTEX_AND_INDEX); Buffer->setDirty(EBT_VERTEX_AND_INDEX);

17
source/Irrlicht/CNullDriver.cpp
View File

@ -196,7 +196,7 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& scre
InitMaterial2D.AntiAliasing=video::EAAM_OFF; InitMaterial2D.AntiAliasing=video::EAAM_OFF;
InitMaterial2D.Lighting=false; InitMaterial2D.Lighting=false;
InitMaterial2D.ZWriteEnable=false; InitMaterial2D.ZWriteEnable=video::EZW_OFF;
InitMaterial2D.ZBuffer=video::ECFN_DISABLED; InitMaterial2D.ZBuffer=video::ECFN_DISABLED;
InitMaterial2D.UseMipMaps=false; InitMaterial2D.UseMipMaps=false;
for (u32 i=0; i<video::MATERIAL_MAX_TEXTURES; ++i) for (u32 i=0; i<video::MATERIAL_MAX_TEXTURES; ++i)
@ -1944,7 +1944,7 @@ void CNullDriver::runOcclusionQuery(scene::ISceneNode* node, bool visible)
mat.AntiAliasing=0; mat.AntiAliasing=0;
mat.ColorMask=ECP_NONE; mat.ColorMask=ECP_NONE;
mat.GouraudShading=false; mat.GouraudShading=false;
mat.ZWriteEnable=false; mat.ZWriteEnable=EZW_OFF;
setMaterial(mat); setMaterial(mat);
} }
setTransform(video::ETS_WORLD, node->getAbsoluteTransformation()); setTransform(video::ETS_WORLD, node->getAbsoluteTransformation());
@ -2149,7 +2149,7 @@ io::IAttributes* CNullDriver::createAttributesFromMaterial(const video::SMateria
attr->addBool("PointCloud", material.PointCloud); attr->addBool("PointCloud", material.PointCloud);
attr->addBool("GouraudShading", material.GouraudShading); attr->addBool("GouraudShading", material.GouraudShading);
attr->addBool("Lighting", material.Lighting); attr->addBool("Lighting", material.Lighting);
attr->addBool("ZWriteEnable", material.ZWriteEnable); attr->addEnum("ZWriteEnable", (irr::s32)material.ZWriteEnable, video::ZWriteNames);
attr->addInt("ZBuffer", material.ZBuffer); attr->addInt("ZBuffer", material.ZBuffer);
attr->addBool("BackfaceCulling", material.BackfaceCulling); attr->addBool("BackfaceCulling", material.BackfaceCulling);
attr->addBool("FrontfaceCulling", material.FrontfaceCulling); attr->addBool("FrontfaceCulling", material.FrontfaceCulling);
@ -2165,7 +2165,6 @@ io::IAttributes* CNullDriver::createAttributesFromMaterial(const video::SMateria
attr->addEnum("PolygonOffsetDirection", material.PolygonOffsetDirection, video::PolygonOffsetDirectionNames); attr->addEnum("PolygonOffsetDirection", material.PolygonOffsetDirection, video::PolygonOffsetDirectionNames);
attr->addFloat("PolygonOffsetDepthBias", material.PolygonOffsetDepthBias); attr->addFloat("PolygonOffsetDepthBias", material.PolygonOffsetDepthBias);
attr->addFloat("PolygonOffsetSlopeScale", material.PolygonOffsetSlopeScale); attr->addFloat("PolygonOffsetSlopeScale", material.PolygonOffsetSlopeScale);
attr->addInt("ZWriteFineControl", material.ZWriteFineControl);
// TODO: Would be nice to have a flag that only serializes rest of texture data when a texture pointer exists. // TODO: Would be nice to have a flag that only serializes rest of texture data when a texture pointer exists.
prefix = "BilinearFilter"; prefix = "BilinearFilter";
@ -2228,7 +2227,13 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater
outMaterial.PointCloud = attr->getAttributeAsBool("PointCloud", outMaterial.PointCloud); outMaterial.PointCloud = attr->getAttributeAsBool("PointCloud", outMaterial.PointCloud);
outMaterial.GouraudShading = attr->getAttributeAsBool("GouraudShading", outMaterial.GouraudShading); outMaterial.GouraudShading = attr->getAttributeAsBool("GouraudShading", outMaterial.GouraudShading);
outMaterial.Lighting = attr->getAttributeAsBool("Lighting", outMaterial.Lighting); outMaterial.Lighting = attr->getAttributeAsBool("Lighting", outMaterial.Lighting);
outMaterial.ZWriteEnable = attr->getAttributeAsBool("ZWriteEnable", outMaterial.ZWriteEnable);
io::E_ATTRIBUTE_TYPE attType = attr->getAttributeType("ZWriteEnable");
if (attType == io::EAT_BOOL ) // Before Irrlicht 1.9
outMaterial.ZWriteEnable = attr->getAttributeAsBool("ZWriteEnable", outMaterial.ZWriteEnable != video::EZW_OFF ) ? video::EZW_AUTO : video::EZW_OFF;
else if (attType == io::EAT_ENUM )
outMaterial.ZWriteEnable = (video::E_ZWRITE)attr->getAttributeAsEnumeration("ZWriteEnable", video::ZWriteNames, outMaterial.ZWriteEnable);
outMaterial.ZBuffer = (u8)attr->getAttributeAsInt("ZBuffer", outMaterial.ZBuffer); outMaterial.ZBuffer = (u8)attr->getAttributeAsInt("ZBuffer", outMaterial.ZBuffer);
outMaterial.BackfaceCulling = attr->getAttributeAsBool("BackfaceCulling", outMaterial.BackfaceCulling); outMaterial.BackfaceCulling = attr->getAttributeAsBool("BackfaceCulling", outMaterial.BackfaceCulling);
outMaterial.FrontfaceCulling = attr->getAttributeAsBool("FrontfaceCulling", outMaterial.FrontfaceCulling); outMaterial.FrontfaceCulling = attr->getAttributeAsBool("FrontfaceCulling", outMaterial.FrontfaceCulling);
@ -2245,7 +2250,7 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater
outMaterial.PolygonOffsetDirection = (video::E_POLYGON_OFFSET)attr->getAttributeAsEnumeration("PolygonOffsetDirection", video::PolygonOffsetDirectionNames, outMaterial.PolygonOffsetDirection); outMaterial.PolygonOffsetDirection = (video::E_POLYGON_OFFSET)attr->getAttributeAsEnumeration("PolygonOffsetDirection", video::PolygonOffsetDirectionNames, outMaterial.PolygonOffsetDirection);
outMaterial.PolygonOffsetDepthBias = attr->getAttributeAsFloat("PolygonOffsetDepthBias", outMaterial.PolygonOffsetDepthBias); outMaterial.PolygonOffsetDepthBias = attr->getAttributeAsFloat("PolygonOffsetDepthBias", outMaterial.PolygonOffsetDepthBias);
outMaterial.PolygonOffsetSlopeScale = attr->getAttributeAsFloat("PolygonOffsetSlopeScale", outMaterial.PolygonOffsetSlopeScale); outMaterial.PolygonOffsetSlopeScale = attr->getAttributeAsFloat("PolygonOffsetSlopeScale", outMaterial.PolygonOffsetSlopeScale);
outMaterial.ZWriteFineControl = (video::E_ZWRITE_FINE_CONTROL)attr->getAttributeAsInt("ZWriteFineControl", outMaterial.ZWriteFineControl);
prefix = "BilinearFilter"; prefix = "BilinearFilter";
if (attr->existsAttribute(prefix.c_str())) // legacy if (attr->existsAttribute(prefix.c_str())) // legacy
outMaterial.setFlag(EMF_BILINEAR_FILTER, attr->getAttributeAsBool(prefix.c_str())); outMaterial.setFlag(EMF_BILINEAR_FILTER, attr->getAttributeAsBool(prefix.c_str()));

20
source/Irrlicht/CNullDriver.h
View File

@ -745,22 +745,16 @@ namespace video
inline bool getWriteZBuffer(const SMaterial&material) const inline bool getWriteZBuffer(const SMaterial&material) const
{ {
if (material.ZWriteEnable) switch ( material.ZWriteEnable )
{ {
if (!AllowZWriteOnTransparent) case video::EZW_OFF:
{ return false;
switch (material.ZWriteFineControl) case video::EZW_AUTO:
{ return AllowZWriteOnTransparent || !material.isTransparent();
case EZI_ONLY_NON_TRANSPARENT: case video::EZW_ON:
return !material.isTransparent();
case EZI_ZBUFFER_FLAG:
return true;
}
}
else
return true; return true;
} }
return false; return true; // never should get here, but some compilers don't know and complain
} }
struct SSurface struct SSurface

2
source/Irrlicht/COgreMeshFileLoader.cpp
View File

@ -1013,7 +1013,7 @@ void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique
else if (token=="depth_write") else if (token=="depth_write")
{ {
getMaterialToken(file, token); getMaterialToken(file, token);
pass.Material.ZWriteEnable=(token=="on"); pass.Material.ZWriteEnable=(token=="on") ? video::EZW_ON : video::EZW_OFF;
} }
else if (token=="depth_func") else if (token=="depth_func")
{ {

7
source/Irrlicht/COpenGLShaderMaterialRenderer.h
View File

@ -69,6 +69,13 @@ protected:
COpenGLDriver* Driver; COpenGLDriver* Driver;
IShaderConstantSetCallBack* CallBack; IShaderConstantSetCallBack* CallBack;
// I didn't write this, but here's my understanding:
// Those flags seem to be exclusive so far (so could be an enum).
// Maybe the idea was to make them non-exclusive in future (basically having a shader-material)
// Actually currently there's not even any need to cache them (probably even slower than not doing so).
// They seem to be mostly for downward compatibility.
// I suppose the idea is to use SMaterial.BlendOperation + SMaterial.BlendFactor and a simple non-transparent type as base for more flexibility in the future.
// Note that SMaterial.BlendOperation + SMaterial.BlendFactor are in some drivers already evaluated before OnSetMaterial.
bool Alpha; bool Alpha;
bool Blending; bool Blending;
bool FixedBlending; bool FixedBlending;

6
source/Irrlicht/CQ3LevelMesh.cpp
View File

@ -718,7 +718,7 @@ s32 CQ3LevelMesh::setShaderFogMaterial( video::SMaterial &material, const tBSPFa
material.setTexture(2, 0); material.setTexture(2, 0);
material.setTexture(3, 0); material.setTexture(3, 0);
material.ZBuffer = video::ECFN_LESSEQUAL; material.ZBuffer = video::ECFN_LESSEQUAL;
material.ZWriteEnable = false; material.ZWriteEnable = video::EZW_OFF;
material.MaterialTypeParam = 0.f; material.MaterialTypeParam = 0.f;
s32 shaderState = -1; s32 shaderState = -1;
@ -746,7 +746,7 @@ s32 CQ3LevelMesh::setShaderMaterial( video::SMaterial &material, const tBSPFace
material.setTexture(2, 0); material.setTexture(2, 0);
material.setTexture(3, 0); material.setTexture(3, 0);
material.ZBuffer = video::ECFN_LESSEQUAL; material.ZBuffer = video::ECFN_LESSEQUAL;
material.ZWriteEnable = true; material.ZWriteEnable = video::EZW_AUTO;
material.MaterialTypeParam = 0.f; material.MaterialTypeParam = 0.f;
s32 shaderState = -1; s32 shaderState = -1;
@ -804,7 +804,7 @@ s32 CQ3LevelMesh::setShaderMaterial( video::SMaterial &material, const tBSPFace
if ( group->isDefined( "depthwrite" ) ) if ( group->isDefined( "depthwrite" ) )
{ {
material.ZWriteEnable = true; material.ZWriteEnable = video::EZW_ON;
} }
SBlendFunc blendfunc ( LoadParam.defaultModulate ); SBlendFunc blendfunc ( LoadParam.defaultModulate );

5
source/Irrlicht/CQuake3ShaderSceneNode.cpp
View File

@ -368,13 +368,14 @@ void CQuake3ShaderSceneNode::render()
material.setTexture(0, tex ); material.setTexture(0, tex );
material.ZBuffer = getDepthFunction( group->get( "depthfunc" ) ); material.ZBuffer = getDepthFunction( group->get( "depthfunc" ) );
// TODO: maybe should be video::EZW_ON instead of EZW_AUTO now (we didn't have that before and I just kept old values here when introducing it to not break anything)
if ( group->isDefined( "depthwrite" ) ) if ( group->isDefined( "depthwrite" ) )
{ {
material.ZWriteEnable = true; material.ZWriteEnable = video::EZW_AUTO;
} }
else else
{ {
material.ZWriteEnable = drawCount == 0; material.ZWriteEnable = drawCount == 0 ? video::EZW_AUTO : video::EZW_OFF;
} }
//resolve quake3 blendfunction to irrlicht Material Type //resolve quake3 blendfunction to irrlicht Material Type

2
source/Irrlicht/CSkyBoxSceneNode.cpp
View File

@ -39,7 +39,7 @@ CSkyBoxSceneNode::CSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom
video::SMaterial mat; video::SMaterial mat;
mat.Lighting = false; mat.Lighting = false;
mat.ZBuffer = video::ECFN_DISABLED; mat.ZBuffer = video::ECFN_DISABLED;
mat.ZWriteEnable = false; mat.ZWriteEnable = video::EZW_OFF;
mat.AntiAliasing=0; mat.AntiAliasing=0;
mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;

2
source/Irrlicht/CSkyDomeSceneNode.cpp
View File

@ -49,7 +49,7 @@ CSkyDomeSceneNode::CSkyDomeSceneNode(video::ITexture* sky, u32 horiRes, u32 vert
Buffer = new SMeshBuffer(); Buffer = new SMeshBuffer();
Buffer->Material.Lighting = false; Buffer->Material.Lighting = false;
Buffer->Material.ZBuffer = video::ECFN_DISABLED; Buffer->Material.ZBuffer = video::ECFN_DISABLED;
Buffer->Material.ZWriteEnable = false; Buffer->Material.ZWriteEnable = video::EZW_OFF;
Buffer->Material.AntiAliasing = video::EAAM_OFF; Buffer->Material.AntiAliasing = video::EAAM_OFF;
Buffer->Material.setTexture(0, sky); Buffer->Material.setTexture(0, sky);
Buffer->BoundingBox.MaxEdge.set(0,0,0); Buffer->BoundingBox.MaxEdge.set(0,0,0);

2
source/Irrlicht/CSoftwareDriver.cpp
View File

@ -139,7 +139,7 @@ void CSoftwareDriver::selectRightTriangleRenderer()
renderer = ETR_TEXTURE_GOURAUD_ADD; renderer = ETR_TEXTURE_GOURAUD_ADD;
} }
else else
if ((Material.ZBuffer==ECFN_DISABLED) && !Material.ZWriteEnable) if ((Material.ZBuffer==ECFN_DISABLED) && Material.ZWriteEnable == video::EZW_OFF)
renderer = ETR_TEXTURE_GOURAUD_NOZ; renderer = ETR_TEXTURE_GOURAUD_NOZ;
else else
{ {

4
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -177,7 +177,7 @@ void CBurningVideoDriver::setCurrentShader()
ITexture *texture1 = Material.org.getTexture(1); ITexture *texture1 = Material.org.getTexture(1);
bool zMaterialTest = Material.org.ZBuffer != ECFN_DISABLED && bool zMaterialTest = Material.org.ZBuffer != ECFN_DISABLED &&
Material.org.ZWriteEnable && Material.org.ZWriteEnable != video::EZW_OFF &&
getWriteZBuffer(Material.org); getWriteZBuffer(Material.org);
EBurningFFShader shader = zMaterialTest ? ETR_TEXTURE_GOURAUD : ETR_TEXTURE_GOURAUD_NOZ; EBurningFFShader shader = zMaterialTest ? ETR_TEXTURE_GOURAUD : ETR_TEXTURE_GOURAUD_NOZ;
@ -2291,7 +2291,7 @@ void CBurningVideoDriver::drawStencilShadowVolume(const core::array<core::vector
Material.org.MaterialType = video::EMT_SOLID; Material.org.MaterialType = video::EMT_SOLID;
Material.org.Lighting = false; Material.org.Lighting = false;
Material.org.ZWriteEnable = false; Material.org.ZWriteEnable = video::EZW_OFF;
Material.org.ZBuffer = ECFN_LESSEQUAL; Material.org.ZBuffer = ECFN_LESSEQUAL;
LightSpace.Flags &= ~VERTEXTRANSFORM; LightSpace.Flags &= ~VERTEXTRANSFORM;

2
source/Irrlicht/CTextSceneNode.cpp
View File

@ -134,7 +134,7 @@ CBillboardTextSceneNode::CBillboardTextSceneNode(ISceneNode* parent, ISceneManag
Material.BackfaceCulling = false; Material.BackfaceCulling = false;
Material.Lighting = false; Material.Lighting = false;
Material.ZBuffer = video::ECFN_LESSEQUAL; Material.ZBuffer = video::ECFN_LESSEQUAL;
Material.ZWriteEnable = false; Material.ZWriteEnable = video::EZW_OFF;
if (font) if (font)
{ {

2
tests/main.cpp
View File

@ -49,7 +49,7 @@ int main(int argumentCount, char * arguments[])
#if 0 #if 0
// To interactively debug a test, move it (temporarily) in here and enable the define to only run this test // To interactively debug a test, move it (temporarily) in here and enable the define to only run this test
// Otherwise debugging is slightly tricky as each test runs in it's own process. // Otherwise debugging is slightly tricky as each test runs in it's own process.
TEST(stencilShadow); TEST(ioScene);
#else #else
TEST(disambiguateTextures); // Normally you should run this first, since it validates the working directory. TEST(disambiguateTextures); // Normally you should run this first, since it validates the working directory.

BIN
tests/media/scene.irr
View File

Binary file not shown.

BIN
tests/media/scene2.irr
View File

Binary file not shown.

2
tests/projectionMatrix.cpp
View File

@ -31,7 +31,7 @@ static bool runTestWithDriver(E_DRIVER_TYPE driverType)
mat.MaterialType = EMT_SOLID; mat.MaterialType = EMT_SOLID;
mat.Lighting = false; mat.Lighting = false;
mat.ZBuffer = false; mat.ZBuffer = false;
mat.ZWriteEnable = false; mat.ZWriteEnable = video::EZW_OFF;
mat.Thickness = 1; mat.Thickness = 1;
driver->setMaterial(mat); driver->setMaterial(mat);

2
tests/tests-last-passed-at.txt
View File

@ -1,4 +1,4 @@
Tests finished. 72 tests of 72 passed. Tests finished. 72 tests of 72 passed.
Compiled as DEBUG Compiled as DEBUG
Test suite pass at GMT Tue Dec 17 13:59:20 2019 Test suite pass at GMT Thu Jan 02 15:17:55 2020