diff --git a/lib/irrlicht/changes.stk b/lib/irrlicht/changes.stk index 8979ca204..734e8817a 100644 --- a/lib/irrlicht/changes.stk +++ b/lib/irrlicht/changes.stk @@ -8,3 +8,4 @@ The following changes have been made: - partial backport to expose setCurrentRendertime in the scene mgr - a workaround for every other RTTs flipping - aabbox intersection support +- texture override diff --git a/lib/irrlicht/include/EMaterialFlags.h b/lib/irrlicht/include/EMaterialFlags.h index 57fb22c4b..8c720bdd6 100644 --- a/lib/irrlicht/include/EMaterialFlags.h +++ b/lib/irrlicht/include/EMaterialFlags.h @@ -87,7 +87,16 @@ namespace video EMF_POLYGON_OFFSET = 0x80000, //! MaterialType override - EMF_MATERIAL_TYPE = 0x100000 + EMF_MATERIAL_TYPE = 0x100000, + + //! Texture + EMF_TEXTURE0 = 0x200000, + + //! Texture + EMF_TEXTURE1 = 0x400000, + + //! Texture + EMF_TEXTURE2 = 0x800000, }; } // end namespace video diff --git a/lib/irrlicht/include/IVideoDriver.h b/lib/irrlicht/include/IVideoDriver.h index 244155e8a..73d4db4ce 100644 --- a/lib/irrlicht/include/IVideoDriver.h +++ b/lib/irrlicht/include/IVideoDriver.h @@ -201,6 +201,12 @@ namespace video case EMF_POLYGON_OFFSET: material.PolygonOffsetDirection = Material.PolygonOffsetDirection; material.PolygonOffsetFactor = Material.PolygonOffsetFactor; break; + case EMF_TEXTURE0: + material.TextureLayer[0] = Material.TextureLayer[0]; break; + case EMF_TEXTURE1: + material.TextureLayer[1] = Material.TextureLayer[1]; break; + case EMF_TEXTURE2: + material.TextureLayer[2] = Material.TextureLayer[2]; break; } } }