aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2015-08-18 23:59:44 +0200
committerest31 <MTest31@outlook.com>2015-08-20 02:41:40 +0200
commit8b8d17b22b5853c7d32bdb8b369f4523f6c57b95 (patch)
treeaa3b48fcfcfea132fb857360e88f4e96f7ac5510 /src/client
parent5009d31a333a8e1fff8c97bed69873164c72c600 (diff)
downloadminetest-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')
-rw-r--r--src/client/tile.cpp16
-rw-r--r--src/client/tile.h16
2 files changed, 7 insertions, 25 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 79ed4a072..a28b40c65 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -385,8 +385,7 @@ public:
video::ITexture* getNormalTexture(const std::string &name);
video::SColor getTextureAverageColor(const std::string &name);
- video::ITexture *getShaderFlagsTexture(
- bool normamap_present, bool tileable_vertical, bool tileable_horizontal);
+ video::ITexture *getShaderFlagsTexture(bool normamap_present);
private:
@@ -2054,14 +2053,11 @@ video::SColor TextureSource::getTextureAverageColor(const std::string &name)
}
-video::ITexture *TextureSource::getShaderFlagsTexture(
- bool normalmap_present, bool tileable_vertical, bool tileable_horizontal)
+video::ITexture *TextureSource::getShaderFlagsTexture(bool normalmap_present)
{
std::string tname = "__shaderFlagsTexture";
tname += normalmap_present ? "1" : "0";
- tname += tileable_horizontal ? "1" : "0";
- tname += tileable_vertical ? "1" : "0";
-
+
if (isKnownSourceImage(tname)) {
return getTexture(tname);
} else {
@@ -2069,11 +2065,7 @@ video::ITexture *TextureSource::getShaderFlagsTexture(
video::IImage *flags_image = driver->createImage(
video::ECF_A8R8G8B8, core::dimension2d<u32>(1, 1));
sanity_check(flags_image != NULL);
- video::SColor c(
- 255,
- normalmap_present ? 255 : 0,
- tileable_horizontal ? 255 : 0,
- tileable_vertical ? 255 : 0);
+ video::SColor c(255, normalmap_present ? 255 : 0, 0, 0);
flags_image->setPixel(0, 0, c);
insertSourceImage(tname, flags_image);
flags_image->drop();
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 &params)=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