diff --git a/binaries/data/mods/public/hwdetect/hwdetect.js b/binaries/data/mods/public/hwdetect/hwdetect.js index b9a24cad5a..e80178957f 100644 --- a/binaries/data/mods/public/hwdetect/hwdetect.js +++ b/binaries/data/mods/public/hwdetect/hwdetect.js @@ -172,7 +172,9 @@ function RunDetection(settings) var disable_s3tc = undefined; var disable_shadows = undefined; var disable_shadowpcf = undefined; + var disable_allwater = undefined; var disable_fancywater = undefined; + var disable_fbowater = undefined; var override_renderpath = undefined; // TODO: add some mechanism for setting config values @@ -247,7 +249,9 @@ function RunDetection(settings) (os_win && IsWorseThanIntelWindows(GL_RENDERER, "Intel(R) Graphics Media Accelerator HD")) ) { + disable_allwater = false; disable_fancywater = true; + //disable_fbowater = true; disable_shadowpcf = true; } @@ -264,7 +268,7 @@ function RunDetection(settings) if (GL_RENDERER.match(/^GeForce FX /)) { override_renderpath = "fixed"; - disable_fancywater = true; + disable_allwater = true; } // http://trac.wildfiregames.com/ticket/964 @@ -283,7 +287,9 @@ function RunDetection(settings) "disable_s3tc": disable_s3tc, "disable_shadows": disable_shadows, "disable_shadowpcf": disable_shadowpcf, + "disable_allwater": disable_allwater, "disable_fancywater": disable_fancywater, + "disable_fbowater": disable_fbowater, "override_renderpath": override_renderpath, }; } @@ -317,8 +323,14 @@ global.RunHardwareDetection = function(settings) if (output.disable_shadowpcf !== undefined) Engine.SetDisableShadowPCF(output.disable_shadowpcf); + if (output.disable_allwater !== undefined) + Engine.SetDisableFancyWater(output.disable_allwater); + if (output.disable_fancywater !== undefined) Engine.SetDisableFancyWater(output.disable_fancywater); + + if (output.disable_fbowater !== undefined) + Engine.SetDisableFancyWater(output.disable_fbowater); if (output.override_renderpath !== undefined) Engine.SetRenderPath(output.override_renderpath); diff --git a/binaries/data/mods/public/hwdetect/test.js b/binaries/data/mods/public/hwdetect/test.js index e222358d9a..a3967e03b8 100644 --- a/binaries/data/mods/public/hwdetect/test.js +++ b/binaries/data/mods/public/hwdetect/test.js @@ -29,7 +29,7 @@ for each (var settings in hwdetectTestData) var os = (settings.os_linux ? "linux" : settings.os_macosx ? "macosx" : settings.os_win ? "win" : "???"); var disabled = []; - for each (var d in ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_fancywater", "override_renderpath"]) + for each (var d in ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fbowater", "disable_fancywater", "override_renderpath"]) if (output[d] !== undefined) disabled.push(d+"="+output[d]) diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 01.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 01.xml index 31ad819417..ffcad1f61a 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 01.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 01.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eec3903be5293995ae82e3faf6c452610a3e39232a29f51a4d5f3f607586e916 -size 743852 +oid sha256:61ada6a6dec6bb9f17deaf5e02c03d69aa0eea12ed7a246f49ab37e0dc35de44 +size 743828 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 02.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 02.xml index 825fb88c5d..4573ee3758 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 02.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 02.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e1e03c598d4d61f6d1997ed0e0befd266015e2be9aa2e818feb0e49545eeee -size 767277 +oid sha256:22466c90cc7f4d90321bb98bb2b8e6d28e412aba95f8039f88253c00812ca3fc +size 767253 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 03.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 03.xml index 43b32311c1..23f5057b50 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 03.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 03.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5232155e9c941347e11f652963994d7b42f4f22f4b15ee1d954bc31a57fc8b40 -size 806576 +oid sha256:d253f1a093d173597a4e102fc9308fc5527d69a510276769b9125d4e6bffa815 +size 806552 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 04.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 04.xml index b3df2645be..bcba9fb4db 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 04.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 04.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:839592c50ef26efb3d25ab573444aedba7dc3e2fa8d3e31d94eecfd48344814f -size 1201529 +oid sha256:e4c38264f62fb325fe70a2ea32b564d27f34272964297278d4e27ef9dba3ab8b +size 1201505 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml index 0b4d511928..8ee0b19c0d 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04f461ad49a9ace142f8ab237a7695a16b42370576d87dd4f1c04cb11bb759f2 -size 745553 +oid sha256:207191eff649c16cd4d3a63cfd3406d87eb77992873509fd86322edee18948ab +size 745529 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 06.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 06.xml index 940b7efe61..88c8ed91e5 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 06.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 06.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4894d90733ec5fc1b1daa6d7c67f036684163e5c59c2ace7c2074699ebfcd4b -size 356305 +oid sha256:40b6dedacb553bc1c103d4c554c82c254568f16f78f577a01702f7b31fc87e8a +size 356289 diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml index bd5f5aeee4..601d1423f0 100644 --- a/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml +++ b/binaries/data/mods/public/maps/scenarios/Acropolis 07.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35c0877999773a21152324b4fe63f26baa6e58db0e123fde188cb9ac909f5d84 -size 722495 +oid sha256:007afe49b289bb3af925cf610ccd1436b28b0572f82ad5e2501b520c1d897bed +size 722511 diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia 02.xml b/binaries/data/mods/public/maps/scenarios/Arcadia 02.xml index e8defe899d..71f812121b 100644 --- a/binaries/data/mods/public/maps/scenarios/Arcadia 02.xml +++ b/binaries/data/mods/public/maps/scenarios/Arcadia 02.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7fff57697a5834e568ee7e1de6d22247cd355d5901ba2343769fbfcb92ed0c3 -size 730524 +oid sha256:356eb0603f551e370822afb1e71a95e7bbc2be74af69606c73fd6c3ed78c227d +size 730530 diff --git a/binaries/data/mods/public/maps/scenarios/Boeotian Plains.xml b/binaries/data/mods/public/maps/scenarios/Boeotian Plains.xml index dc2a22c104..1de7905713 100644 --- a/binaries/data/mods/public/maps/scenarios/Boeotian Plains.xml +++ b/binaries/data/mods/public/maps/scenarios/Boeotian Plains.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe53d4716aedcea4fe2561fc014f026483452aa9b2ee50484af9db5aa07c6e2c -size 1427280 +oid sha256:df46869af83621b6edb2246bd9ec3ca5f40c9a54fd2ec018a7d8d5e63a923c9a +size 1427287 diff --git a/binaries/data/mods/public/maps/scenarios/Death Canyon 01.xml b/binaries/data/mods/public/maps/scenarios/Death Canyon 01.xml index 01a7e9a955..84307392ee 100644 --- a/binaries/data/mods/public/maps/scenarios/Death Canyon 01.xml +++ b/binaries/data/mods/public/maps/scenarios/Death Canyon 01.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a0856e9831c49ff06377e1095d04bb339b95d3bd4b6baa36998ef3efb340510 -size 586599 +oid sha256:cd21f6966f7b053297aa95f6a354af874c2a3631bb01ef435aa307fee071e8d0 +size 586601 diff --git a/binaries/data/mods/public/maps/scenarios/Death Canyon 02.xml b/binaries/data/mods/public/maps/scenarios/Death Canyon 02.xml index 641afd2876..f6706df77d 100644 --- a/binaries/data/mods/public/maps/scenarios/Death Canyon 02.xml +++ b/binaries/data/mods/public/maps/scenarios/Death Canyon 02.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcc10de4440a48bdec82b9681d70de5ae2bb5a9ff889319f4f33e4b590f70049 -size 585781 +oid sha256:ecef79876cc7f57f9284974535420057d7660433af02e04159c1c217a3d4ee15 +size 585783 diff --git a/binaries/data/mods/public/maps/scenarios/Death Canyon 03.xml b/binaries/data/mods/public/maps/scenarios/Death Canyon 03.xml index 27c7e96780..ad068d2a4a 100644 --- a/binaries/data/mods/public/maps/scenarios/Death Canyon 03.xml +++ b/binaries/data/mods/public/maps/scenarios/Death Canyon 03.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a919756525a8632353a5e85ce89ea54b05d21b38c047552e39ce3af0e54f25a0 -size 564850 +oid sha256:3a172a99d48d90d0cba7be80f2edd52476822f5ba21aca314151578ec924079b +size 564855 diff --git a/binaries/data/mods/public/maps/scenarios/Isthmus.xml b/binaries/data/mods/public/maps/scenarios/Isthmus.xml index 6d6f4475b0..3b60c175df 100644 --- a/binaries/data/mods/public/maps/scenarios/Isthmus.xml +++ b/binaries/data/mods/public/maps/scenarios/Isthmus.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b478d2586c4f4ac95ae84070f2eff9b15ffb9f69a8e38c108b9f99ffe953b58e -size 152322 +oid sha256:3069c7446afd6f9e5b3b98491829678e9259627c73eda9b6ae395a6084d89768 +size 152329 diff --git a/binaries/data/mods/public/maps/scenarios/Laconia 01.xml b/binaries/data/mods/public/maps/scenarios/Laconia 01.xml index 382a167215..01d0eb943a 100644 --- a/binaries/data/mods/public/maps/scenarios/Laconia 01.xml +++ b/binaries/data/mods/public/maps/scenarios/Laconia 01.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4889908c201137b89119911960245f14b63c764b0bf309d09fa5a5afc1f0a93 -size 196719 +oid sha256:0fcbd1ebb92ca31896bc7ee465a583fce9244e42c3849f085364def9032a3982 +size 196733 diff --git a/binaries/data/mods/public/shaders/glsl/water_high.fs b/binaries/data/mods/public/shaders/glsl/water_high.fs index fca07161cd..eb6bd6db14 100644 --- a/binaries/data/mods/public/shaders/glsl/water_high.fs +++ b/binaries/data/mods/public/shaders/glsl/water_high.fs @@ -266,9 +266,6 @@ void main() #else colour = mix(texture2D(refractionMap, (0.5*gl_TexCoord[2].xy) / gl_TexCoord[2].w + 0.5).rgb ,colour, clamp(perceivedDepth,0.0,1.0)); #endif - #else - // I'm not even sure what this does. - //colour = mix( texture2D(refractionMap, (0.5*gl_TexCoord[2].xy) / gl_TexCoord[2].w + 0.5).rgb ,colour, clamp(perceivedDepth,0.0,1.0)); #endif gl_FragColor.rgb = get_fog(colour) * losMod; diff --git a/source/ps/GameSetup/HWDetect.cpp b/source/ps/GameSetup/HWDetect.cpp index f479ba9101..a9a2466508 100644 --- a/source/ps/GameSetup/HWDetect.cpp +++ b/source/ps/GameSetup/HWDetect.cpp @@ -121,7 +121,7 @@ void SetDisableShadowPCF(void* UNUSED(cbdata), bool disabled) g_ShadowPCF = !disabled; } -void SetDisableFancyWater(void* UNUSED(cbdata), bool disabled) +void SetDisableAllWater(void* UNUSED(cbdata), bool disabled) { if (!IsOverridden("waternormals")) g_WaterNormal = !disabled; @@ -138,6 +138,24 @@ void SetDisableFancyWater(void* UNUSED(cbdata), bool disabled) if (!IsOverridden("watershadows")) g_WaterShadows = !disabled; } +void SetDisableFancyWater(void* UNUSED(cbdata), bool disabled) +{ + if (!IsOverridden("waterrealdepth")) + g_WaterRealDepth = !disabled; + if (!IsOverridden("waterfoam")) + g_WaterFoam = !disabled; + if (!IsOverridden("watercoastalwaves")) + g_WaterCoastalWaves = !disabled; + if (!IsOverridden("watershadows")) + g_WaterShadows = !disabled; +} +void SetDisableFBOWater(void* UNUSED(cbdata), bool disabled) +{ + if (!IsOverridden("waterfoam")) + g_WaterFoam = !disabled; + if (!IsOverridden("watercoastalwaves")) + g_WaterCoastalWaves = !disabled; +} void SetRenderPath(void* UNUSED(cbdata), std::string renderpath) { @@ -154,7 +172,9 @@ void RunHardwareDetection() scriptInterface.RegisterFunction("SetDisableS3TC"); scriptInterface.RegisterFunction("SetDisableShadows"); scriptInterface.RegisterFunction("SetDisableShadowPCF"); + scriptInterface.RegisterFunction("SetDisableAllWater"); scriptInterface.RegisterFunction("SetDisableFancyWater"); + scriptInterface.RegisterFunction("SetDisableFBOWater"); scriptInterface.RegisterFunction("SetRenderPath"); // Load the detection script: