luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 08:35:20 +02:00
Code Activity

Fix relief mapping issues

Browse Source
This commit is contained in:
RealBadAngel
2015-07-16 15:36:48 +02:00
parent b30e8d8ec6
commit 655fc6010f
15 changed files with 206 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game.cpp
View File

@@ -878,11 +878,11 @@ public:
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
services->setPixelShaderConstant("baseTexture" , (irr::f32 *)&layer0, 1);
services->setPixelShaderConstant("normalTexture" , (irr::f32 *)&layer1, 1);
services->setPixelShaderConstant("useNormalmap" , (irr::f32 *)&layer2, 1);
services->setPixelShaderConstant("textureFlags" , (irr::f32 *)&layer2, 1);
#else
services->setPixelShaderConstant("baseTexture" , (irr::s32 *)&layer0, 1);
services->setPixelShaderConstant("normalTexture" , (irr::s32 *)&layer1, 1);
services->setPixelShaderConstant("useNormalmap" , (irr::s32 *)&layer2, 1);
services->setPixelShaderConstant("textureFlags" , (irr::s32 *)&layer2, 1);
#endif
}
};
@@ -4352,13 +4352,9 @@ void the_game(bool *kill,
}
} catch (SerializationError &e) {
error_message = strgettext("A serialization error occurred:")
+ "\n" + e.what();
if (!simple_singleplayer_mode) {
error_message += "\n\n"
+ strgettext("The server is probably running a different version of")
+ " " PROJECT_NAME_C ".";
}
error_message = std::string("A serialization error occurred:\n")
+ e.what() + "\n\nThe server is probably "
" running a different version of " PROJECT_NAME_C ".";
errorstream << error_message << std::endl;
} catch (ServerError &e) {
error_message = e.what();