From 2034158c27738213ed80e7bd0f27a090a1a8d111 Mon Sep 17 00:00:00 2001 From: "adnan.mujkic" Date: Sat, 31 Oct 2026 23:05:43 +0100 Subject: [PATCH] Changes to weather system, normalize weather --- .../WeatherClear/Curve_FogIntensity.uasset | 4 ++-- .../Curve_MoonlightIntensity.uasset | 4 ++-- .../Curve_SkyDomeGradient_Middle.uasset | 4 ++-- .../Curve_SkyDomeGradient_TopBottom.uasset | 4 ++-- .../WeatherClear/Curve_SkyDomeIntensity.uasset | 4 ++-- .../WeatherClear/Curve_SkylightIntensity.uasset | 4 ++-- .../WeatherClear/Curve_SunlightIntensity.uasset | 4 ++-- .../WeatherRain/Curve_FogIntensity.uasset | 4 ++-- .../Curve_SkyDomeGradient_TopBottom.uasset | 4 ++-- .../WeatherRain/Curve_SkyDomeIntensity.uasset | 4 ++-- .../WeatherRain/Curve_SkyLight_Color.uasset | 4 ++-- .../WeatherRain/Curve_SkylightIntensity.uasset | 4 ++-- .../WeatherRain/Curve_SunlightIntensity.uasset | 4 ++-- Content/GameData/Weather/DA_WeatherClear.uasset | 4 ++-- Content/GameData/Weather/DA_WeatherRain.uasset | 4 ++-- Content/Materials/M_MasterMat.uasset | 4 ++-- Content/Materials/M_MasterMatMasked.uasset | 4 ++-- Content/Materials/M_RocksBase.uasset | 4 ++-- Content/Materials/M_RocksBaseNoFade.uasset | 4 ++-- .../MP_MaterialOptions.uasset | 4 ++-- .../Materials/Sky/M_Pixel_SkyMaterial.uasset | 4 ++-- .../Surfaces/Rock/M_PixelRockBase.uasset | 4 ++-- Content/Materials/VFX/Clouds/Clouds.uasset | 4 ++-- .../Materials/VFX/Clouds/M_TestCloudsNew.uasset | 4 ++-- .../VFX/Clouds/M_TestCloudsNew_Inst.uasset | 4 ++-- .../VFX/Decals/MI_WetSurfaceDecal_Puddle.uasset | 3 +++ .../VFX/Decals/M_WetSurfaceDecal.uasset | 4 ++-- .../VFX/Water/UnrealWater/M_SimpleWater.uasset | 4 ++-- .../Vegetation/BASE/M_LandscapeMain.uasset | 4 ++-- .../Vegetation/BASE/M_TreeTrunkBase.uasset | 4 ++-- .../Vegetation/BASE/M_VegetationBase.uasset | 4 ++-- .../Vegetation/M_VegetationHead.uasset | 4 ++-- Content/Materials/Wood/M_LeavesTexture.uasset | 4 ++-- .../Materials/Wood/Trees/M_TreeBarkBase.uasset | 4 ++-- Content/Scripts/BP_TimeOfDay.uasset | 4 ++-- Content/ShowOff/BenchmarkActor.uasset | 4 ++-- Content/VFX/NI_Water_Dripping.uasset | 4 ++-- .../0/S9/GI1IG0EPK16PS4L5J55KH4.uasset | 2 +- .../1/NH/S1Z5WGF4VC72FE72IO73C1.uasset | 4 ++-- .../2/7W/JTWCLY6V3M8CY9DKMFWIA9.uasset | 3 +++ .../5/YR/TRY5X6R9FXTH34UPHS6ICX.uasset | 3 +++ .../6/FJ/XSLZCCYW6P0XOLD701W2BA.uasset | 4 ++-- .../6/W5/9T5G20W8396YFFMS4ZIXVB.uasset | 2 +- .../8/C2/FKOBRO47F7FU8UI5FADCG6.uasset | 2 +- .../B/6I/9T4YZVK7MJTAJPCQOND6OV.uasset | 3 +++ .../E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset | 4 ++-- .../ProjectEleri/Data/WeatherPresetDataAsset.h | 5 +++++ .../ProjectEleri/Private/TimeOfDayManager.cpp | 17 ++++++++++++++++- Source/ProjectEleri/Public/TimeOfDayManager.h | 9 ++++++--- 49 files changed, 120 insertions(+), 85 deletions(-) create mode 100644 Content/Materials/VFX/Decals/MI_WetSurfaceDecal_Puddle.uasset create mode 100644 Content/__ExternalActors__/Maps/Persistent_GameWorld/2/7W/JTWCLY6V3M8CY9DKMFWIA9.uasset create mode 100644 Content/__ExternalActors__/Maps/Persistent_GameWorld/5/YR/TRY5X6R9FXTH34UPHS6ICX.uasset create mode 100644 Content/__ExternalActors__/Maps/Persistent_GameWorld/B/6I/9T4YZVK7MJTAJPCQOND6OV.uasset diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_FogIntensity.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_FogIntensity.uasset index dc1da58d..6a9219e8 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_FogIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_FogIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05fafca8eb6b0ddf799dc895e5def0bed4fe50c569f1128a6e1852b72c079787 -size 4140 +oid sha256:8f0afa13a16ca0aea5a061ed9ee4f3ff24cc95a2da93e7f486f1ec938165b838 +size 3822 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_MoonlightIntensity.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_MoonlightIntensity.uasset index 550bfed4..1f90aeae 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_MoonlightIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_MoonlightIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:061c73042cd7ac4fb53a2bbb96ebc7007340402b37df791214a4bee5cdfff0f4 -size 4197 +oid sha256:f92f16bf1fc3373eeb9390827bbdc15d0040a1a460b376dbdb65c27caa0dd810 +size 3980 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_Middle.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_Middle.uasset index 6ef32a1a..8eafa75b 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_Middle.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_Middle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78eadb29c1a8b326b9f4d26070e6ba5da18c6966640618a23e9535402698d06f -size 4588 +oid sha256:fa462ce35911ae5148b09930c62523ee10c6ccaf9eb6e4d4d3c226e28566f190 +size 4394 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_TopBottom.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_TopBottom.uasset index eb66c283..6195e4ec 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_TopBottom.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeGradient_TopBottom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ff04e995b62e9c893ae798e6601da9947142febef8a3cf105202a50021827e7 -size 4275 +oid sha256:4cddcb5039a9829c74d0866861078ba75a3511fee36a9b054494d510f24928f1 +size 4085 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeIntensity.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeIntensity.uasset index 9e06ed50..6f627217 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkyDomeIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2230fa8ec93ef13b38f2a7101c2bc60b4c03fcd404648ba503dad4eb26d831c4 -size 4124 +oid sha256:8958f6bb5923c8dcb9d2e8a5e18446b9565a6c1cc8d3e8bc975a449f12506e2b +size 3930 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkylightIntensity.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkylightIntensity.uasset index 1c89ab99..4ab36363 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_SkylightIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_SkylightIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89cd51c7d37111019cefe15a46c2e754a35e7b9beb2efc3ccaf0f24d18765838 -size 3996 +oid sha256:a6b036e4368d65dadde27f66617770fa9d2aedf2c896355bc052a6ab480f7d73 +size 3948 diff --git a/Content/GameData/Curves/Weather/WeatherClear/Curve_SunlightIntensity.uasset b/Content/GameData/Curves/Weather/WeatherClear/Curve_SunlightIntensity.uasset index 545a5458..a9d6a6c9 100644 --- a/Content/GameData/Curves/Weather/WeatherClear/Curve_SunlightIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherClear/Curve_SunlightIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89bc4bea81224b47fca1834462db5582daba910852bae592af55d3d99a36bde0 -size 4210 +oid sha256:20a1dc75556f0dcf5be76983b1e956f78845434fe81a866a46b29f7ef48dd780 +size 3989 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_FogIntensity.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_FogIntensity.uasset index 18ae94e1..1ebf52d9 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_FogIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_FogIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5984b867668fd5191d86ef182ce67801473789064ae0cd786f02299476203c13 -size 3916 +oid sha256:76ec9e36c8c2afdf6e6c3a966d9bd1b9ded5d7ad3ba9f016680b3f29d4218efe +size 3948 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeGradient_TopBottom.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeGradient_TopBottom.uasset index c6aabf7f..a9a1370c 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeGradient_TopBottom.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeGradient_TopBottom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88554abd09378b1762e150c51c8890bc4281b53d386d8811cb9f56cd4df40cd7 -size 4354 +oid sha256:264bdfdbecd3a083aac90474b2af4ef04de1ca2bed45c8bafc2fa7a0e89746d3 +size 4164 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeIntensity.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeIntensity.uasset index dc601ad1..3268c360 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyDomeIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e5b0c1c779fc5de75eb5e8001f560c2816f318e2991b3124b100bbf35b838a7 -size 4172 +oid sha256:f346db67df207a7faa30840d5bd6f9446f6d9560359d7e77f24fcd06d922a630 +size 3982 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyLight_Color.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyLight_Color.uasset index 3861d9c4..4a72ccfa 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyLight_Color.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkyLight_Color.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8b643bd596fa1607f8abb88c59a34157b6d586c127bfd2c8af9d038b3b209f3 -size 4299 +oid sha256:a94791aeae23a3ad83f64c4002dd153b433905a25ce8b7b63ac0c3e141e05e27 +size 4109 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkylightIntensity.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkylightIntensity.uasset index 7b7f30da..6acf7abb 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_SkylightIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_SkylightIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b456fe5057758e433329fb7b4374e30ee0227cd297e7efb42929beeae90098d -size 4136 +oid sha256:51a81e63f8e1efcc437130188c5bb139ab2bcf6a02dd9a62cc71761deab57802 +size 3933 diff --git a/Content/GameData/Curves/Weather/WeatherRain/Curve_SunlightIntensity.uasset b/Content/GameData/Curves/Weather/WeatherRain/Curve_SunlightIntensity.uasset index 934b90de..4fc9c100 100644 --- a/Content/GameData/Curves/Weather/WeatherRain/Curve_SunlightIntensity.uasset +++ b/Content/GameData/Curves/Weather/WeatherRain/Curve_SunlightIntensity.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2019beb35487aa60168e5de168986f3abb5aab9dc0118ff6b489afc5c6cd8c3 -size 4177 +oid sha256:e33fc7ba61ea15c11ffc706e4a4ef74172d8a8daadb9e91358b6ae2c04666425 +size 3960 diff --git a/Content/GameData/Weather/DA_WeatherClear.uasset b/Content/GameData/Weather/DA_WeatherClear.uasset index 62284b10..e83e379b 100644 --- a/Content/GameData/Weather/DA_WeatherClear.uasset +++ b/Content/GameData/Weather/DA_WeatherClear.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b94740d8f9b41edaf4467100c7e9af8a6d082f6eb1bd2c2d3aa75094e40f3208 -size 4521 +oid sha256:e823fd1a20ef18394f51fadd596038b7dea33fa643550cf470ed7adc1a7a9b0d +size 6846 diff --git a/Content/GameData/Weather/DA_WeatherRain.uasset b/Content/GameData/Weather/DA_WeatherRain.uasset index b408218e..73789e7f 100644 --- a/Content/GameData/Weather/DA_WeatherRain.uasset +++ b/Content/GameData/Weather/DA_WeatherRain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a80d39461ef62f1b3485b95d4725fda41090d3bf14c8d124701987a847b2c715 -size 4620 +oid sha256:582eb7aa9deb5a2246334ad3490a7111422a81b1afbc02c80c4ebc2474a34247 +size 6658 diff --git a/Content/Materials/M_MasterMat.uasset b/Content/Materials/M_MasterMat.uasset index d2586a77..1418115e 100644 --- a/Content/Materials/M_MasterMat.uasset +++ b/Content/Materials/M_MasterMat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d023c08478b8b8918c92816513b8233fee7f1e8078cb248646f3fe57483c65cb -size 50851 +oid sha256:f3ae5d69b2a7bf7158ab9f6b394286bf4de55d735e75a0936f630052cca2804b +size 50201 diff --git a/Content/Materials/M_MasterMatMasked.uasset b/Content/Materials/M_MasterMatMasked.uasset index 1e9cea03..3aa829ac 100644 --- a/Content/Materials/M_MasterMatMasked.uasset +++ b/Content/Materials/M_MasterMatMasked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c06059f8a8c414b78d2d531de00bc68d715b98a04bf31293173f3bcb5d613974 -size 38691 +oid sha256:3ecb601c593b191681980ad9a83e0ff3ca500321cf59d6c4eb09cfd3aefab4ea +size 38771 diff --git a/Content/Materials/M_RocksBase.uasset b/Content/Materials/M_RocksBase.uasset index 5322723d..93386534 100644 --- a/Content/Materials/M_RocksBase.uasset +++ b/Content/Materials/M_RocksBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:263b9cbd5bdede1848fc1c3f5a71004d135a23b4b12268f853cdd3a2e11e2ccf -size 48560 +oid sha256:6870d0d0257b3bee7bb08e717ef059b14b9def2b751ab161d2665f11299ce297 +size 48666 diff --git a/Content/Materials/M_RocksBaseNoFade.uasset b/Content/Materials/M_RocksBaseNoFade.uasset index c58f94f3..b7bf9462 100644 --- a/Content/Materials/M_RocksBaseNoFade.uasset +++ b/Content/Materials/M_RocksBaseNoFade.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c71ad6d0d9c20e99ca8e54dd15e7e8e6f69042c8bbe36d7904e53ec12755dc -size 31243 +oid sha256:4d7c50091e31bc94b2e37a8c526c5974d2c216cee02e873a9a2a6334366fb58a +size 31250 diff --git a/Content/Materials/MaterialParameterCollections/MP_MaterialOptions.uasset b/Content/Materials/MaterialParameterCollections/MP_MaterialOptions.uasset index 12eef3e4..1d356554 100644 --- a/Content/Materials/MaterialParameterCollections/MP_MaterialOptions.uasset +++ b/Content/Materials/MaterialParameterCollections/MP_MaterialOptions.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab111929ba4713d4604f41364cb0373392c630962feb23801a171f3dbf78d0dd -size 4773 +oid sha256:8f3a85ebfa88d87a89f4e0489e75c3779933b9c9220edc932546870bedfbd7d3 +size 5514 diff --git a/Content/Materials/Sky/M_Pixel_SkyMaterial.uasset b/Content/Materials/Sky/M_Pixel_SkyMaterial.uasset index 4f507c5b..fe058837 100644 --- a/Content/Materials/Sky/M_Pixel_SkyMaterial.uasset +++ b/Content/Materials/Sky/M_Pixel_SkyMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b22dc8d9d63e91f8d37383817f9d363206df723f7fabef5b09d187a1d7d0a9e -size 55442 +oid sha256:d4fb09e5e1f0119aa7534e1cce7bdd38815bb0a9354b9430d1d4e0d4bca5fa48 +size 56621 diff --git a/Content/Materials/Surfaces/Rock/M_PixelRockBase.uasset b/Content/Materials/Surfaces/Rock/M_PixelRockBase.uasset index 3caccab3..55bd9bde 100644 --- a/Content/Materials/Surfaces/Rock/M_PixelRockBase.uasset +++ b/Content/Materials/Surfaces/Rock/M_PixelRockBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427ad80895b0a1352ace7f133ca3b24e96f297f94da85538891d437ade389a08 -size 66612 +oid sha256:d6ac259277a28f425595cbd60e45c66fb8164da692d3794ad076fbf379b86979 +size 66145 diff --git a/Content/Materials/VFX/Clouds/Clouds.uasset b/Content/Materials/VFX/Clouds/Clouds.uasset index bf38ac08..e27ee943 100644 --- a/Content/Materials/VFX/Clouds/Clouds.uasset +++ b/Content/Materials/VFX/Clouds/Clouds.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e018c2de3b6b6b7cf350b384ac469673fb4a28667de414377faf08fc295156f -size 21615 +oid sha256:4e4d4d6e372033db0e5682fef67789b75fe0fe529e79d621cfbfbc5455c0b324 +size 21602 diff --git a/Content/Materials/VFX/Clouds/M_TestCloudsNew.uasset b/Content/Materials/VFX/Clouds/M_TestCloudsNew.uasset index 1f04474b..9ee47f3e 100644 --- a/Content/Materials/VFX/Clouds/M_TestCloudsNew.uasset +++ b/Content/Materials/VFX/Clouds/M_TestCloudsNew.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:318c65c0990d347ba203ff997bdf46f57661d52d0cfd3999b11d51cd2acc6f19 -size 29769 +oid sha256:6d013add1fe9cece835760e2d4c76edf5b52cf87be38edbd21b1713324f3c8d6 +size 30017 diff --git a/Content/Materials/VFX/Clouds/M_TestCloudsNew_Inst.uasset b/Content/Materials/VFX/Clouds/M_TestCloudsNew_Inst.uasset index a99c445b..ba62daa6 100644 --- a/Content/Materials/VFX/Clouds/M_TestCloudsNew_Inst.uasset +++ b/Content/Materials/VFX/Clouds/M_TestCloudsNew_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5e3506f557c8bd55a21df796fc3eaec8ba1ec81cd89f5f3072fc65ed4dfb1f1 -size 11155 +oid sha256:ebba8e63ce1a05087c133691d5d1d076bbb038c519e95c01bf25f5d2472aa56c +size 11156 diff --git a/Content/Materials/VFX/Decals/MI_WetSurfaceDecal_Puddle.uasset b/Content/Materials/VFX/Decals/MI_WetSurfaceDecal_Puddle.uasset new file mode 100644 index 00000000..4e1d0e90 --- /dev/null +++ b/Content/Materials/VFX/Decals/MI_WetSurfaceDecal_Puddle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a51b184aa1aec0a0b34d93c0876d2eaf5a23847d81635cbe3c4f8f1f41ce933 +size 11258 diff --git a/Content/Materials/VFX/Decals/M_WetSurfaceDecal.uasset b/Content/Materials/VFX/Decals/M_WetSurfaceDecal.uasset index 0586d79e..5e522974 100644 --- a/Content/Materials/VFX/Decals/M_WetSurfaceDecal.uasset +++ b/Content/Materials/VFX/Decals/M_WetSurfaceDecal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c9c03b42a16d9876041014ae5a283e7be4ba46f979794671fb9e2dba98950d3 -size 91552 +oid sha256:ee44f52b353c5a67c639bd9f40518b552f09e8838a528a029c34bc5fbbefac36 +size 23430 diff --git a/Content/Materials/VFX/Water/UnrealWater/M_SimpleWater.uasset b/Content/Materials/VFX/Water/UnrealWater/M_SimpleWater.uasset index 3d9686b9..135b448d 100644 --- a/Content/Materials/VFX/Water/UnrealWater/M_SimpleWater.uasset +++ b/Content/Materials/VFX/Water/UnrealWater/M_SimpleWater.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b0fe03d7fc53dea8c55e3882b13c1bacdce1792d52d4914ab3f3cb3c714fea -size 121702 +oid sha256:8df3ae9a1b7b219a3eb079f27fb91dfb5a214c6b50b48e94989c7e28d696b119 +size 121686 diff --git a/Content/Materials/Vegetation/BASE/M_LandscapeMain.uasset b/Content/Materials/Vegetation/BASE/M_LandscapeMain.uasset index e011cff3..f1898599 100644 --- a/Content/Materials/Vegetation/BASE/M_LandscapeMain.uasset +++ b/Content/Materials/Vegetation/BASE/M_LandscapeMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59ade3a8638e6a429ff2a92da8d12f8e05b3e7625400995a1a2c61771448b594 -size 82881 +oid sha256:3a452e2933d58baa4c4f251855e5f55d2a6a68587d32f22a48b7cef68f000493 +size 82207 diff --git a/Content/Materials/Vegetation/BASE/M_TreeTrunkBase.uasset b/Content/Materials/Vegetation/BASE/M_TreeTrunkBase.uasset index b4d85bef..3d71a2a0 100644 --- a/Content/Materials/Vegetation/BASE/M_TreeTrunkBase.uasset +++ b/Content/Materials/Vegetation/BASE/M_TreeTrunkBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4bc6068abed1146a43afb8ae9c09a22bcf6bfcb01a06a4d4f3a625dbebf2b28 -size 41120 +oid sha256:b2e824043531e616689133c8b030e5bcadd4e923d093f7ec96c005cb7101ef25 +size 41224 diff --git a/Content/Materials/Vegetation/BASE/M_VegetationBase.uasset b/Content/Materials/Vegetation/BASE/M_VegetationBase.uasset index 098c01e3..a1fc9734 100644 --- a/Content/Materials/Vegetation/BASE/M_VegetationBase.uasset +++ b/Content/Materials/Vegetation/BASE/M_VegetationBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e44a78e4976ba845a3308576a8515fdecd89f7af27d36d8de1d00643f7b5c930 -size 69695 +oid sha256:adaaa376c9713339fe07162ee191ea0f2471ccc2a7a707999d3e4ff99f6eccd4 +size 69018 diff --git a/Content/Materials/Vegetation/M_VegetationHead.uasset b/Content/Materials/Vegetation/M_VegetationHead.uasset index cc2cfc92..76927099 100644 --- a/Content/Materials/Vegetation/M_VegetationHead.uasset +++ b/Content/Materials/Vegetation/M_VegetationHead.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32cca413eb56e962421ad2d6f4a88dd700b0d486a2feb32d56f481423d0c85eb -size 51532 +oid sha256:b1cec5692b7759725c9a325d8adfc56e9db0a7b1661c98b9dbe286e51f21cdb9 +size 50827 diff --git a/Content/Materials/Wood/M_LeavesTexture.uasset b/Content/Materials/Wood/M_LeavesTexture.uasset index 03363ea3..5888d630 100644 --- a/Content/Materials/Wood/M_LeavesTexture.uasset +++ b/Content/Materials/Wood/M_LeavesTexture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0c0e2ac51bca31762b8d979e4d261018c25e369686f0d8e2b8f422119e48646 -size 63953 +oid sha256:6f820124c00c94e05ed69c8080e01e6cea8c25ec0dc1d5d6191beb2264a044c7 +size 63288 diff --git a/Content/Materials/Wood/Trees/M_TreeBarkBase.uasset b/Content/Materials/Wood/Trees/M_TreeBarkBase.uasset index 7b8a2591..c5bfb74a 100644 --- a/Content/Materials/Wood/Trees/M_TreeBarkBase.uasset +++ b/Content/Materials/Wood/Trees/M_TreeBarkBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0982785cd9bc5d88a0096408d6ceabcb2d10e254ad6d9eff752e2b064315f16 -size 66538 +oid sha256:a6bad631f51b70468c0dc1ad307592f47e2d0165dedc74449231279280df3231 +size 66292 diff --git a/Content/Scripts/BP_TimeOfDay.uasset b/Content/Scripts/BP_TimeOfDay.uasset index a7a14d4f..1ec4c8e1 100644 --- a/Content/Scripts/BP_TimeOfDay.uasset +++ b/Content/Scripts/BP_TimeOfDay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c470a2d03109aa8537289e5ee745b3cdd0e542096ff21c14e61a96cf3be9203 -size 463105 +oid sha256:a755f1d6b3ec3fb3bdb8c9ced1d4ae2869be6fc0a58f3b8276affc6a1d0eddec +size 460926 diff --git a/Content/ShowOff/BenchmarkActor.uasset b/Content/ShowOff/BenchmarkActor.uasset index bb328d02..c9a2accb 100644 --- a/Content/ShowOff/BenchmarkActor.uasset +++ b/Content/ShowOff/BenchmarkActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c0b6b6bb9485bb29600359ff875bac147eca716f10a0ca2a5e140b4bb96d0b -size 414231 +oid sha256:f29c0819bffbb11020525ecb072554bd1be7e8d5415e35ee62e9230033e99baa +size 442397 diff --git a/Content/VFX/NI_Water_Dripping.uasset b/Content/VFX/NI_Water_Dripping.uasset index 4cebd5d5..452d0689 100644 --- a/Content/VFX/NI_Water_Dripping.uasset +++ b/Content/VFX/NI_Water_Dripping.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4a60735b8880c1e6be8f8e8d76918bc689999419fb84bae41a29a1df3df41f6 -size 414953 +oid sha256:ec8e50cc8e2bed854acdb1d98bc54605cfe67a761844b440b1704eed2b9ec22a +size 400036 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/S9/GI1IG0EPK16PS4L5J55KH4.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/S9/GI1IG0EPK16PS4L5J55KH4.uasset index 1a14dcd8..3a6f8a64 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/S9/GI1IG0EPK16PS4L5J55KH4.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/S9/GI1IG0EPK16PS4L5J55KH4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de643c6ebb48e3865e75b3f76f6d708dce0bac828a29fd19ffe4743f469fd718 +oid sha256:33dee412d7c12cd1d2cc52a06a05d7f8d3aa123acc11c8f3932ec0fa6dc49754 size 14338889 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/NH/S1Z5WGF4VC72FE72IO73C1.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/NH/S1Z5WGF4VC72FE72IO73C1.uasset index 094353fe..285a7a71 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/NH/S1Z5WGF4VC72FE72IO73C1.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/NH/S1Z5WGF4VC72FE72IO73C1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e64bd8f7dda6d9da6bd90deeace2f14675882f0cdf9f14f0efa5df4daad114 -size 4329 +oid sha256:3f0ef5de455b2cbb92f7f11da035bc3f1b213bbdc4101c4c2a13b364a3df759f +size 4248 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/7W/JTWCLY6V3M8CY9DKMFWIA9.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/7W/JTWCLY6V3M8CY9DKMFWIA9.uasset new file mode 100644 index 00000000..890e0ae4 --- /dev/null +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/7W/JTWCLY6V3M8CY9DKMFWIA9.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38adc7e458ccbcd1aa67d7292f23bf4b8052673b11f8681dd9ad1891859013bb +size 4227 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/YR/TRY5X6R9FXTH34UPHS6ICX.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/YR/TRY5X6R9FXTH34UPHS6ICX.uasset new file mode 100644 index 00000000..c7faa1b5 --- /dev/null +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/YR/TRY5X6R9FXTH34UPHS6ICX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:904ae2bbc63b0806eb801c7b72ec74a21694229fad50eb2b4d7d1aee04918a2f +size 4347 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/FJ/XSLZCCYW6P0XOLD701W2BA.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/FJ/XSLZCCYW6P0XOLD701W2BA.uasset index d4d120df..84fcf83b 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/FJ/XSLZCCYW6P0XOLD701W2BA.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/FJ/XSLZCCYW6P0XOLD701W2BA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e95551f599273ae5379969ea4190606b3f076c415e400954b56ee0fba4ac9129 -size 20115 +oid sha256:dc075c9c99a5e092baeffb41253df40c39a9909a1ffaad9faf25543e9c1ee2ce +size 20456 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/W5/9T5G20W8396YFFMS4ZIXVB.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/W5/9T5G20W8396YFFMS4ZIXVB.uasset index ecb2555b..7e3af7d9 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/W5/9T5G20W8396YFFMS4ZIXVB.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/6/W5/9T5G20W8396YFFMS4ZIXVB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae150b4546c99a7c76eb44860bd71ace72e7760df258fa82b0c1fa9a55bb5380 +oid sha256:f8e830eb6fbee52cc9dc4249059bf58eccfccd0fad4f1e4eff85b56275464f29 size 4242 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/8/C2/FKOBRO47F7FU8UI5FADCG6.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/8/C2/FKOBRO47F7FU8UI5FADCG6.uasset index d2b944f6..72a76f0c 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/8/C2/FKOBRO47F7FU8UI5FADCG6.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/8/C2/FKOBRO47F7FU8UI5FADCG6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25566ed8a6be0613a449ca6b7a12421a9544ef376328e66c14d87f9c67ff2f2d +oid sha256:9079927edcfa7382f544b30697cc26bb3073c6f2fe1b8ae3fa45a10e1ba660ba size 6746 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/B/6I/9T4YZVK7MJTAJPCQOND6OV.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/B/6I/9T4YZVK7MJTAJPCQOND6OV.uasset new file mode 100644 index 00000000..74f62a2f --- /dev/null +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/B/6I/9T4YZVK7MJTAJPCQOND6OV.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c83b28ce71b4baf6dc9f0525bcb836535d6968fd57305e8b1a139382a348c48 +size 4347 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset index 2657f8a8..7d9c15e5 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72aa8bfc95dda5cea3aabcdb2ab1da272d7395a6c19ef1ac2216360b4a15696d -size 13445 +oid sha256:b9f4bd37d296bca7fcfadcf55eba17afabc891d202a034a6ecdd28740754b637 +size 12900 diff --git a/Source/ProjectEleri/Data/WeatherPresetDataAsset.h b/Source/ProjectEleri/Data/WeatherPresetDataAsset.h index ed336b7b..14f8778f 100644 --- a/Source/ProjectEleri/Data/WeatherPresetDataAsset.h +++ b/Source/ProjectEleri/Data/WeatherPresetDataAsset.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "Curves/CurveLinearColor.h" #include "Engine/DataAsset.h" #include "WeatherPresetDataAsset.generated.h" @@ -55,6 +56,10 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Clouds") FRuntimeFloatCurve CloudsBrightnessCurve; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Clouds") + FRuntimeCurveLinearColor CloudAmbientColorCurve; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Clouds") + FRuntimeCurveLinearColor CloudSunColorCurve; UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Clouds") float CloudDensity = 0.3f; diff --git a/Source/ProjectEleri/Private/TimeOfDayManager.cpp b/Source/ProjectEleri/Private/TimeOfDayManager.cpp index cd19e447..d528669a 100644 --- a/Source/ProjectEleri/Private/TimeOfDayManager.cpp +++ b/Source/ProjectEleri/Private/TimeOfDayManager.cpp @@ -12,7 +12,6 @@ #include "Engine/PostProcessVolume.h" #include "Engine/StreamableManager.h" #include "Engine/World.h" -#include "Kismet/GameplayStatics.h" #include "Kismet/KismetMaterialLibrary.h" #include "Materials/MaterialParameterCollection.h" #include "ProjectEleri/Data/WeatherPresetDataAsset.h" @@ -229,6 +228,20 @@ void ATimeOfDayManager::UpdateLightning() QueuedWeatherPreset ? FMath::Lerp(QueuedWeatherPreset->CloudCoverage,CurrentWeatherPreset->CloudCoverage,CurrentWeaterFadeAlpha) : CurrentWeatherPreset->CloudCoverage); + + const FLinearColor CloudAmbientColor = CurrentWeatherPreset->CloudAmbientColorCurve.GetLinearColorValue(FloatMinutes); + UKismetMaterialLibrary::SetVectorParameterValue(GetWorld(), GeneralMaterialParameterCollection, + FName("CloudAmbientColor"), + QueuedWeatherPreset ? + FMath::Lerp(QueuedWeatherPreset->CloudAmbientColorCurve.GetLinearColorValue(FloatMinutes),CloudAmbientColor, CurrentWeaterFadeAlpha) + : CloudAmbientColor); + + const FLinearColor CloudSunColor = CurrentWeatherPreset->CloudSunColorCurve.GetLinearColorValue(FloatMinutes); + UKismetMaterialLibrary::SetVectorParameterValue(GetWorld(), GeneralMaterialParameterCollection, + FName("CloudSunColor"), + QueuedWeatherPreset ? + FMath::Lerp(QueuedWeatherPreset->CloudSunColorCurve.GetLinearColorValue(FloatMinutes),CloudSunColor, CurrentWeaterFadeAlpha) + : CloudSunColor); } // Update wetness @@ -286,6 +299,8 @@ void ATimeOfDayManager::RotateSun(const float &_rotator) AppliedSunRotation = currentSunRotation; bSunRotationDirty = false; } + + UKismetMaterialLibrary::SetVectorParameterValue(GetWorld(), GeneralMaterialParameterCollection, FName("SunDirection"), FLinearColor(-sunLight->GetForwardVector())); } } diff --git a/Source/ProjectEleri/Public/TimeOfDayManager.h b/Source/ProjectEleri/Public/TimeOfDayManager.h index 6159d4da..734be801 100644 --- a/Source/ProjectEleri/Public/TimeOfDayManager.h +++ b/Source/ProjectEleri/Public/TimeOfDayManager.h @@ -203,9 +203,9 @@ public: UMaterialParameterCollection *GeneralMaterialParameterCollection; UPROPERTY(EditDefaultsOnly, BlueprintReadOnly) UMaterialParameterCollection *WindMaterialParameterCollection; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - AActor *skyDomeActor; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Time of Day - Lightning Setting") + AStaticMeshActor *skyDomeActor; UPROPERTY(EditAnywhere, BlueprintReadWrite) APostProcessVolume *MainPP; @@ -405,6 +405,9 @@ protected: UPROPERTY() TMap WeatherPresetDistributionMap; + UPROPERTY(EditDefaultsOnly) + UMaterialInstanceDynamic* CloudDynamicMaterial = nullptr; + UPROPERTY(VisibleAnywhere, BlueprintReadOnly) UInteractionWidgetComponent* WidgetComponent;