minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-06-28 06:20:21 +02:00
Code Issues Projects Releases Wiki Activity

Rename SMaterial::TextureLayer -> SMaterial::TextureLayers

Browse Source 
It's not the "texture layer" of the material, but an array of texture layers.
This commit is contained in:
Gregor Parzefall
2023-06-24 15:18:06 +02:00
committed by sfan5
parent c0ef1092c0
commit c40045a40a
11 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/SMaterial.h
View File

@ -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 <typename F>
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].getTextureMatrix();
return TextureLayers[i].getTextureMatrix();
else
return core::IdentityMatrix;
}
@ -495,7 +495,7 @@ namespace video
{
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<MATERIAL_MAX_TEXTURES) && !different; ++i)
{
different |= (TextureLayer[i] != b.TextureLayer[i]);
different |= (TextureLayers[i] != b.TextureLayers[i]);
}
return different;
}

16
include/SOverrideMaterial.h
View File

@ -109,7 +109,7 @@ namespace video
{
if ( EnableLayerProps[i] )
{
material.TextureLayer[i].MinFilter = Material.TextureLayer[i].MinFilter;
material.TextureLayers[i].MinFilter = Material.TextureLayers[i].MinFilter;
}
}
break;
@ -118,7 +118,7 @@ namespace video
{
if ( EnableLayerProps[i] )
{
material.TextureLayer[i].MagFilter = Material.TextureLayer[i].MagFilter;
material.TextureLayers[i].MagFilter = Material.TextureLayers[i].MagFilter;
}
}
break;
@ -127,7 +127,7 @@ namespace video
{
if ( EnableLayerProps[i] )
{
material.TextureLayer[i].AnisotropicFilter = Material.TextureLayer[i].AnisotropicFilter;
material.TextureLayers[i].AnisotropicFilter = Material.TextureLayers[i].AnisotropicFilter;
}
}
break;
@ -138,9 +138,9 @@ namespace video
{
if ( EnableLayerProps[i] )
{
material.TextureLayer[i].TextureWrapU = Material.TextureLayer[i].TextureWrapU;
material.TextureLayer[i].TextureWrapV = Material.TextureLayer[i].TextureWrapV;
material.TextureLayer[i].TextureWrapW = Material.TextureLayer[i].TextureWrapW;
material.TextureLayers[i].TextureWrapU = Material.TextureLayers[i].TextureWrapU;
material.TextureLayers[i].TextureWrapV = Material.TextureLayers[i].TextureWrapV;
material.TextureLayers[i].TextureWrapW = Material.TextureLayers[i].TextureWrapW;
}
}
break;
@ -163,11 +163,11 @@ namespace video
{
if ( EnableLayers[i] )
{
material.TextureLayer[i] = Material.TextureLayer[i];
material.TextureLayers[i] = Material.TextureLayers[i];
}
else if ( EnableTextures[i] )
{
material.TextureLayer[i].Texture = Material.TextureLayer[i].Texture;
material.TextureLayers[i].Texture = Material.TextureLayers[i].Texture;
}
}
}