oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Code modernization: subfolders (#6283)

Browse source 
* Code modernization: subfolders

Modernize various code on subfolders client, network, script, threading, unittests, util

* empty function
* default constructor/destructor
* for range-based loops
* use emplace_back instead of push_back
* C++ STL header style
* Make connection.cpp readable in a pointed place + typo
This commit is contained in:
Loïc Blot 2017-08-19 22:23:47 +02:00 • committed by GitHub
parent 7528986e44
commit 88b436e6a9
49 changed files with 398 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/client/tile.cpp
View file

@ -484,43 +484,35 @@ u32 TextureSource::getTextureId(const std::string &name)
/*
Get texture
*/
if (std::this_thread::get_id() == m_main_thread)
{
if (std::this_thread::get_id() == m_main_thread) {
return generateTexture(name);
}
else
{
infostream<<"getTextureId(): Queued: name=\""<<name<<"\""<<std::endl;
// We're gonna ask the result to be put into here
static ResultQueue<std::string, u32, u8, u8> result_queue;
// Throw a request in
m_get_texture_queue.add(name, 0, 0, &result_queue);
infostream<<"getTextureId(): Queued: name=\""<<name<<"\""<<std::endl;
/*infostream<<"Waiting for texture from main thread, name=\""
<<name<<"\""<<std::endl;*/
// We're gonna ask the result to be put into here
static ResultQueue<std::string, u32, u8, u8> result_queue;
try
{
while(true) {
// Wait result for a second
GetResult<std::string, u32, u8, u8>
result = result_queue.pop_front(1000);
// Throw a request in
m_get_texture_queue.add(name, 0, 0, &result_queue);
if (result.key == name) {
return result.item;
}
try {
while(true) {
// Wait result for a second
GetResult<std::string, u32, u8, u8>
result = result_queue.pop_front(1000);
if (result.key == name) {
return result.item;
}
}
catch(ItemNotFoundException &e)
{
errorstream<<"Waiting for texture " << name << " timed out."<<std::endl;
return 0;
}
} catch(ItemNotFoundException &e) {
errorstream << "Waiting for texture " << name << " timed out." << std::endl;
return 0;
}
infostream<<"getTextureId(): Failed"<<std::endl;
infostream << "getTextureId(): Failed" << std::endl;
return 0;
}
@ -673,7 +665,7 @@ Palette* TextureSource::getPalette(const std::string &name)
// Only the main thread may load images
sanity_check(std::this_thread::get_id() == m_main_thread);
if (name == "")
if (name.empty())
return NULL;
auto it = m_palettes.find(name);