oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Remove Irrlicht versioning

Browse source
This commit is contained in:
sfan5 2024-03-27 12:00:39 +01:00
parent b487341c32
commit d53ef90a73
12 changed files with 2 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/clientlauncher.cpp
View file

@ -164,11 +164,7 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
while (m_rendering_engine->run() && !*kill &&
!g_gamecallback->shutdown_requested) {
// Set the window caption
#if IRRLICHT_VERSION_MT_REVISION >= 15
auto driver_name = m_rendering_engine->getVideoDriver()->getName();
#else
auto driver_name = wide_to_utf8(m_rendering_engine->getVideoDriver()->getName());
#endif
std::string caption = std::string(PROJECT_NAME_C) +
" " + g_version_hash +
" [" + gettext("Main Menu") + "]" +

4
src/client/game.cpp
View file

@ -1478,11 +1478,7 @@ bool Game::createClient(const GameStartData &start_data)
/* Set window caption
*/
#if IRRLICHT_VERSION_MT_REVISION >= 15
auto driver_name = driver->getName();
#else
auto driver_name = wide_to_utf8(driver->getName());
#endif
std::string str = std::string(PROJECT_NAME_C) +
" " + g_version_hash + " [";
str += simple_singleplayer_mode ? gettext("Singleplayer")

4
src/client/shader.cpp
View file

@ -368,7 +368,6 @@ ShaderSource::~ShaderSource()
{
MutexAutoLock lock(m_shaderinfo_cache_mutex);
#if IRRLICHT_VERSION_MT_REVISION >= 15
// Delete materials
video::IGPUProgrammingServices *gpu = RenderingEngine::get_video_driver()->
getGPUProgrammingServices();
@ -377,7 +376,6 @@ ShaderSource::~ShaderSource()
gpu->deleteShaderMaterial(i.material);
}
m_shaderinfo_cache.clear();
#endif
}
u32 ShaderSource::getShader(const std::string &name,
@ -501,7 +499,6 @@ void ShaderSource::rebuildShaders()
{
MutexAutoLock lock(m_shaderinfo_cache_mutex);
#if IRRLICHT_VERSION_MT_REVISION >= 15
// Delete materials
video::IGPUProgrammingServices *gpu = RenderingEngine::get_video_driver()->
getGPUProgrammingServices();
@ -511,7 +508,6 @@ void ShaderSource::rebuildShaders()
i.material = video::EMT_SOLID; // invalidate
}
}
#endif
// Recreate shaders
for (ShaderInfo &i : m_shaderinfo_cache) {

5
src/client/shadows/dynamicshadowsrender.cpp
View file

@ -192,12 +192,7 @@ void ShadowRenderer::addNodeToShadowList(
{
m_shadow_node_array.emplace_back(node, shadowMode);
// node should never be ClientMap
#if IRRLICHT_VERSION_MT_REVISION >= 15
assert(!node->getName().has_value() || *node->getName() != "ClientMap");
#else
// TODO: Remove this as soon as we require 1.9.0mt15
assert(strcmp(node->getName(), "ClientMap") != 0);
#endif
node->forEachMaterial([this] (auto &mat) {
mat.setTexture(TEXTURE_LAYER_SHADOW, shadowMapTextureFinal);
});

3
src/main.cpp
View file

@ -425,9 +425,6 @@ static void print_version(std::ostream &os)
{
os << PROJECT_NAME_C " " << g_version_hash
<< " (" << porting::getPlatformName() << ")" << std::endl;
#ifndef SERVER
os << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
#endif
#if USE_LUAJIT
os << "Using " << LUAJIT_VERSION << std::endl;
#else

5
src/script/lua_api/l_mainmenu.cpp
View file

@ -996,12 +996,7 @@ int ModApiMainMenu::l_get_active_driver(lua_State *L)
int ModApiMainMenu::l_get_active_renderer(lua_State *L)
{
#if IRRLICHT_VERSION_MT_REVISION >= 15
lua_pushstring(L, RenderingEngine::get_video_driver()->getName());
#else
auto tmp = wide_to_utf8(RenderingEngine::get_video_driver()->getName());
lua_pushstring(L, tmp.c_str());
#endif
return 1;
}