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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/client/tile.cpp | 16 |
1 files changed, 4 insertions, 12 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(); |