mirror of
https://github.com/minetest/minetest.git
synced 2024-12-17 19:55:41 +01:00
If available, use local textures instead of those sent by server
This commit is contained in:
parent
b58dc083a9
commit
8bd178c2e5
18
src/tile.cpp
18
src/tile.cpp
@ -183,18 +183,28 @@ class SourceImageCache
|
||||
{
|
||||
public:
|
||||
void insert(const std::string &name, video::IImage *img,
|
||||
bool do_overwrite)
|
||||
bool prefer_local, video::IVideoDriver *driver)
|
||||
{
|
||||
assert(img);
|
||||
// Remove old image
|
||||
core::map<std::string, video::IImage*>::Node *n;
|
||||
n = m_images.find(name);
|
||||
if(n){
|
||||
if(!do_overwrite)
|
||||
return;
|
||||
video::IImage *oldimg = n->getValue();
|
||||
if(oldimg)
|
||||
oldimg->drop();
|
||||
}
|
||||
// Try to use local texture instead if asked to
|
||||
if(prefer_local){
|
||||
std::string path = getTexturePath(name.c_str());
|
||||
if(path != ""){
|
||||
video::IImage *img2 = driver->createImageFromFile(path.c_str());
|
||||
if(img2){
|
||||
m_images[name] = img2;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
img->grab();
|
||||
m_images[name] = img;
|
||||
}
|
||||
@ -725,7 +735,7 @@ void TextureSource::insertSourceImage(const std::string &name, video::IImage *im
|
||||
|
||||
assert(get_current_thread_id() == m_main_thread);
|
||||
|
||||
m_sourcecache.insert(name, img, false);
|
||||
m_sourcecache.insert(name, img, true, m_device->getVideoDriver());
|
||||
}
|
||||
|
||||
void TextureSource::rebuildImagesAndTextures()
|
||||
|
Loading…
Reference in New Issue
Block a user