From c40045a40acf87c2153637b94eb03c0c32c0edd6 Mon Sep 17 00:00:00 2001 From: Gregor Parzefall Date: Sat, 24 Jun 2023 15:18:06 +0200 Subject: [PATCH] Rename SMaterial::TextureLayer -> SMaterial::TextureLayers It's not the "texture layer" of the material, but an array of texture layers. --- include/SMaterial.h | 16 +++--- include/SOverrideMaterial.h | 16 +++--- source/Irrlicht/COGLES2Driver.cpp | 32 ++++++------ .../Irrlicht/COGLES2FixedPipelineRenderer.cpp | 4 +- source/Irrlicht/COGLES2Renderer2D.cpp | 2 +- source/Irrlicht/COGLESDriver.cpp | 50 +++++++++--------- source/Irrlicht/COpenGLCoreCacheHandler.h | 4 +- source/Irrlicht/COpenGLDriver.cpp | 52 +++++++++---------- source/Irrlicht/OpenGL/Driver.cpp | 32 ++++++------ .../Irrlicht/OpenGL/FixedPipelineRenderer.cpp | 4 +- source/Irrlicht/OpenGL/Renderer2D.cpp | 2 +- 11 files changed, 107 insertions(+), 107 deletions(-) diff --git a/include/SMaterial.h b/include/SMaterial.h index c5b813a2..e2ff6b64 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -303,7 +303,7 @@ namespace video { } //! Texture layer array. - SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES]; + SMaterialLayer TextureLayers[MATERIAL_MAX_TEXTURES]; //! Type of the material. Specifies how everything is blended together E_MATERIAL_TYPE MaterialType; @@ -465,7 +465,7 @@ namespace video template void forEachTexture(F &&fn) { for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; i++) { - fn(TextureLayer[i]); + fn(TextureLayers[i]); } } @@ -474,7 +474,7 @@ namespace video \return Texture matrix for texture level i. */ core::matrix4& getTextureMatrix(u32 i) { - return TextureLayer[i].getTextureMatrix(); + return TextureLayers[i].getTextureMatrix(); } //! Gets the immutable texture transformation matrix for level i @@ -483,7 +483,7 @@ namespace video const core::matrix4& getTextureMatrix(u32 i) const { if (i=MATERIAL_MAX_TEXTURES) return; - TextureLayer[i].setTextureMatrix(mat); + TextureLayers[i].setTextureMatrix(mat); } //! Gets the i-th texture @@ -503,7 +503,7 @@ namespace video \return Texture for texture level i, if defined, else 0. */ ITexture* getTexture(u32 i) const { - return i < MATERIAL_MAX_TEXTURES ? TextureLayer[i].Texture : 0; + return i < MATERIAL_MAX_TEXTURES ? TextureLayers[i].Texture : 0; } //! Sets the i-th texture @@ -514,7 +514,7 @@ namespace video { if (i>=MATERIAL_MAX_TEXTURES) return; - TextureLayer[i].Texture = tex; + TextureLayers[i].Texture = tex; } //! Inequality operator @@ -554,7 +554,7 @@ namespace video ; for (u32 i=0; (i(texture); // function uses const-pointer for texture because all draw functions use const-pointers already + Material.TextureLayers[layerIdx].Texture = const_cast(texture); // function uses const-pointer for texture because all draw functions use const-pointers already return CacheHandler->getTextureCache().set(0, texture); } @@ -1696,9 +1696,9 @@ COGLES2Driver::~COGLES2Driver() if (resetAllRenderstates) tmpTexture->getStatesCache().IsCached = false; - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MagFilter != tmpTexture->getStatesCache().MagFilter) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MagFilter != tmpTexture->getStatesCache().MagFilter) { - E_TEXTURE_MAG_FILTER magFilter = material.TextureLayer[i].MagFilter; + E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MAG_FILTER, magFilter == ETMAGF_BILINEAR ? GL_LINEAR : GL_NEAREST); @@ -1707,10 +1707,10 @@ COGLES2Driver::~COGLES2Driver() if (material.UseMipMaps && tmpTexture->hasMipMaps()) { - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MinFilter != tmpTexture->getStatesCache().MinFilter || + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter || !tmpTexture->getStatesCache().MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_TRILINEAR ? GL_LINEAR_MIPMAP_LINEAR : minFilter == ETMINF_BILINEAR ? GL_LINEAR_MIPMAP_NEAREST : @@ -1722,10 +1722,10 @@ COGLES2Driver::~COGLES2Driver() } else { - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MinFilter != tmpTexture->getStatesCache().MinFilter || + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter || tmpTexture->getStatesCache().MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, (minFilter == ETMINF_TRILINEAR || minFilter == ETMINF_BILINEAR) ? GL_LINEAR : GL_NEAREST); @@ -1736,25 +1736,25 @@ COGLES2Driver::~COGLES2Driver() #ifdef GL_EXT_texture_filter_anisotropic if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_texture_filter_anisotropic] && - (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter)) + (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter)) { glTexParameteri(tmpTextureType, GL_TEXTURE_MAX_ANISOTROPY_EXT, - material.TextureLayer[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1); + material.TextureLayers[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1); - tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter; + tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter; } #endif - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapU != tmpTexture->getStatesCache().WrapU) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapU != tmpTexture->getStatesCache().WrapU) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU)); - tmpTexture->getStatesCache().WrapU = material.TextureLayer[i].TextureWrapU; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU)); + tmpTexture->getStatesCache().WrapU = material.TextureLayers[i].TextureWrapU; } - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapV != tmpTexture->getStatesCache().WrapV) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapV != tmpTexture->getStatesCache().WrapV) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV)); - tmpTexture->getStatesCache().WrapV = material.TextureLayer[i].TextureWrapV; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV)); + tmpTexture->getStatesCache().WrapV = material.TextureLayers[i].TextureWrapV; } tmpTexture->getStatesCache().IsCached = true; diff --git a/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp b/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp index c4cb688c..0d2a8fe6 100644 --- a/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp +++ b/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp @@ -112,7 +112,7 @@ void COGLES2MaterialSolidCB::OnSetMaterial(const SMaterial& material) COGLES2MaterialBaseCB::OnSetMaterial(material); AlphaRef = material.MaterialTypeParam; - TextureUsage0 = (material.TextureLayer[0].Texture) ? 1 : 0; + TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0; } void COGLES2MaterialSolidCB::OnSetConstants(IMaterialRendererServices* services, s32 userData) @@ -169,7 +169,7 @@ void COGLES2MaterialOneTextureBlendCB::OnSetMaterial(const SMaterial& material) } } - TextureUsage0 = (material.TextureLayer[0].Texture) ? 1 : 0; + TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0; } void COGLES2MaterialOneTextureBlendCB::OnSetConstants(IMaterialRendererServices* services, s32 userData) diff --git a/source/Irrlicht/COGLES2Renderer2D.cpp b/source/Irrlicht/COGLES2Renderer2D.cpp index b891d98f..6cd9f5f9 100644 --- a/source/Irrlicht/COGLES2Renderer2D.cpp +++ b/source/Irrlicht/COGLES2Renderer2D.cpp @@ -71,7 +71,7 @@ void COGLES2Renderer2D::OnSetMaterial(const video::SMaterial& material, if ( WithTexture ) { - s32 TextureUsage = material.TextureLayer[0].Texture ? 1 : 0; + s32 TextureUsage = material.TextureLayers[0].Texture ? 1 : 0; setPixelShaderConstant(TextureUsageID, &TextureUsage, 1); } } diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp index 2c4946c8..9ca9a767 100644 --- a/source/Irrlicht/COGLESDriver.cpp +++ b/source/Irrlicht/COGLESDriver.cpp @@ -1841,7 +1841,7 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset for (s32 i = Feature.MaxTextureUnits - 1; i >= 0; --i) { - CacheHandler->getTextureCache().set(i, material.TextureLayer[i].Texture); + CacheHandler->getTextureCache().set(i, material.TextureLayers[i].Texture); const COGLES1Texture* tmpTexture = CacheHandler->getTextureCache().get(i); @@ -1878,24 +1878,24 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset #ifdef GL_VERSION_2_1 if (Version >= 210) { - if (!statesCache.IsCached || material.TextureLayer[i].LODBias != statesCache.LODBias) + if (!statesCache.IsCached || material.TextureLayers[i].LODBias != statesCache.LODBias) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexParameterf(tmpTextureType, GL_TEXTURE_LOD_BIAS, tmp); } else glTexParameterf(tmpTextureType, GL_TEXTURE_LOD_BIAS, 0.f); - statesCache.LODBias = material.TextureLayer[i].LODBias; + statesCache.LODBias = material.TextureLayers[i].LODBias; } } else if (FeatureAvailable[IRR_EXT_texture_lod_bias]) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp); } else @@ -1904,9 +1904,9 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset #elif defined(GL_EXT_texture_lod_bias) if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_texture_lod_bias]) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp); } else @@ -1914,9 +1914,9 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset } #endif - if (!statesCache.IsCached || material.TextureLayer[i].MagFilter != statesCache.MagFilter) + if (!statesCache.IsCached || material.TextureLayers[i].MagFilter != statesCache.MagFilter) { - E_TEXTURE_MAG_FILTER magFilter = material.TextureLayer[i].MagFilter; + E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MAG_FILTER, magFilter == ETMAGF_BILINEAR ? GL_LINEAR : GL_NEAREST); @@ -1925,10 +1925,10 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset if (material.UseMipMaps && tmpTexture->hasMipMaps()) { - if (!statesCache.IsCached || material.TextureLayer[i].MinFilter != statesCache.MinFilter || + if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter || !statesCache.MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_TRILINEAR ? GL_LINEAR_MIPMAP_LINEAR : minFilter == ETMINF_BILINEAR ? GL_LINEAR_MIPMAP_NEAREST : @@ -1940,10 +1940,10 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset } else { - if (!statesCache.IsCached || material.TextureLayer[i].MinFilter != statesCache.MinFilter || + if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter || statesCache.MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, (minFilter == ETMINF_TRILINEAR || minFilter == ETMINF_BILINEAR) ? GL_LINEAR : GL_NEAREST); @@ -1954,25 +1954,25 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial& material, bool reset #ifdef GL_EXT_texture_filter_anisotropic if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_texture_filter_anisotropic] && - (!statesCache.IsCached || material.TextureLayer[i].AnisotropicFilter != statesCache.AnisotropicFilter)) + (!statesCache.IsCached || material.TextureLayers[i].AnisotropicFilter != statesCache.AnisotropicFilter)) { glTexParameteri(tmpTextureType, GL_TEXTURE_MAX_ANISOTROPY_EXT, - material.TextureLayer[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1); + material.TextureLayers[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1); - statesCache.AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter; + statesCache.AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter; } #endif - if (!statesCache.IsCached || material.TextureLayer[i].TextureWrapU != statesCache.WrapU) + if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapU != statesCache.WrapU) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU)); - statesCache.WrapU = material.TextureLayer[i].TextureWrapU; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU)); + statesCache.WrapU = material.TextureLayers[i].TextureWrapU; } - if (!statesCache.IsCached || material.TextureLayer[i].TextureWrapV != statesCache.WrapV) + if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapV != statesCache.WrapV) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV)); - statesCache.WrapV = material.TextureLayer[i].TextureWrapV; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV)); + statesCache.WrapV = material.TextureLayers[i].TextureWrapV; } statesCache.IsCached = true; @@ -2013,7 +2013,7 @@ void COGLES1Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh Material = (OverrideMaterial2DEnabled) ? OverrideMaterial2D : InitMaterial2D; Material.Lighting = false; - Material.TextureLayer[0].Texture = (texture) ? const_cast(CacheHandler->getTextureCache().get(0)) : 0; + Material.TextureLayers[0].Texture = (texture) ? const_cast(CacheHandler->getTextureCache().get(0)) : 0; setTransform(ETS_TEXTURE_0, core::IdentityMatrix); setBasicRenderStates(Material, LastMaterial, false); diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h index ebe0a193..02dc1865 100644 --- a/source/Irrlicht/COpenGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -590,9 +590,9 @@ public: // Fix textures which got removed for ( u32 i=0; i < MATERIAL_MAX_TEXTURES; ++i ) { - if ( material.TextureLayer[i].Texture && !TextureCache[i] ) + if ( material.TextureLayers[i].Texture && !TextureCache[i] ) { - material.TextureLayer[i].Texture = 0; + material.TextureLayers[i].Texture = 0; } } } diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index 8f731f3e..554c09b7 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -2673,24 +2673,24 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset #ifdef GL_VERSION_2_1 if (Version >= 201) { - if (!statesCache.IsCached || material.TextureLayer[i].LODBias != statesCache.LODBias) + if (!statesCache.IsCached || material.TextureLayers[i].LODBias != statesCache.LODBias) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexParameterf(tmpType, GL_TEXTURE_LOD_BIAS, tmp); } else glTexParameterf(tmpType, GL_TEXTURE_LOD_BIAS, 0.f); - statesCache.LODBias = material.TextureLayer[i].LODBias; + statesCache.LODBias = material.TextureLayers[i].LODBias; } } else if (FeatureAvailable[IRR_EXT_texture_lod_bias]) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp); } else @@ -2699,9 +2699,9 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset #elif defined(GL_EXT_texture_lod_bias) if (FeatureAvailable[IRR_EXT_texture_lod_bias]) { - if (material.TextureLayer[i].LODBias) + if (material.TextureLayers[i].LODBias) { - const float tmp = core::clamp(material.TextureLayer[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); + const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias); glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp); } else @@ -2709,9 +2709,9 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset } #endif - if (!statesCache.IsCached || material.TextureLayer[i].MagFilter != statesCache.MagFilter) + if (!statesCache.IsCached || material.TextureLayers[i].MagFilter != statesCache.MagFilter) { - E_TEXTURE_MAG_FILTER magFilter = material.TextureLayer[i].MagFilter; + E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter; glTexParameteri(tmpType, GL_TEXTURE_MAG_FILTER, magFilter == ETMAGF_BILINEAR ? GL_LINEAR : GL_NEAREST); @@ -2720,10 +2720,10 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset if (material.UseMipMaps && tmpTexture->hasMipMaps()) { - if (!statesCache.IsCached || material.TextureLayer[i].MinFilter != statesCache.MinFilter || + if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter || !statesCache.MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_TRILINEAR ? GL_LINEAR_MIPMAP_LINEAR : minFilter == ETMINF_BILINEAR ? GL_LINEAR_MIPMAP_NEAREST : @@ -2735,10 +2735,10 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset } else { - if (!statesCache.IsCached || material.TextureLayer[i].MinFilter != statesCache.MinFilter || + if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter || statesCache.MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpType, GL_TEXTURE_MIN_FILTER, (minFilter == ETMINF_TRILINEAR || minFilter == ETMINF_BILINEAR) ? GL_LINEAR : GL_NEAREST); @@ -2749,31 +2749,31 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset #ifdef GL_EXT_texture_filter_anisotropic if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic] && - (!statesCache.IsCached || material.TextureLayer[i].AnisotropicFilter != statesCache.AnisotropicFilter)) + (!statesCache.IsCached || material.TextureLayers[i].AnisotropicFilter != statesCache.AnisotropicFilter)) { glTexParameteri(tmpType, GL_TEXTURE_MAX_ANISOTROPY_EXT, - material.TextureLayer[i].AnisotropicFilter > 1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1); + material.TextureLayers[i].AnisotropicFilter > 1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1); - statesCache.AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter; + statesCache.AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter; } #endif - if (!statesCache.IsCached || material.TextureLayer[i].TextureWrapU != statesCache.WrapU) + if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapU != statesCache.WrapU) { - glTexParameteri(tmpType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU)); - statesCache.WrapU = material.TextureLayer[i].TextureWrapU; + glTexParameteri(tmpType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU)); + statesCache.WrapU = material.TextureLayers[i].TextureWrapU; } - if (!statesCache.IsCached || material.TextureLayer[i].TextureWrapV != statesCache.WrapV) + if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapV != statesCache.WrapV) { - glTexParameteri(tmpType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV)); - statesCache.WrapV = material.TextureLayer[i].TextureWrapV; + glTexParameteri(tmpType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV)); + statesCache.WrapV = material.TextureLayers[i].TextureWrapV; } - if (!statesCache.IsCached || material.TextureLayer[i].TextureWrapW != statesCache.WrapW) + if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapW != statesCache.WrapW) { - glTexParameteri(tmpType, GL_TEXTURE_WRAP_R, getTextureWrapMode(material.TextureLayer[i].TextureWrapW)); - statesCache.WrapW = material.TextureLayer[i].TextureWrapW; + glTexParameteri(tmpType, GL_TEXTURE_WRAP_R, getTextureWrapMode(material.TextureLayers[i].TextureWrapW)); + statesCache.WrapW = material.TextureLayers[i].TextureWrapW; } statesCache.IsCached = true; diff --git a/source/Irrlicht/OpenGL/Driver.cpp b/source/Irrlicht/OpenGL/Driver.cpp index 7d123acd..2d12c406 100644 --- a/source/Irrlicht/OpenGL/Driver.cpp +++ b/source/Irrlicht/OpenGL/Driver.cpp @@ -402,7 +402,7 @@ COpenGL3DriverBase::~COpenGL3DriverBase() bool COpenGL3DriverBase::setMaterialTexture(irr::u32 layerIdx, const irr::video::ITexture* texture) { - Material.TextureLayer[layerIdx].Texture = const_cast(texture); // function uses const-pointer for texture because all draw functions use const-pointers already + Material.TextureLayers[layerIdx].Texture = const_cast(texture); // function uses const-pointer for texture because all draw functions use const-pointers already return CacheHandler->getTextureCache().set(0, texture); } @@ -1456,9 +1456,9 @@ COpenGL3DriverBase::~COpenGL3DriverBase() if (resetAllRenderstates) tmpTexture->getStatesCache().IsCached = false; - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MagFilter != tmpTexture->getStatesCache().MagFilter) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MagFilter != tmpTexture->getStatesCache().MagFilter) { - E_TEXTURE_MAG_FILTER magFilter = material.TextureLayer[i].MagFilter; + E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MAG_FILTER, magFilter == ETMAGF_BILINEAR ? GL_LINEAR : GL_NEAREST); @@ -1467,10 +1467,10 @@ COpenGL3DriverBase::~COpenGL3DriverBase() if (material.UseMipMaps && tmpTexture->hasMipMaps()) { - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MinFilter != tmpTexture->getStatesCache().MinFilter || + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter || !tmpTexture->getStatesCache().MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_TRILINEAR ? GL_LINEAR_MIPMAP_LINEAR : minFilter == ETMINF_BILINEAR ? GL_LINEAR_MIPMAP_NEAREST : @@ -1482,10 +1482,10 @@ COpenGL3DriverBase::~COpenGL3DriverBase() } else { - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].MinFilter != tmpTexture->getStatesCache().MinFilter || + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter || tmpTexture->getStatesCache().MipMapStatus) { - E_TEXTURE_MIN_FILTER minFilter = material.TextureLayer[i].MinFilter; + E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, (minFilter == ETMINF_TRILINEAR || minFilter == ETMINF_BILINEAR) ? GL_LINEAR : GL_NEAREST); @@ -1495,24 +1495,24 @@ COpenGL3DriverBase::~COpenGL3DriverBase() } if (AnisotropicFilterSupported && - (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter)) + (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter)) { glTexParameteri(tmpTextureType, GL.TEXTURE_MAX_ANISOTROPY, - material.TextureLayer[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayer[i].AnisotropicFilter) : 1); + material.TextureLayers[i].AnisotropicFilter>1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1); - tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayer[i].AnisotropicFilter; + tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter; } - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapU != tmpTexture->getStatesCache().WrapU) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapU != tmpTexture->getStatesCache().WrapU) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayer[i].TextureWrapU)); - tmpTexture->getStatesCache().WrapU = material.TextureLayer[i].TextureWrapU; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU)); + tmpTexture->getStatesCache().WrapU = material.TextureLayers[i].TextureWrapU; } - if (!tmpTexture->getStatesCache().IsCached || material.TextureLayer[i].TextureWrapV != tmpTexture->getStatesCache().WrapV) + if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapV != tmpTexture->getStatesCache().WrapV) { - glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayer[i].TextureWrapV)); - tmpTexture->getStatesCache().WrapV = material.TextureLayer[i].TextureWrapV; + glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV)); + tmpTexture->getStatesCache().WrapV = material.TextureLayers[i].TextureWrapV; } tmpTexture->getStatesCache().IsCached = true; diff --git a/source/Irrlicht/OpenGL/FixedPipelineRenderer.cpp b/source/Irrlicht/OpenGL/FixedPipelineRenderer.cpp index ec600b25..d67c9efa 100644 --- a/source/Irrlicht/OpenGL/FixedPipelineRenderer.cpp +++ b/source/Irrlicht/OpenGL/FixedPipelineRenderer.cpp @@ -106,7 +106,7 @@ void COpenGL3MaterialSolidCB::OnSetMaterial(const SMaterial& material) COpenGL3MaterialBaseCB::OnSetMaterial(material); AlphaRef = material.MaterialTypeParam; - TextureUsage0 = (material.TextureLayer[0].Texture) ? 1 : 0; + TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0; } void COpenGL3MaterialSolidCB::OnSetConstants(IMaterialRendererServices* services, s32 userData) @@ -163,7 +163,7 @@ void COpenGL3MaterialOneTextureBlendCB::OnSetMaterial(const SMaterial& material) } } - TextureUsage0 = (material.TextureLayer[0].Texture) ? 1 : 0; + TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0; } void COpenGL3MaterialOneTextureBlendCB::OnSetConstants(IMaterialRendererServices* services, s32 userData) diff --git a/source/Irrlicht/OpenGL/Renderer2D.cpp b/source/Irrlicht/OpenGL/Renderer2D.cpp index 96bdbda2..92341d11 100644 --- a/source/Irrlicht/OpenGL/Renderer2D.cpp +++ b/source/Irrlicht/OpenGL/Renderer2D.cpp @@ -69,7 +69,7 @@ void COpenGL3Renderer2D::OnSetMaterial(const video::SMaterial& material, if ( WithTexture ) { - s32 TextureUsage = material.TextureLayer[0].Texture ? 1 : 0; + s32 TextureUsage = material.TextureLayers[0].Texture ? 1 : 0; setPixelShaderConstant(TextureUsageID, &TextureUsage, 1); } }