diff --git a/code/Runtime/Engine/WorldLayer.cpp b/code/Runtime/Engine/WorldLayer.cpp
index e12388ce0a..2f239ba324 100644
--- a/code/Runtime/Engine/WorldLayer.cpp
+++ b/code/Runtime/Engine/WorldLayer.cpp
@@ -123,7 +123,7 @@ void WorldLayer::preUpdate(const UpdateInfo& info)
m_scene.consume();
// Get initial camera.
- m_cameraEntity = m_scene->getWorld()->getEntity(L"Camera");
+ m_cameraEntity = m_scene->getWorld()->getEntity(L"Camera0");
}
// Re-create world renderer.
diff --git a/code/Weather/Sky/SkyComponent.h b/code/Weather/Sky/SkyComponent.h
index a1376ca49e..cd66944de7 100644
--- a/code/Weather/Sky/SkyComponent.h
+++ b/code/Weather/Sky/SkyComponent.h
@@ -89,8 +89,6 @@ class T_DLLCLASS SkyComponent : public world::IEntityComponent
const world::IWorldRenderPass& worldRenderPass
);
- render::ITexture* getTexture() const { return m_texture; }
-
private:
Ref< const render::IVertexLayout > m_vertexLayout;
Ref< render::Buffer > m_vertexBuffer;
@@ -98,19 +96,17 @@ class T_DLLCLASS SkyComponent : public world::IEntityComponent
render::Primitives m_primitives;
resource::Proxy< render::Shader > m_shaderClouds2D;
resource::Proxy< render::Shader > m_shaderClouds3D;
+ resource::Proxy< render::Shader > m_shaderCloudsDome;
resource::Proxy< render::Shader > m_shader;
resource::Proxy< render::ITexture > m_texture;
Ref< render::ITexture > m_cloudTextures[2];
+ Ref< render::ITexture > m_cloudDomeTexture[2];
world::Entity* m_owner = nullptr;
Transform m_transform;
float m_intensity = 1.0f;
- bool m_dirty = true;
-
- resource::Proxy< render::Shader > m_shaderCloudsDome;
- Ref< render::ITexture > m_cloudDomeTexture[2];
-
int32_t m_count = 0;
int32_t m_cloudFrame = 0;
+ bool m_dirty = true;
};
}
diff --git a/data/Source/System/Mesh/Shaders/Instance/Cull/Cull.xdi b/data/Source/System/Mesh/Shaders/Instance/Cull/Cull.xdi
index 7aed4841fe..d32ae5f694 100644
--- a/data/Source/System/Mesh/Shaders/Instance/Cull/Cull.xdi
+++ b/data/Source/System/Mesh/Shaders/Instance/Cull/Cull.xdi
@@ -274,7 +274,6 @@ if (ProjectSphere(viewCenter.xyz, radius, znear, P00, P11, aabb))
}
$Output = visible ? 1.0f : 0.0f;
-
]]>
@@ -293,7 +292,7 @@ $Output = visible ? 1.0f : 0.0f;
AdClamp
CfNone
0
- false
+ true
false
-
diff --git a/data/Source/System/Platforms/Features/Modules/Runtime.xdi b/data/Source/System/Platforms/Features/Modules/Runtime.xdi
index 62316c13c8..b33007e97b 100644
--- a/data/Source/System/Platforms/Features/Modules/Runtime.xdi
+++ b/data/Source/System/Platforms/Features/Modules/Runtime.xdi
@@ -469,11 +469,10 @@
DEPLOY_STATIC
-
- Extern.OpenEXR.lib
+ - Extern.tinyexr.lib
- Extern.agg.lib
- Extern.detour.lib
- Extern.expat.lib
- - Extern.ilmbase.lib
- Extern.jpeg.lib
- Extern.flac.lib
- Extern.liblzf.lib
@@ -632,11 +631,10 @@
DEPLOY_STATIC
- - Extern.OpenEXR.lib
+ - Extern.tinyexr.lib
- Extern.agg.lib
- Extern.detour.lib
- Extern.expat.lib
- - Extern.ilmbase.lib
- Extern.jpeg.lib
- Extern.flac.lib
- Extern.liblzf.lib
diff --git a/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi b/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi
index ca83bdf61a..49de20c103 100644
--- a/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi
+++ b/data/Source/System/Terrain/Terrain/Shaders/Templates/Terrain.xdi
@@ -5,8 +5,8 @@
{EAE95A01-9DDB-9F4D-9AED-662D3D8E874D}
- 469
- 298
+ 502
+ 339
Undefined
@@ -15,16 +15,16 @@
{B243D8E2-D285-C147-9002-C7532C16ADB2}
- 211
- 262
+ 244
+ 303
-
{2DC80AF2-9ECB-DC41-B8C8-90325B910D85}
- -155
- 205
+ -35
+ 244
-
@@ -159,8 +159,8 @@
{17209A50-5667-6C49-9196-811BDE3EAD67}
- -312
- 267
+ -246
+ 293
World_View
Matrix
@@ -170,8 +170,8 @@
{73C87553-D473-D747-A948-E76EB7050175}
- -2
- 325
+ 56
+ 365
World_Projection
Matrix
@@ -392,8 +392,8 @@ Generated texture from surface cache.
{533336C9-FA31-DE46-B1DC-F93F8A2A66F1}
- 203
- 172
+ 236
+ 213
L_ViewPosition
@@ -1120,8 +1120,8 @@ $Output = gl_DrawID;
{DCC6C4F8-413E-A040-BA70-ACE74679C628}
- -218
- 140
+ -156
+ 120
L_Elevation
@@ -1129,8 +1129,8 @@ $Output = gl_DrawID;
{7E6EB46D-E906-F948-9FFE-ACC1F5360B10}
- -349
- 158
+ -286
+ 138
y
diff --git a/data/Source/System/World/Reflections/Shaders/Screenspace reflections.xdi b/data/Source/System/World/Reflections/Shaders/Screenspace reflections.xdi
index a5eed196e0..3e97d13510 100644
--- a/data/Source/System/World/Reflections/Shaders/Screenspace reflections.xdi
+++ b/data/Source/System/World/Reflections/Shaders/Screenspace reflections.xdi
@@ -127,15 +127,21 @@
Vector
Frame
- -
+
-
{74D309C3-371D-451E-877C-3EFCE94DFEB7}
- 781
- -817
+ 780
+ -816
Trace
+
+ 1
+ 1
+ 1
+
+
-
{8E56F1F6-7778-46DF-B30D-4D4180A7D754}
@@ -250,8 +256,8 @@ for (int i = 0; i < 64; ++i)
{5A303AB2-8932-4D7F-87D5-135804F43B8C}
- 1189
- -858
+ 1208
+ -824
0
@@ -259,8 +265,8 @@ for (int i = 0; i < 64; ++i)
{561E0999-03FB-4719-9937-0D6659523A89}
- 1229
- -953
+ 1248
+ -920
Color
Texture2D
@@ -270,8 +276,8 @@ for (int i = 0; i < 64; ++i)
{1BA70F8C-E7FC-45F9-92DC-2AE20D4CD0E2}
- 1366
- -928
+ 1384
+ -894
FtLinear
FtLinear
@@ -288,8 +294,8 @@ for (int i = 0; i < 64; ++i)
{B1F40F4A-B3F6-40FD-B295-8E87C0573303}
- 2412
- -875
+ 2398
+ -880
Default
@@ -335,8 +341,8 @@ for (int i = 0; i < 64; ++i)
{3764C2E4-8EFB-442B-81AC-1CC816B8947E}
- 1229
- -903
+ 1248
+ -870
xy
@@ -352,8 +358,8 @@ for (int i = 0; i < 64; ++i)
{4BF1EBDF-2BDA-419A-BEC3-18D2339B0B7D}
- 1336
- -708
+ 1387
+ -707
z
@@ -361,8 +367,8 @@ for (int i = 0; i < 64; ++i)
{3FCF8FB2-14D3-4238-85A4-72C8219D3150}
- 1825
- -846
+ 1846
+ -858
L_Roughness
@@ -370,8 +376,8 @@ for (int i = 0; i < 64; ++i)
{9AF24C39-E70C-4964-9BEE-5D6D968C3626}
- 1842
- -806
+ 1864
+ -818
0.4
@@ -379,8 +385,8 @@ for (int i = 0; i < 64; ++i)
{453DEA23-A89C-474F-8476-D96B0F96A631}
- 1591
- -798
+ 1620
+ -838
xyz1
@@ -388,28 +394,11 @@ for (int i = 0; i < 64; ++i)
{1CD944BD-F376-454A-B888-CE52AB1A91B3}
- 2089
- -840
+ 2110
+ -852
CoLess
- -
- {634A78A7-C9C7-C347-87FF-EF7C4AC9BC75}
-
-
- 1687
- -1024
-
-
- -
- {E38846B7-D8D0-A745-8567-8B9F6492D08C}
-
-
- 1522
- -1058
-
- 0.5
-
-
{2BC6C1F9-5E1E-7F45-9DBD-14E4F5BD033B}
@@ -742,49 +731,19 @@ for (int i = 0; i < 64; ++i)
{7174FE5A-D079-4452-AFEF-9FC2BCC2900F}
- -
-
-
- {AF6C971B-D67A-42EE-A12B-97D36927C89F}
-
-
-
- {E96D386C-3A96-4807-BFC9-50180678A096}
-
-
- -
-
-
- {B4FEA355-7A63-498C-966D-42F58570CB20}
-
-
-
- {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C}
-
-
- -
-
-
- {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7}
-
-
-
- {1A674CC4-1D87-4859-AB19-4DDD06A12987}
-
-
-
{8FFB3BDB-A00E-4406-994C-0D52FAF04871}
-
+
{39749CD5-03F0-D045-99EC-E01C2D775486}
-
-
+
{B350D788-DF12-6A40-922B-5737E4CB7880}
@@ -798,13 +757,13 @@ for (int i = 0; i < 64; ++i)
{8FFB3BDB-A00E-4406-994C-0D52FAF04871}
-
+
{97DC9817-9348-4045-84D1-5E3E34942BEF}
-
-
+
{DA71CC25-EA8C-574D-AFFD-02F27FC9C7F4}
@@ -818,13 +777,13 @@ for (int i = 0; i < 64; ++i)
{8FFB3BDB-A00E-4406-994C-0D52FAF04871}
-
+
{CA354600-15AE-DE42-AB5A-FA83AE931572}
-
-
+
{68FEE0D6-C712-9F4A-8713-0869C8607AA1}
@@ -834,7 +793,7 @@ for (int i = 0; i < 64; ++i)
-
-
+
{68FEE0D6-C712-9F4A-8713-0869C8607AA1}
@@ -844,7 +803,7 @@ for (int i = 0; i < 64; ++i)
-
-
+
{1E6639B6-8B58-4694-99E7-C058E3583522}
@@ -852,6 +811,16 @@ for (int i = 0; i < 64; ++i)
{C22C982C-CA5D-4877-A119-2F11D98A2490}
+ -
+
+
+ {AF6C971B-D67A-42EE-A12B-97D36927C89F}
+
+
+
+ {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C}
+
+