diff options
| author | sfan5 <sfan5@live.de> | 2020-05-17 01:03:33 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-03-09 21:53:17 +0100 |
| commit | 3579dd21867598ff30867ebd68b690c85ba14f9b (patch) | |
| tree | 7df73434ea692d49feca32017a4f6e4f19d347aa /src/client | |
| parent | 13b50f55a45b8e68a787e7793d5e6e612d95a5a0 (diff) | |
| download | minetest-3579dd21867598ff30867ebd68b690c85ba14f9b.tar.gz minetest-3579dd21867598ff30867ebd68b690c85ba14f9b.tar.bz2 minetest-3579dd21867598ff30867ebd68b690c85ba14f9b.zip | |
Restore Irrlicht 1.9 support
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/render/interlaced.cpp | 4 | ||||
| -rw-r--r-- | src/client/renderingengine.cpp | 2 | ||||
| -rw-r--r-- | src/client/sky.cpp | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/client/render/interlaced.cpp b/src/client/render/interlaced.cpp index ce8e92f21..3f79a8eb5 100644 --- a/src/client/render/interlaced.cpp +++ b/src/client/render/interlaced.cpp @@ -35,7 +35,11 @@ void RenderingCoreInterlaced::initMaterial() IShaderSource *s = client->getShaderSource(); mat.UseMipMaps = false; mat.ZBuffer = false; +#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 + mat.ZWriteEnable = video::EZW_OFF; +#else mat.ZWriteEnable = false; +#endif u32 shader = s->getShader("3d_interlaced_merge", TILE_MATERIAL_BASIC); mat.MaterialType = s->getShaderInfo(shader).material; for (int k = 0; k < 3; ++k) { diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp index 99ff8c1ee..055a555ab 100644 --- a/src/client/renderingengine.cpp +++ b/src/client/renderingengine.cpp @@ -325,9 +325,11 @@ static bool getWindowHandle(irr::video::IVideoDriver *driver, HWND &hWnd) const video::SExposedVideoData exposedData = driver->getExposedVideoData(); switch (driver->getDriverType()) { +#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 case video::EDT_DIRECT3D8: hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd); break; +#endif case video::EDT_DIRECT3D9: hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd); break; diff --git a/src/client/sky.cpp b/src/client/sky.cpp index 3a40321dd..caf695e7a 100644 --- a/src/client/sky.cpp +++ b/src/client/sky.cpp @@ -39,12 +39,13 @@ static video::SMaterial baseMaterial() { video::SMaterial mat; mat.Lighting = false; -#if ENABLE_GLES +#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8 mat.ZBuffer = video::ECFN_DISABLED; + mat.ZWriteEnable = video::EZW_OFF; #else + mat.ZWriteEnable = false; mat.ZBuffer = video::ECFN_NEVER; #endif - mat.ZWriteEnable = false; mat.AntiAliasing = 0; mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; |