diff options
| author | RealBadAngel <maciej.kasatkin@o2.pl> | 2015-08-18 23:59:44 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-08-20 02:41:40 +0200 |
| commit | 8b8d17b22b5853c7d32bdb8b369f4523f6c57b95 (patch) | |
| tree | aa3b48fcfcfea132fb857360e88f4e96f7ac5510 /src/client/tile.h | |
| parent | 5009d31a333a8e1fff8c97bed69873164c72c600 (diff) | |
| download | minetest-8b8d17b22b5853c7d32bdb8b369f4523f6c57b95.tar.gz minetest-8b8d17b22b5853c7d32bdb8b369f4523f6c57b95.tar.bz2 minetest-8b8d17b22b5853c7d32bdb8b369f4523f6c57b95.zip | |
Remove use of engine sent texture tiling flags - theyre no longer needed
Diffstat (limited to 'src/client/tile.h')
| -rw-r--r-- | src/client/tile.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/client/tile.h b/src/client/tile.h index c08ffc8ad..3098a79b9 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -113,8 +113,7 @@ public: const TextureFromMeshParams ¶ms)=0; virtual video::ITexture* getNormalTexture(const std::string &name)=0; virtual video::SColor getTextureAverageColor(const std::string &name)=0; - virtual video::ITexture *getShaderFlagsTexture(bool normamap_present, - bool tileable_vertical, bool tileable_horizontal)=0; + virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0; }; class IWritableTextureSource : public ITextureSource @@ -137,8 +136,7 @@ public: virtual void rebuildImagesAndTextures()=0; virtual video::ITexture* getNormalTexture(const std::string &name)=0; virtual video::SColor getTextureAverageColor(const std::string &name)=0; - virtual video::ITexture *getShaderFlagsTexture(bool normamap_present, - bool tileable_vertical, bool tileable_horizontal)=0; + virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0; }; IWritableTextureSource* createTextureSource(IrrlichtDevice *device); @@ -218,9 +216,7 @@ struct TileSpec alpha == other.alpha && material_type == other.material_type && material_flags == other.material_flags && - rotation == other.rotation && - (material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL) && - (material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL) + rotation == other.rotation ); } @@ -254,12 +250,6 @@ struct TileSpec } material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) ? true : false; - if (!(material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)) { - material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; - } - if (!(material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) { - material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; - } } void applyMaterialOptionsWithShaders(video::SMaterial &material) const |