diff --git a/Content/Editor/Camera/M_Camera.flax b/Content/Editor/Camera/M_Camera.flax index 5d29f9506..a29ddf8ce 100644 --- a/Content/Editor/Camera/M_Camera.flax +++ b/Content/Editor/Camera/M_Camera.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96ef27f6f38fa0c8d655c1715164bf2182d228264d08e524b72b9a51f6ea5c58 -size 29218 +oid sha256:f43c4a5ce22f99844e1930373d8ee5d1c23b2351fae560e0a5f3c1cb2f90f21b +size 29217 diff --git a/Content/Editor/CubeTexturePreviewMaterial.flax b/Content/Editor/CubeTexturePreviewMaterial.flax index ffb4fc76a..53c815e3b 100644 --- a/Content/Editor/CubeTexturePreviewMaterial.flax +++ b/Content/Editor/CubeTexturePreviewMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a99ab33ce2c13e6e3540032111a396c38d7760ff057355ea1e31175ba952a3b5 -size 31138 +oid sha256:0fee8c3ca56f54bde8ac76d2f67d8af0d439f8c8761a50614450f0d2082e6295 +size 31137 diff --git a/Content/Editor/DebugMaterials/DDGIDebugProbes.flax b/Content/Editor/DebugMaterials/DDGIDebugProbes.flax index 58c3ae7f8..1db3df019 100644 --- a/Content/Editor/DebugMaterials/DDGIDebugProbes.flax +++ b/Content/Editor/DebugMaterials/DDGIDebugProbes.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11ebb0e8618f6b50e7c2155c5007e5c3613e7633426db18e40d4b11b0b352c5f -size 40107 +oid sha256:b35f4081cbc343808449768d8bf1518bcf489dbf86fa4fb5e61b0217f5472e66 +size 40106 diff --git a/Content/Editor/DebugMaterials/SingleColor/Decal.flax b/Content/Editor/DebugMaterials/SingleColor/Decal.flax index 1b4c48dfa..871eb9229 100644 --- a/Content/Editor/DebugMaterials/SingleColor/Decal.flax +++ b/Content/Editor/DebugMaterials/SingleColor/Decal.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0ae39630794891318d9aea950c0d9efb1069f9c8b35758400937f0298bed76b +oid sha256:56acdef67dd5069f253022d2bf217b12a4fabde979c112b7f0be20537fb87c59 size 10465 diff --git a/Content/Editor/DebugMaterials/SingleColor/Particle.flax b/Content/Editor/DebugMaterials/SingleColor/Particle.flax index d9f98575d..d3174e442 100644 --- a/Content/Editor/DebugMaterials/SingleColor/Particle.flax +++ b/Content/Editor/DebugMaterials/SingleColor/Particle.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676e2d8b18ac3d902150e5056b0b895f176a42aaed8cfa3f233bd3234ace250e -size 34102 +oid sha256:45396e82b1947635c25028078da900f937757abafffc581dca3fadc244138f71 +size 34174 diff --git a/Content/Editor/DebugMaterials/SingleColor/Surface.flax b/Content/Editor/DebugMaterials/SingleColor/Surface.flax index 5ebbef8f8..f625032bc 100644 --- a/Content/Editor/DebugMaterials/SingleColor/Surface.flax +++ b/Content/Editor/DebugMaterials/SingleColor/Surface.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32de2b44db6717b657089311fb8ef571233c5716f85728f8c81d44c37a2f2a90 -size 29055 +oid sha256:d645b2130d97a43d9ef6275c946309f9ba41a50a1a634d93b5d616ff6d618ca4 +size 29054 diff --git a/Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax b/Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax index d4af3c72b..bb12666be 100644 --- a/Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax +++ b/Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c4f8f038ab35862a3d614a7bc271eebb94f4f1af52eb6df299e085cf3e33ff4 -size 33123 +oid sha256:54392b75c269ead1fb8de9a8ee61af99e8d567a17541f55f266a9e2c3541d531 +size 33190 diff --git a/Content/Editor/DebugMaterials/SingleColor/Terrain.flax b/Content/Editor/DebugMaterials/SingleColor/Terrain.flax index 2fa59511c..63d6f30d0 100644 --- a/Content/Editor/DebugMaterials/SingleColor/Terrain.flax +++ b/Content/Editor/DebugMaterials/SingleColor/Terrain.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6abc0bd72ac0c0503a1d4bd304f5920fe54a60713f007f5ababb715ceb546c9d -size 21143 +oid sha256:91ed6c731d10aa6cd9e726e529332865a11c2da739ecadef17258b79d17f4b70 +size 21142 diff --git a/Content/Editor/DefaultFontMaterial.flax b/Content/Editor/DefaultFontMaterial.flax index 919e6e5fa..67a467775 100644 --- a/Content/Editor/DefaultFontMaterial.flax +++ b/Content/Editor/DefaultFontMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd13b087419be138902f0f4e8a41bb104adb8a72e28339fe5d8184a7eb35f604 -size 29312 +oid sha256:e77bae06b2dc90ae68e7fb548468222b52b2fa736d58e616c3ee1db7a2f27a1b +size 29311 diff --git a/Content/Editor/Gizmo/FoliageBrushMaterial.flax b/Content/Editor/Gizmo/FoliageBrushMaterial.flax index 1c5c1bd3d..efa00e77d 100644 --- a/Content/Editor/Gizmo/FoliageBrushMaterial.flax +++ b/Content/Editor/Gizmo/FoliageBrushMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b727fa224db1b4471de46d88c0e05b25134ba650ee5193038ace392732d4f67b -size 39807 +oid sha256:30dbe17344f65ddf5e966a7e653db1cbd4db2fa4c6c417b69feba83a0fd177d9 +size 39907 diff --git a/Content/Editor/Gizmo/Material.flax b/Content/Editor/Gizmo/Material.flax index acceab297..eae0aacbd 100644 --- a/Content/Editor/Gizmo/Material.flax +++ b/Content/Editor/Gizmo/Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fc77a40406c7df9239b17bd0321c1cb315c0ab499e385f19cdac5c2b70de4bc -size 34409 +oid sha256:0d89aa285bcf65472639370dfc3c64990431191102a6b7f68262a95ab91b8db1 +size 34476 diff --git a/Content/Editor/Gizmo/MaterialWire.flax b/Content/Editor/Gizmo/MaterialWire.flax index 4bc8fbf6a..7a2729312 100644 --- a/Content/Editor/Gizmo/MaterialWire.flax +++ b/Content/Editor/Gizmo/MaterialWire.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be7a08e8ee76c988d3726e228c0fd842c437fcdd156f90c4afd21a837e8eb15c -size 32858 +oid sha256:127b33216f7b39f20b6dc4f47cd3d79f06f5be0c3b7623adbfaf5e69f2d2a969 +size 32925 diff --git a/Content/Editor/Gizmo/SelectionOutlineMaterial.flax b/Content/Editor/Gizmo/SelectionOutlineMaterial.flax index 062c3c6b0..33e7374ab 100644 --- a/Content/Editor/Gizmo/SelectionOutlineMaterial.flax +++ b/Content/Editor/Gizmo/SelectionOutlineMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41dfd7ccd0cddd5bf9db1f1249d311c7419dfe98b272eda88b3335fed00d5403 +oid sha256:f0b0beadb92aecb3b1f4251e6bfdb9ad85be71200f9a0e38db78efc902a5aa7a size 18887 diff --git a/Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax b/Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax index 1696ad25f..4f6c59637 100644 --- a/Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax +++ b/Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fc19cf7e0315ea0f0f837a74efdcbd4a2244b8ec768ee19a4149e1fcb1602ef -size 30312 +oid sha256:cc7eb8ccb59693b0a9731968de973a8836f019f2a5ac29843fbf2257339afa6e +size 30311 diff --git a/Content/Editor/HSWheel.flax b/Content/Editor/HSWheel.flax index 6d3e0beb0..5c7825c2a 100644 --- a/Content/Editor/HSWheel.flax +++ b/Content/Editor/HSWheel.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04675d0be3ef73596b672eb2bcdbbcf4002e1335a97189fc6b4e53d4d8bebaf1 +oid sha256:430586aa0862e71cedd2e2ff832df5660cc0a874e58dfdb9d9f12c41eab24f05 size 15490 diff --git a/Content/Editor/Highlight Material.flax b/Content/Editor/Highlight Material.flax index 3aa302360..4a7764027 100644 --- a/Content/Editor/Highlight Material.flax +++ b/Content/Editor/Highlight Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:813fc92db52957883323b0471e23d43aa44ffc745de3fdb4143a46df993a10f8 -size 31436 +oid sha256:7a222c9badb5c358b237468a0a3283f0827a98c0f0df1a373c87f636d1481387 +size 31503 diff --git a/Content/Editor/Icons/IconsMaterial.flax b/Content/Editor/Icons/IconsMaterial.flax index 3cfdb33d5..daf128afd 100644 --- a/Content/Editor/Icons/IconsMaterial.flax +++ b/Content/Editor/Icons/IconsMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9f5efc2a24f79fc36fa3d2eb086e89331d7fb013617374effce46180ab9ce2e -size 31497 +oid sha256:74fab2aa88ac7111fccb603f6bb8e2d7c87eade37f26a707d300761d6c7427b2 +size 31564 diff --git a/Content/Editor/IesProfilePreviewMaterial.flax b/Content/Editor/IesProfilePreviewMaterial.flax index 3694ef2d3..41f4e56fb 100644 --- a/Content/Editor/IesProfilePreviewMaterial.flax +++ b/Content/Editor/IesProfilePreviewMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d1ca755adbde9fd9666766023b0c2b971b8c6155e82182eb3c7eec39bbaab0a -size 20873 +oid sha256:f1c7c2e8612669b4fed9b21a6a07874f33fee96207871ec612049cead17dd346 +size 20898 diff --git a/Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl b/Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl index 8e03a2056..ac09c4813 100644 --- a/Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl +++ b/Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl @@ -3,18 +3,18 @@ @0// Forward Shading: Defines #define MAX_LOCAL_LIGHTS 4 @1// Forward Shading: Includes -#include "./Flax/LightingCommon.hlsl" -#include "./Flax/ReflectionsCommon.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" +#include "./Flax/Reflections/ReflectionsCommon.hlsl" #if USE_REFLECTIONS #define MATERIAL_REFLECTIONS_SSR 1 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR -#include "./Flax/SSR.hlsl" +#include "./Flax/Reflections/SSR.hlsl" #endif #endif -#include "./Flax/Lighting.hlsl" -#include "./Flax/ShadowsSampling.hlsl" -#include "./Flax/ExponentialHeightFog.hlsl" -#include "./Flax/VolumetricFog.hlsl" +#include "./Flax/Lighting/Lighting.hlsl" +#include "./Flax/Lighting/ExponentialHeightFog.hlsl" +#include "./Flax/Lighting/VolumetricFog.hlsl" +#include "./Flax/Shadows/ShadowsSampling.hlsl" @2// Forward Shading: Constants LightData DirectionalLight; LightData SkyLight; diff --git a/Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl b/Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl index a0d84ba01..800a4b652 100644 --- a/Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl +++ b/Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl @@ -4,7 +4,7 @@ #define USE_GI 1 @1// Global Illumination: Includes #include "./Flax/GI/DDGI.hlsl" -#include "./Flax/LightingCommon.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" @2// Global Illumination: Constants DDGIData DDGI; @3// Global Illumination: Resources diff --git a/Content/Editor/MaterialTemplates/Features/SDFReflections.hlsl b/Content/Editor/MaterialTemplates/Features/SDFReflections.hlsl index c199f28a5..7d7f4ba7c 100644 --- a/Content/Editor/MaterialTemplates/Features/SDFReflections.hlsl +++ b/Content/Editor/MaterialTemplates/Features/SDFReflections.hlsl @@ -3,7 +3,7 @@ @0// SDF Reflections: Defines #define USE_GLOBAL_SURFACE_ATLAS 1 @1// SDF Reflections: Includes -#include "./Flax/GlobalSignDistanceField.hlsl" +#include "./Flax/Utils/GlobalSignDistanceField.hlsl" #include "./Flax/GI/GlobalSurfaceAtlas.hlsl" @2// SDF Reflections: Constants GlobalSDFData GlobalSDF; diff --git a/Content/Editor/MaterialTemplates/GPUParticles.shader b/Content/Editor/MaterialTemplates/GPUParticles.shader index 108e7d648..91d163172 100644 --- a/Content/Editor/MaterialTemplates/GPUParticles.shader +++ b/Content/Editor/MaterialTemplates/GPUParticles.shader @@ -4,8 +4,8 @@ @3 #include "./Flax/Common.hlsl" #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/Matrix.hlsl" -#include "./Flax/Noise.hlsl" +#include "./Flax/Math/Matrix.hlsl" +#include "./Flax/Math/Noise.hlsl" @7 // Primary constant buffer META_CB_BEGIN(0, Data) diff --git a/Content/Editor/MaterialTemplates/Particle.shader b/Content/Editor/MaterialTemplates/Particle.shader index d3fec2818..abccf93bd 100644 --- a/Content/Editor/MaterialTemplates/Particle.shader +++ b/Content/Editor/MaterialTemplates/Particle.shader @@ -8,7 +8,7 @@ #include "./Flax/Common.hlsl" #include "./Flax/MaterialCommon.hlsl" #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/Matrix.hlsl" +#include "./Flax/Math/Matrix.hlsl" @7 struct SpriteInput { diff --git a/Content/Editor/MaterialTemplates/VolumeParticle.shader b/Content/Editor/MaterialTemplates/VolumeParticle.shader index c415228ee..d9cb980ea 100644 --- a/Content/Editor/MaterialTemplates/VolumeParticle.shader +++ b/Content/Editor/MaterialTemplates/VolumeParticle.shader @@ -8,7 +8,7 @@ #include "./Flax/Common.hlsl" #include "./Flax/MaterialCommon.hlsl" #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/VolumetricFog.hlsl" +#include "./Flax/Lighting/VolumetricFog.hlsl" @7 // Primary constant buffer (with additional material parameters) diff --git a/Content/Editor/Particles/Particle Material Color.flax b/Content/Editor/Particles/Particle Material Color.flax index 4a7b2ed27..883a08610 100644 --- a/Content/Editor/Particles/Particle Material Color.flax +++ b/Content/Editor/Particles/Particle Material Color.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:112913e6836a80e00eab79bf0e1b745d4597391d706852893405509d5e8ef733 -size 32307 +oid sha256:01d8fa891434d269c4a5959df52e91bff70f440ed863db1c00947cee985a0df1 +size 32379 diff --git a/Content/Editor/Particles/Smoke Material.flax b/Content/Editor/Particles/Smoke Material.flax index 40fae5795..ba158d2a2 100644 --- a/Content/Editor/Particles/Smoke Material.flax +++ b/Content/Editor/Particles/Smoke Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91e9c618b64ad051a605b0a9e8970cef1fe42b5943a79e8da3942375634e272a -size 40757 +oid sha256:5b23505de20acb350eccfed71dee76f871c0ca5f33d9050dc6ba28e1ac8e1c36 +size 40918 diff --git a/Content/Editor/SpriteMaterial.flax b/Content/Editor/SpriteMaterial.flax index f039db989..20bf21b36 100644 --- a/Content/Editor/SpriteMaterial.flax +++ b/Content/Editor/SpriteMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d775694f2a085a5c0b832f1e23779b15a4bb3d3f880c4c6ab905581109daeaa1 -size 30419 +oid sha256:356822b64d7a136161302bf2e9729595a05cbe48ec5d6d613a76a65b51dc15ca +size 30418 diff --git a/Content/Editor/Terrain/Circle Brush Material.flax b/Content/Editor/Terrain/Circle Brush Material.flax index f0b1bf574..a548ca217 100644 --- a/Content/Editor/Terrain/Circle Brush Material.flax +++ b/Content/Editor/Terrain/Circle Brush Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b737c7dba76452f41460d7154e77fd67542a404a7953afc86e67998dfc4eb606 -size 28279 +oid sha256:14111fba279c9120b92b235274a076eac5961cf1167253fa039a5f63047306bc +size 28278 diff --git a/Content/Editor/Terrain/Highlight Terrain Material.flax b/Content/Editor/Terrain/Highlight Terrain Material.flax index 39d60aa94..e10365bfc 100644 --- a/Content/Editor/Terrain/Highlight Terrain Material.flax +++ b/Content/Editor/Terrain/Highlight Terrain Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6332f569bfba65f9e58c18a209732acfbe5528c07f314e9cd9420e358add44d -size 21226 +oid sha256:370be01df92b324589f8d77e40bebf6a7fb45354629a97cb33d44f3397017a1e +size 21225 diff --git a/Content/Editor/TexturePreviewMaterial.flax b/Content/Editor/TexturePreviewMaterial.flax index de6c42add..8e532086d 100644 --- a/Content/Editor/TexturePreviewMaterial.flax +++ b/Content/Editor/TexturePreviewMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fa9d1f96fa1a1186da95fcbae62edf6cbced5b4e8636ce5c868e095bec5e199 -size 11580 +oid sha256:dd32cea0685f5a2dbf0a2a88769ab86216e0a2c68a2151c6633a0e9b736e1240 +size 11616 diff --git a/Content/Editor/Wires Debug Material.flax b/Content/Editor/Wires Debug Material.flax index a6de578cb..bd3d02858 100644 --- a/Content/Editor/Wires Debug Material.flax +++ b/Content/Editor/Wires Debug Material.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e52f792f9de44508e6d942a0b623e202e7ae2a5d9bb295ee2f1e7d807af843b -size 31923 +oid sha256:0f829e31947d6caa65e8db455296a7bef8763ad1ab632fa809f56092e89c3f61 +size 31990 diff --git a/Content/Engine/DefaultDeformableMaterial.flax b/Content/Engine/DefaultDeformableMaterial.flax index fa019e41f..96c6d15c5 100644 --- a/Content/Engine/DefaultDeformableMaterial.flax +++ b/Content/Engine/DefaultDeformableMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b585571747516bc83f16c3c168ec4c58adacdfd27497ff4a830ff26a3e296cd6 -size 19735 +oid sha256:17423362ca62e289197110f470c333c01e259f2bb15dfa8115ec768aaa980f02 +size 19024 diff --git a/Content/Engine/DefaultMaterial.flax b/Content/Engine/DefaultMaterial.flax index 44777e7e0..aabdcef9d 100644 --- a/Content/Engine/DefaultMaterial.flax +++ b/Content/Engine/DefaultMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:280fc14e0331c09731b46666429bc564158bbf55303cff31fc93f55ac987a889 -size 31794 +oid sha256:81ee2a7639bdaf6b3d716bae052cdf62ed32af58c16ad3a4f221b69aaa639de7 +size 31043 diff --git a/Content/Engine/DefaultTerrainMaterial.flax b/Content/Engine/DefaultTerrainMaterial.flax index 4c1dfcfbf..4a853f34d 100644 --- a/Content/Engine/DefaultTerrainMaterial.flax +++ b/Content/Engine/DefaultTerrainMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19682899359d6943ec3af9d93b212871e3cedceb9636bc0e1dbf1eb77be0cee7 -size 24186 +oid sha256:6800c9600db87c4aaf77dc7e230ec7c64586ba9163bd5418e6afe550ee1ee29e +size 24185 diff --git a/Content/Engine/SingleColorMaterial.flax b/Content/Engine/SingleColorMaterial.flax index feac7355e..775418ecc 100644 --- a/Content/Engine/SingleColorMaterial.flax +++ b/Content/Engine/SingleColorMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b354f128f12cdbd3785f38002db026e5663fdaea118256294fd2adfe6be7454d -size 29272 +oid sha256:8b84339f96765a05c83061d96fa48b664f6f798eee414fb7268663c34d3317fd +size 29163 diff --git a/Content/Engine/SkyboxMaterial.flax b/Content/Engine/SkyboxMaterial.flax index d983c29e3..5205a1270 100644 --- a/Content/Engine/SkyboxMaterial.flax +++ b/Content/Engine/SkyboxMaterial.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889f36aa838abb867f40f39bc1077700ae49f6dd24c6105b51816aed3efd4578 -size 31333 +oid sha256:17a880969922520f986e064c027a812ac5d68c752d78e9d6d467d0b943465867 +size 31386 diff --git a/Content/Shaders/AntiAliasing/CAS.flax b/Content/Shaders/AntiAliasing/CAS.flax new file mode 100644 index 000000000..83428ab83 --- /dev/null +++ b/Content/Shaders/AntiAliasing/CAS.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b586d681479ab0870d3e027d3d691d096eb4c3ee177ab58dc10f34f9149cb453 +size 2030 diff --git a/Content/Shaders/AntiAliasing/FXAA.flax b/Content/Shaders/AntiAliasing/FXAA.flax new file mode 100644 index 000000000..01a2caa89 --- /dev/null +++ b/Content/Shaders/AntiAliasing/FXAA.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29708294e158f83ebd9ae73fbe9c46294cb01ec4aa7e8371982a694515ab36b7 +size 24474 diff --git a/Content/Shaders/AntiAliasing/SMAA.flax b/Content/Shaders/AntiAliasing/SMAA.flax new file mode 100644 index 000000000..977b5582b --- /dev/null +++ b/Content/Shaders/AntiAliasing/SMAA.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3766f23ac9d9174ffd530f02c0860a9a0f79ff581c296aeb5c3e3a6b69c60c35 +size 46525 diff --git a/Content/Shaders/AntiAliasing/TAA.flax b/Content/Shaders/AntiAliasing/TAA.flax new file mode 100644 index 000000000..c12f02c33 --- /dev/null +++ b/Content/Shaders/AntiAliasing/TAA.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:747e6c7a66d365c7e082380440a26fb346e9f93b815fffd399f5a2f987e009a1 +size 9333 diff --git a/Content/Shaders/AtmospherePreCompute.flax b/Content/Shaders/AtmospherePreCompute.flax deleted file mode 100644 index 9a94f3938..000000000 --- a/Content/Shaders/AtmospherePreCompute.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8086fe1ee43006a13582e0b1dc7f445f87b6a201357bdc4e079495eb7fe6b7d3 -size 11408 diff --git a/Content/Shaders/BakeLightmap.flax b/Content/Shaders/BakeLightmap.flax deleted file mode 100644 index da1d4f0fc..000000000 --- a/Content/Shaders/BakeLightmap.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:595844ed7279b8c421f62c3f9d243a7c9cbba6e7063ec19c3009c34ea894ab15 -size 15783 diff --git a/Content/Shaders/BitonicSort.flax b/Content/Shaders/BitonicSort.flax deleted file mode 100644 index 7865a1355..000000000 --- a/Content/Shaders/BitonicSort.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5eaeaa83ed08b3520d7be9e32647c9e0a42a87a8cb7b0861ecff9f0e67fd0643 -size 6765 diff --git a/Content/Shaders/CAS.flax b/Content/Shaders/CAS.flax deleted file mode 100644 index dcad4b595..000000000 --- a/Content/Shaders/CAS.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe87eb5ca0054e79cded864b912884aee05e8635f71f3088d6a6c0a74d72d9c4 -size 2030 diff --git a/Content/Shaders/ColorGrading.flax b/Content/Shaders/ColorGrading.flax deleted file mode 100644 index 7dd977e12..000000000 --- a/Content/Shaders/ColorGrading.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b51bdd2a76045479c8bb6209fdf9bd2af5941c5ccc607e86672d268e0d75761c -size 12387 diff --git a/Content/Shaders/DebugDraw.flax b/Content/Shaders/DebugDraw.flax deleted file mode 100644 index 093ba3e07..000000000 --- a/Content/Shaders/DebugDraw.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6732f2ac56d05b361b06e34ce8d112d7a258ab6cd2fd82b295db5b898f15fb67 -size 1989 diff --git a/Content/Shaders/DepthOfField.flax b/Content/Shaders/DepthOfField.flax deleted file mode 100644 index a739e384c..000000000 --- a/Content/Shaders/DepthOfField.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9f769472ef9a841c0ff881615ac96d630395c187fa08289bc04451fa811b3a8 -size 13361 diff --git a/Content/Shaders/Editor/BakeLightmap.flax b/Content/Shaders/Editor/BakeLightmap.flax new file mode 100644 index 000000000..bf41eec56 --- /dev/null +++ b/Content/Shaders/Editor/BakeLightmap.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dda6c771440fb0a59a9cec7c8ca3b149edbda7ac3e116ecfd4a33b29b483e8d7 +size 15788 diff --git a/Content/Shaders/EyeAdaptation.flax b/Content/Shaders/EyeAdaptation.flax deleted file mode 100644 index bec56d5a5..000000000 --- a/Content/Shaders/EyeAdaptation.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae8a7b66e54707568f032a792eecf18c91452d315b650bb755b4edbd831f735d -size 4453 diff --git a/Content/Shaders/FXAA.flax b/Content/Shaders/FXAA.flax deleted file mode 100644 index b0f9db2cf..000000000 --- a/Content/Shaders/FXAA.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebd4e089c963ba72d8e82a19b288ab2870ec1834abcbd0d783f3b2bcd8163b41 -size 24474 diff --git a/Content/Shaders/Fog.flax b/Content/Shaders/Fog.flax deleted file mode 100644 index 2cf1eb131..000000000 --- a/Content/Shaders/Fog.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5471e1f7c6352b3e514a6c1de72751b8eee88ed8c8ec6f99f35391bd570261e8 -size 2193 diff --git a/Content/Shaders/GBuffer.flax b/Content/Shaders/GBuffer.flax index 4f2309115..6576c6051 100644 --- a/Content/Shaders/GBuffer.flax +++ b/Content/Shaders/GBuffer.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c4eca231e0b6f782dda324d47b04f13d9409fee9ae7705784ea90e3f2e34ae9 -size 3141 +oid sha256:4e8955d59e42b1ac0a3a50bfe3fefe85225de44a0ad29444c6111ef74e3a607e +size 3157 diff --git a/Content/Shaders/GI/DDGI.flax b/Content/Shaders/GI/DDGI.flax index 0ca2733b4..5da01a297 100644 --- a/Content/Shaders/GI/DDGI.flax +++ b/Content/Shaders/GI/DDGI.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d9ea5e635cd88920af65d25a88b4b23fb65fcdb867d324787fb6c02d2cfc04c -size 43029 +oid sha256:c1140b3695438e8e0f5a1126a41a54867631b31b8b5b87f8adb4ed71dc879d28 +size 43069 diff --git a/Content/Shaders/GI/GlobalSurfaceAtlas.flax b/Content/Shaders/GI/GlobalSurfaceAtlas.flax index 50c7a3de3..3b5ae814e 100644 --- a/Content/Shaders/GI/GlobalSurfaceAtlas.flax +++ b/Content/Shaders/GI/GlobalSurfaceAtlas.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:786268598e13a6d63a593f028813a207858b8e4f5a5f9cbfc4520f715e17d395 -size 14482 +oid sha256:e42b5649d558a7d192779bcbb593107394771594abebae74f9f3002fdfd894cf +size 14526 diff --git a/Content/Shaders/GPUParticlesSorting.flax b/Content/Shaders/GPUParticlesSorting.flax deleted file mode 100644 index e20e3706b..000000000 --- a/Content/Shaders/GPUParticlesSorting.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70f688f65f2858a885e6c9b4cc34c0d364a7e3d77068cde98d42b8b609483e89 -size 2504 diff --git a/Content/Shaders/GlobalSignDistanceField.flax b/Content/Shaders/GlobalSignDistanceField.flax deleted file mode 100644 index 7a5ca9b99..000000000 --- a/Content/Shaders/GlobalSignDistanceField.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc33d2361f5faf3a22262f6c69ff0c293bd18b9eadc834391968044778b94175 -size 17323 diff --git a/Content/Shaders/Histogram.flax b/Content/Shaders/Histogram.flax deleted file mode 100644 index 4a59dce84..000000000 --- a/Content/Shaders/Histogram.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf20a5d44194de2da7368860ed22ec2966eabccfc28ccc5b7bcdcb67db65910a -size 2758 diff --git a/Content/Shaders/Lighting/AtmospherePreCompute.flax b/Content/Shaders/Lighting/AtmospherePreCompute.flax new file mode 100644 index 000000000..56259f580 --- /dev/null +++ b/Content/Shaders/Lighting/AtmospherePreCompute.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a07e94f1fc0fe4c07e786bbde0daa35cae54e1021e6d777530d4dde594ad2dd +size 11417 diff --git a/Content/Shaders/Lighting/Fog.flax b/Content/Shaders/Lighting/Fog.flax new file mode 100644 index 000000000..838b72dc4 --- /dev/null +++ b/Content/Shaders/Lighting/Fog.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb54148208a0ce343cf98ae3430d5c21b48d845ba8cc7e7063eed16e56fc625c +size 2211 diff --git a/Content/Shaders/Lighting/Lights.flax b/Content/Shaders/Lighting/Lights.flax new file mode 100644 index 000000000..af4bafcac --- /dev/null +++ b/Content/Shaders/Lighting/Lights.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e922424520307e4cf1177f9fe8a822aec59b914c2ab2a0efabd20141bef41808 +size 5295 diff --git a/Content/Shaders/Lighting/SSAO.flax b/Content/Shaders/Lighting/SSAO.flax new file mode 100644 index 000000000..743ebec55 --- /dev/null +++ b/Content/Shaders/Lighting/SSAO.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60aa8964ffa4efd46827a47a81bcc9c257a079ea2fbf0b6d42bbded0d37e63f3 +size 36979 diff --git a/Content/Shaders/Lighting/Sky.flax b/Content/Shaders/Lighting/Sky.flax new file mode 100644 index 000000000..4c2c26392 --- /dev/null +++ b/Content/Shaders/Lighting/Sky.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d244950a1ef7954b2d4556daf98fdeb483e8d8ac43ae2daf9915eea2395f0ab +size 2522 diff --git a/Content/Shaders/Lighting/VolumetricFog.flax b/Content/Shaders/Lighting/VolumetricFog.flax new file mode 100644 index 000000000..f6f9a8af2 --- /dev/null +++ b/Content/Shaders/Lighting/VolumetricFog.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8cbc9303c7603b6132e4dc115a2540761d91a9b9d48b5d583b81e2d69a4e2d9 +size 13230 diff --git a/Content/Shaders/Lights.flax b/Content/Shaders/Lights.flax deleted file mode 100644 index 45f1721c6..000000000 --- a/Content/Shaders/Lights.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2d0e686f773ad585795a68a9cac081bf19d45c9483ef60dde57471a8a881b98 -size 5257 diff --git a/Content/Shaders/MotionBlur.flax b/Content/Shaders/MotionBlur.flax deleted file mode 100644 index 71690e6c2..000000000 --- a/Content/Shaders/MotionBlur.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9758cf2dcbbae8259526dd1673948d5a7dea1222e251e938fa30bcacb24a177 -size 10196 diff --git a/Content/Shaders/MultiScaler.flax b/Content/Shaders/MultiScaler.flax deleted file mode 100644 index 74b4ffa2d..000000000 --- a/Content/Shaders/MultiScaler.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61e42a01afd92fad78b021875ab0b99fbf50c586aa33eaba287f89f554f2e5b7 -size 9694 diff --git a/Content/Shaders/PostFX/ColorGrading.flax b/Content/Shaders/PostFX/ColorGrading.flax new file mode 100644 index 000000000..e52b0ec3d --- /dev/null +++ b/Content/Shaders/PostFX/ColorGrading.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ed68c936b80db5424609d97405bc1debac31c610c93aa544a29fdd038295025 +size 12401 diff --git a/Content/Shaders/PostFX/DepthOfField.flax b/Content/Shaders/PostFX/DepthOfField.flax new file mode 100644 index 000000000..0a6277890 --- /dev/null +++ b/Content/Shaders/PostFX/DepthOfField.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b942fb8c46657920d93128c57282819a3936df299899c5b8ecf1f9f340efd609 +size 13361 diff --git a/Content/Shaders/PostFX/EyeAdaptation.flax b/Content/Shaders/PostFX/EyeAdaptation.flax new file mode 100644 index 000000000..694dbce87 --- /dev/null +++ b/Content/Shaders/PostFX/EyeAdaptation.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6ed189cab0114f9ac60eff4c486c17188d530f85c36da35d8723c230e1c7259 +size 4453 diff --git a/Content/Shaders/PostFX/Histogram.flax b/Content/Shaders/PostFX/Histogram.flax new file mode 100644 index 000000000..3b28e6596 --- /dev/null +++ b/Content/Shaders/PostFX/Histogram.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b9fa6717b85bad8f07a8dc7a9b7e98742a83b553427122cbd4f0c7c05e6937d +size 2758 diff --git a/Content/Shaders/PostFX/MotionBlur.flax b/Content/Shaders/PostFX/MotionBlur.flax new file mode 100644 index 000000000..fab77d928 --- /dev/null +++ b/Content/Shaders/PostFX/MotionBlur.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e8d6c6bcec5e6efe3b5e0532d6e40a8a1ad011c81911151ad7e912dc2b26058 +size 10196 diff --git a/Content/Shaders/PostFX/PostProcessing.flax b/Content/Shaders/PostFX/PostProcessing.flax new file mode 100644 index 000000000..58898ed6c --- /dev/null +++ b/Content/Shaders/PostFX/PostProcessing.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d25cf3b5617e077664fe76c8da5f7b03eb67767e68dd5b91505c417e9300329 +size 23338 diff --git a/Content/Shaders/PostProcessing.flax b/Content/Shaders/PostProcessing.flax deleted file mode 100644 index 37d834717..000000000 --- a/Content/Shaders/PostProcessing.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c9a661a83ce1120c203347ac149fc7626bcef66386c797f4c89bc46cf42bb39 -size 23321 diff --git a/Content/Shaders/ProbesFilter.flax b/Content/Shaders/ProbesFilter.flax deleted file mode 100644 index 679eac27b..000000000 --- a/Content/Shaders/ProbesFilter.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbe90799accc93fabdc900df37bf762132037eeaff17f5731f379b6b3d017d2b -size 2033 diff --git a/Content/Shaders/Reflections.flax b/Content/Shaders/Reflections.flax deleted file mode 100644 index a06db8606..000000000 --- a/Content/Shaders/Reflections.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a1cf9e6352827d24c586ebff85cdd6820a8e90410f4b1c6a06c4e87dcdd0cc1 -size 3615 diff --git a/Content/Shaders/Reflections/ProbesFilter.flax b/Content/Shaders/Reflections/ProbesFilter.flax new file mode 100644 index 000000000..75dd61058 --- /dev/null +++ b/Content/Shaders/Reflections/ProbesFilter.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f96d4fbf33c810c10ba1d167ac4babe67e2a22aa463cd736b7fbba83b35308dc +size 2050 diff --git a/Content/Shaders/Reflections/Reflections.flax b/Content/Shaders/Reflections/Reflections.flax new file mode 100644 index 000000000..b24e899c7 --- /dev/null +++ b/Content/Shaders/Reflections/Reflections.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33e4f8050fad29314354f094342c3351cd936aef5e88ac28b1b69b6d4a6904cb +size 3641 diff --git a/Content/Shaders/Reflections/SSR.flax b/Content/Shaders/Reflections/SSR.flax new file mode 100644 index 000000000..395193b12 --- /dev/null +++ b/Content/Shaders/Reflections/SSR.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06cde969b6724b7b996b7f837c7637f5aef6ca831bccb2dcf53c36b5f33ddc76 +size 11706 diff --git a/Content/Shaders/SDF.flax b/Content/Shaders/SDF.flax deleted file mode 100644 index 709cc20f2..000000000 --- a/Content/Shaders/SDF.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3922811f0eb56cbb515c93cd53d80316740ea78219aa81118d2c9dee4a9d230 -size 4142 diff --git a/Content/Shaders/SMAA.flax b/Content/Shaders/SMAA.flax deleted file mode 100644 index 1f48782c9..000000000 --- a/Content/Shaders/SMAA.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc656a344b32043fe8998d0b4966da591f141655fd2db66fa727a87da02dedef -size 46525 diff --git a/Content/Shaders/SSAO.flax b/Content/Shaders/SSAO.flax deleted file mode 100644 index cfe92b71d..000000000 --- a/Content/Shaders/SSAO.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73d13eacaf02ba27354b817cc639bde59e2afdc3a8d848de6d17981b5bb48cbe -size 36979 diff --git a/Content/Shaders/SSR.flax b/Content/Shaders/SSR.flax deleted file mode 100644 index d08ca6967..000000000 --- a/Content/Shaders/SSR.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a70e6309f34053df386c71be696a09552212874cd33ac4b8aeec9216ec178591 -size 11654 diff --git a/Content/Shaders/Shadows.flax b/Content/Shaders/Shadows.flax deleted file mode 100644 index 839932ccb..000000000 --- a/Content/Shaders/Shadows.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1e60fffcee2b7ba24a998d82da829f021200d456b89236759ea311895092498 -size 7868 diff --git a/Content/Shaders/Shadows/Shadows.flax b/Content/Shaders/Shadows/Shadows.flax new file mode 100644 index 000000000..24f34c0dd --- /dev/null +++ b/Content/Shaders/Shadows/Shadows.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de6ff4750bc55f64b2ebee282234d900882a1e7052051e03319190a76042fef +size 7881 diff --git a/Content/Shaders/Sky.flax b/Content/Shaders/Sky.flax deleted file mode 100644 index 3932bd464..000000000 --- a/Content/Shaders/Sky.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44dd0411d0c31a0ad4b5d00dd2a09ded88b98e387ba33d77a5a3e47da927ec30 -size 2538 diff --git a/Content/Shaders/TAA.flax b/Content/Shaders/TAA.flax deleted file mode 100644 index 03b4f101d..000000000 --- a/Content/Shaders/TAA.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90444dccb05f8ae91098dfec2b8827939d34e221a110e2e8b16ab029ab94d901 -size 9315 diff --git a/Content/Shaders/Utils/BitonicSort.flax b/Content/Shaders/Utils/BitonicSort.flax new file mode 100644 index 000000000..6169d7eaf --- /dev/null +++ b/Content/Shaders/Utils/BitonicSort.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9441185d607c868c76a7015cdbb2526440672b694d03198e6dd2a0bbb61c484e +size 6770 diff --git a/Content/Shaders/Utils/DebugDraw.flax b/Content/Shaders/Utils/DebugDraw.flax new file mode 100644 index 000000000..b7f3e2453 --- /dev/null +++ b/Content/Shaders/Utils/DebugDraw.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3057a3375983cd8e66d7c7dee2a96207ab6c1d3aec73a37beb07cfae5d4394e3 +size 1989 diff --git a/Content/Shaders/Utils/GPUParticlesSorting.flax b/Content/Shaders/Utils/GPUParticlesSorting.flax new file mode 100644 index 000000000..91a117548 --- /dev/null +++ b/Content/Shaders/Utils/GPUParticlesSorting.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb262fba593d9a00073ac89c83224d83dd36af92a15643a37d4f9918e61c7d12 +size 2504 diff --git a/Content/Shaders/Utils/GlobalSignDistanceField.flax b/Content/Shaders/Utils/GlobalSignDistanceField.flax new file mode 100644 index 000000000..f23b00b68 --- /dev/null +++ b/Content/Shaders/Utils/GlobalSignDistanceField.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cc3e734c3dfc303ecddfb331e5c3c07a896008eef10ea4bae357e23734df18d +size 17350 diff --git a/Content/Shaders/Utils/MultiScaler.flax b/Content/Shaders/Utils/MultiScaler.flax new file mode 100644 index 000000000..3d85d9076 --- /dev/null +++ b/Content/Shaders/Utils/MultiScaler.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54e9dc715c0778cb12dde21b3c6d30e47bb5bcdb9a321f8c2e7aeb766d7e986d +size 9694 diff --git a/Content/Shaders/Utils/SDF.flax b/Content/Shaders/Utils/SDF.flax new file mode 100644 index 000000000..274784e8b --- /dev/null +++ b/Content/Shaders/Utils/SDF.flax @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae2504c689869c93a05a19008cd19f976728d4d41d8586ac3e2583ff1308790a +size 4148 diff --git a/Content/Shaders/VolumetricFog.flax b/Content/Shaders/VolumetricFog.flax deleted file mode 100644 index dc7a7def9..000000000 --- a/Content/Shaders/VolumetricFog.flax +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a60b76e8710d8c748529d7ca52786a0103e89649b567b6c9763d0855e75918a9 -size 13199 diff --git a/Flax.flaxproj b/Flax.flaxproj index 13b0f0b9d..d3f33c8b1 100644 --- a/Flax.flaxproj +++ b/Flax.flaxproj @@ -4,7 +4,7 @@ "Major": 1, "Minor": 13, "Revision": 0, - "Build": 7008 + "Build": 7010 }, "Company": "Flax", "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.", diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp index 2fce92cf6..ff4f2fb91 100644 --- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp +++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp @@ -6,7 +6,7 @@ #include "Engine/Core/Collections/Sorting.h" #include "Engine/Core/Config/BuildSettings.h" #include "Engine/Core/Config/GameSettings.h" -#include "Engine/Renderer/ReflectionsPass.h" +#include "Engine/Renderer/Reflections/ReflectionsPass.h" #include "Engine/Renderer/AntiAliasing/SMAA.h" #include "Engine/Engine/Globals.h" #include "Editor/Cooker/PlatformTools.h" @@ -383,37 +383,38 @@ bool DeployDataStep::Perform(CookingData& data) GameCooker::DeployFiles(); // Register engine in-build assets - data.AddRootEngineAsset(TEXT("Shaders/AtmospherePreCompute")); - data.AddRootEngineAsset(TEXT("Shaders/ColorGrading")); - data.AddRootEngineAsset(TEXT("Shaders/DebugDraw")); - data.AddRootEngineAsset(TEXT("Shaders/DepthOfField")); - data.AddRootEngineAsset(TEXT("Shaders/EyeAdaptation")); - data.AddRootEngineAsset(TEXT("Shaders/Fog")); + data.AddRootEngineAsset(TEXT("Shaders/AntiAliasing/CAS")); + data.AddRootEngineAsset(TEXT("Shaders/AntiAliasing/FXAA")); + data.AddRootEngineAsset(TEXT("Shaders/AntiAliasing/SMAA")); + data.AddRootEngineAsset(TEXT("Shaders/AntiAliasing/TAA")); + data.AddRootEngineAsset(TEXT("Shaders/GI/DDGI")); + data.AddRootEngineAsset(TEXT("Shaders/GI/GlobalSurfaceAtlas")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/AtmospherePreCompute")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/Fog")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/Lights")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/Sky")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/SSAO")); + data.AddRootEngineAsset(TEXT("Shaders/Lighting/VolumetricFog")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/ColorGrading")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/DepthOfField")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/EyeAdaptation")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/Histogram")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/MotionBlur")); + data.AddRootEngineAsset(TEXT("Shaders/PostFX/PostProcessing")); + data.AddRootEngineAsset(TEXT("Shaders/Reflections/ProbesFilter")); + data.AddRootEngineAsset(TEXT("Shaders/Reflections/Reflections")); + data.AddRootEngineAsset(TEXT("Shaders/Reflections/SSR")); + data.AddRootEngineAsset(TEXT("Shaders/Shadows/Shadows")); + data.AddRootEngineAsset(TEXT("Shaders/Utils/BitonicSort")); + //data.AddRootEngineAsset(TEXT("Shaders/Utils/DebugDraw")); // TODO: debug draw in dev-builds + data.AddRootEngineAsset(TEXT("Shaders/Utils/GlobalSignDistanceField")); + data.AddRootEngineAsset(TEXT("Shaders/Utils/GPUParticlesSorting")); + data.AddRootEngineAsset(TEXT("Shaders/Utils/MultiScaler")); + data.AddRootEngineAsset(TEXT("Shaders/Utils/SDF")); data.AddRootEngineAsset(TEXT("Shaders/Forward")); - data.AddRootEngineAsset(TEXT("Shaders/FXAA")); - data.AddRootEngineAsset(TEXT("Shaders/TAA")); - data.AddRootEngineAsset(TEXT("Shaders/SMAA")); data.AddRootEngineAsset(TEXT("Shaders/GBuffer")); data.AddRootEngineAsset(TEXT("Shaders/GUI")); - data.AddRootEngineAsset(TEXT("Shaders/Histogram")); - data.AddRootEngineAsset(TEXT("Shaders/Lights")); - data.AddRootEngineAsset(TEXT("Shaders/MultiScaler")); - data.AddRootEngineAsset(TEXT("Shaders/ProbesFilter")); - data.AddRootEngineAsset(TEXT("Shaders/PostProcessing")); - data.AddRootEngineAsset(TEXT("Shaders/MotionBlur")); - data.AddRootEngineAsset(TEXT("Shaders/BitonicSort")); - data.AddRootEngineAsset(TEXT("Shaders/GPUParticlesSorting")); - data.AddRootEngineAsset(TEXT("Shaders/GlobalSignDistanceField")); - data.AddRootEngineAsset(TEXT("Shaders/GI/GlobalSurfaceAtlas")); - data.AddRootEngineAsset(TEXT("Shaders/GI/DDGI")); data.AddRootEngineAsset(TEXT("Shaders/Quad")); - data.AddRootEngineAsset(TEXT("Shaders/Reflections")); - data.AddRootEngineAsset(TEXT("Shaders/Shadows")); - data.AddRootEngineAsset(TEXT("Shaders/Sky")); - data.AddRootEngineAsset(TEXT("Shaders/SSAO")); - data.AddRootEngineAsset(TEXT("Shaders/SSR")); - data.AddRootEngineAsset(TEXT("Shaders/SDF")); - data.AddRootEngineAsset(TEXT("Shaders/VolumetricFog")); if (data.Configuration != BuildConfiguration::Release) { data.AddRootEngineAsset(TEXT("Shaders/Editor/LightmapUVsDensity")); diff --git a/Source/Editor/Managed/ManagedEditor.cpp b/Source/Editor/Managed/ManagedEditor.cpp index b4178fb89..d2866f4f4 100644 --- a/Source/Editor/Managed/ManagedEditor.cpp +++ b/Source/Editor/Managed/ManagedEditor.cpp @@ -17,7 +17,7 @@ #include "Engine/Level/Actor.h" #include "Engine/CSG/CSGBuilder.h" #include "Engine/Engine/CommandLine.h" -#include "Engine/Renderer/ProbesRenderer.h" +#include "Engine/Renderer/Reflections/ProbesRenderer.h" #include "Engine/Animations/Graph/AnimGraph.h" #include "Engine/Core/ObjectsRemovalService.h" #include "Engine/Level/Prefabs/Prefab.h" diff --git a/Source/Engine/Debug/DebugDraw.cpp b/Source/Engine/Debug/DebugDraw.cpp index a0c19a28e..e22e3ebd0 100644 --- a/Source/Engine/Debug/DebugDraw.cpp +++ b/Source/Engine/Debug/DebugDraw.cpp @@ -675,7 +675,7 @@ void DebugDrawService::Update() // Lazy-init resources if (DebugDrawShader == nullptr) { - DebugDrawShader = Content::LoadAsyncInternal(TEXT("Shaders/DebugDraw")); + DebugDrawShader = Content::LoadAsyncInternal(TEXT("Shaders/Utils/DebugDraw")); if (DebugDrawShader == nullptr) { LOG(Fatal, "Cannot load DebugDraw shader"); diff --git a/Source/Engine/Graphics/Materials/MaterialParams.cpp b/Source/Engine/Graphics/Materials/MaterialParams.cpp index 5e42f004b..9b1037eeb 100644 --- a/Source/Engine/Graphics/Materials/MaterialParams.cpp +++ b/Source/Engine/Graphics/Materials/MaterialParams.cpp @@ -12,7 +12,7 @@ #include "Engine/Graphics/RenderBuffers.h" #include "Engine/Graphics/GPUDevice.h" #include "Engine/Graphics/RenderTask.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" #include "Engine/Scripting/Enums.h" #include "Engine/Streaming/Streaming.h" #include "Engine/Profiler/ProfilerMemory.h" diff --git a/Source/Engine/Graphics/Materials/MaterialShader.h b/Source/Engine/Graphics/Materials/MaterialShader.h index e114baff8..3736c2b8b 100644 --- a/Source/Engine/Graphics/Materials/MaterialShader.h +++ b/Source/Engine/Graphics/Materials/MaterialShader.h @@ -10,7 +10,7 @@ /// /// Current materials shader version. /// -#define MATERIAL_GRAPH_VERSION 186 +#define MATERIAL_GRAPH_VERSION 187 class Material; class GPUShader; diff --git a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp index 8dfb014b3..bc679ae6d 100644 --- a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp +++ b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp @@ -5,8 +5,8 @@ #include "Engine/Graphics/RenderBuffers.h" #include "Engine/Graphics/Textures/GPUTexture.h" #include "Engine/Renderer/RenderList.h" -#include "Engine/Renderer/ShadowsPass.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Lighting/ShadowsPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" #if USE_EDITOR #include "Engine/Renderer/Lightmaps.h" #endif @@ -14,7 +14,7 @@ #include "Engine/Graphics/GPUContext.h" #include "Engine/Level/Scene/Lightmap.h" #include "Engine/Level/Actors/EnvironmentProbe.h" -#include "Engine/Renderer/ReflectionsPass.h" +#include "Engine/Renderer/Reflections/ReflectionsPass.h" void ForwardShadingFeature::Bind(MaterialShader::BindParameters& params, Span& cb, int32& srv) { diff --git a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h index a7abb465d..a80b3959e 100644 --- a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h +++ b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h @@ -5,8 +5,8 @@ #include "MaterialShader.h" #include "Engine/Core/Types/Span.h" #include "Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" #include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" // Material shader features are plugin-based functionalities that are reusable between different material domains. struct MaterialShaderFeature diff --git a/Source/Engine/Graphics/Materials/VolumeParticleMaterialShader.cpp b/Source/Engine/Graphics/Materials/VolumeParticleMaterialShader.cpp index 3509b5767..d3fc53721 100644 --- a/Source/Engine/Graphics/Materials/VolumeParticleMaterialShader.cpp +++ b/Source/Engine/Graphics/Materials/VolumeParticleMaterialShader.cpp @@ -5,8 +5,8 @@ #include "MaterialParams.h" #include "Engine/Core/Math/Matrix3x4.h" #include "Engine/Renderer/DrawCall.h" -#include "Engine/Renderer/VolumetricFogPass.h" #include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/Lighting/VolumetricFogPass.h" #include "Engine/Graphics/RenderView.h" #include "Engine/Graphics/GPUContext.h" #include "Engine/Graphics/GPUDevice.h" diff --git a/Source/Engine/Level/Actors/EnvironmentProbe.cpp b/Source/Engine/Level/Actors/EnvironmentProbe.cpp index 899cb886f..54c27c3e6 100644 --- a/Source/Engine/Level/Actors/EnvironmentProbe.cpp +++ b/Source/Engine/Level/Actors/EnvironmentProbe.cpp @@ -9,8 +9,8 @@ #include "Engine/Graphics/Textures/TextureData.h" #include "Engine/Renderer/RenderList.h" #include "Engine/Graphics/RenderContext.h" -#include "Engine/Renderer/ProbesRenderer.h" -#include "Engine/Renderer/ReflectionsPass.h" +#include "Engine/Renderer/Reflections/ProbesRenderer.h" +#include "Engine/Renderer/Reflections/ReflectionsPass.h" #include "Engine/Content/Content.h" #include "Engine/Content/Deprecated.h" #include "Engine/ContentExporters/AssetExporters.h" diff --git a/Source/Engine/Level/Actors/ExponentialHeightFog.cpp b/Source/Engine/Level/Actors/ExponentialHeightFog.cpp index f10819b38..ce6807095 100644 --- a/Source/Engine/Level/Actors/ExponentialHeightFog.cpp +++ b/Source/Engine/Level/Actors/ExponentialHeightFog.cpp @@ -21,7 +21,7 @@ ExponentialHeightFog::ExponentialHeightFog(const SpawnParams& params) _drawCategory = SceneRendering::PreRender; // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Fog")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/Fog")); if (_shader == nullptr) { LOG(Fatal, "Cannot load fog shader."); diff --git a/Source/Engine/Level/Actors/Sky.cpp b/Source/Engine/Level/Actors/Sky.cpp index 773546b76..b62460f7c 100644 --- a/Source/Engine/Level/Actors/Sky.cpp +++ b/Source/Engine/Level/Actors/Sky.cpp @@ -5,8 +5,8 @@ #include "Engine/Core/Math/Color.h" #include "Engine/Content/Content.h" #include "Engine/Renderer/RenderList.h" -#include "Engine/Renderer/AtmospherePreCompute.h" #include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/Lighting/AtmospherePreCompute.h" #include "Engine/Graphics/RenderBuffers.h" #include "Engine/Graphics/RenderView.h" #include "Engine/Graphics/RenderContext.h" @@ -36,7 +36,7 @@ Sky::Sky(const SpawnParams& params) _drawCategory = SceneRendering::PreRender; // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Sky")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/Sky")); if (_shader == nullptr) { LOG(Fatal, "Cannot load sky shader."); diff --git a/Source/Engine/Level/Actors/SkyLight.cpp b/Source/Engine/Level/Actors/SkyLight.cpp index 7f4e588c9..82011a029 100644 --- a/Source/Engine/Level/Actors/SkyLight.cpp +++ b/Source/Engine/Level/Actors/SkyLight.cpp @@ -12,8 +12,8 @@ #include "Engine/Graphics/Textures/TextureData.h" #include "Engine/Renderer/RenderList.h" #include "Engine/Graphics/RenderContext.h" -#include "Engine/Renderer/ProbesRenderer.h" #include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/Reflections/ProbesRenderer.h" #include "Engine/Content/Content.h" #include "Engine/Serialization/Serialization.h" #include "Engine/ContentImporters/AssetsImportingManager.h" diff --git a/Source/Engine/Level/Actors/StaticModel.cpp b/Source/Engine/Level/Actors/StaticModel.cpp index 5d9370d86..5fe92ace8 100644 --- a/Source/Engine/Level/Actors/StaticModel.cpp +++ b/Source/Engine/Level/Actors/StaticModel.cpp @@ -16,7 +16,7 @@ #include "Engine/Level/Prefabs/PrefabManager.h" #include "Engine/Level/Scene/Scene.h" #include "Engine/Renderer/DrawCall.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" #include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h" #include "Engine/Utilities/Encryption.h" #if USE_EDITOR diff --git a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.ParticleModules.cpp b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.ParticleModules.cpp index 331e69c15..73b0f5646 100644 --- a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.ParticleModules.cpp +++ b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.ParticleModules.cpp @@ -207,7 +207,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node) auto roughness = tryGetValue(node->GetBox(3), 5, Value::Zero).AsFloat(); auto intensity = tryGetValue(node->GetBox(4), 6, Value::Zero).AsFloat(); auto octavesCount = tryGetValue(node->GetBox(5), 7, Value::Zero).AsInt(); - _includes.Add(TEXT("./Flax/Noise.hlsl")); + _includes.Add(TEXT("./Flax/Math/Noise.hlsl")); // TODO: build fieldTransformMatrix and invFieldTransformMatrix on CPU and pass in constant buffer - no need to support field transform per particle _writer.Write( TEXT( @@ -619,7 +619,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node) String wsPos = position.Value; if (IsLocalSimulationSpace()) wsPos = String::Format(TEXT("mul(float4({0}, 1), WorldMatrix).xyz"), wsPos); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); _writer.Write( TEXT( " {{\n" @@ -900,7 +900,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node) const Value stickForce = GetValue(node->GetBox(3), 5).AsFloat(); auto param = findOrAddGlobalSDF(); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); _writer.Write( TEXT( " {{\n" @@ -924,7 +924,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node) { COLLISION_BEGIN(); auto param = findOrAddGlobalSDF(); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); const Char* format = IsLocalSimulationSpace() ? TEXT( " {{\n" diff --git a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp index bef54d1b3..cef8eee3b 100644 --- a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp +++ b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp @@ -312,7 +312,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val Value worldPosition = tryGetValue(node->GetBox(1), Value(VariantType::Float3, TEXT("input.WorldPosition.xyz"))).Cast(VariantType::Float3); Value startCascade = tryGetValue(node->TryGetBox(2), 0, Value::Zero).Cast(VariantType::Uint); value = writeLocal(VariantType::Float, String::Format(TEXT("SampleGlobalSDF({0}, {0}_Tex, {0}_Mip, {1}, {2})"), param.ShaderName, worldPosition.Value, startCascade.Value), node); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); break; } // Sample Global SDF Gradient @@ -325,7 +325,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val Value startCascade = tryGetValue(node->TryGetBox(3), 0, Value::Zero).Cast(VariantType::Uint); auto distance = writeLocal(VariantType::Float, node); auto gradient = writeLocal(VariantType::Float3, String::Format(TEXT("SampleGlobalSDFGradient({0}, {0}_Tex, {0}_Mip, {1}, {2}, {3})"), param.ShaderName, worldPosition.Value, distance.Value, startCascade.Value), node); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); gradientBox->Cache = gradient; distanceBox->Cache = distance; value = box == gradientBox ? gradient : distance; diff --git a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.h b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.h index 62b183004..524ca3c48 100644 --- a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.h +++ b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.h @@ -5,7 +5,7 @@ /// /// Current GPU particles emitter shader version. /// -#define PARTICLE_GPU_GRAPH_VERSION 12 +#define PARTICLE_GPU_GRAPH_VERSION 13 #if COMPILE_WITH_PARTICLE_GPU_GRAPH diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp index d70d1a570..a9d3bcf0f 100644 --- a/Source/Engine/Particles/Particles.cpp +++ b/Source/Engine/Particles/Particles.cpp @@ -698,7 +698,7 @@ void DrawEmittersGPU(GPUContext* context, RenderContextBatch& renderContextBatch if (sorting && GPUParticlesSorting == nullptr) { // TODO: preload shader if platform supports GPU particles (eg. inside ParticleEmitter::load if it's GPU sim with any sort module) - GPUParticlesSorting = Content::LoadAsyncInternal(TEXT("Shaders/GPUParticlesSorting")); + GPUParticlesSorting = Content::LoadAsyncInternal(TEXT("Shaders/Utils/GPUParticlesSorting")); #if COMPILE_WITH_DEV_ENV if (GPUParticlesSorting) GPUParticlesSorting.Get()->Reloading.Bind(); diff --git a/Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.cpp b/Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.cpp similarity index 97% rename from Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.cpp rename to Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.cpp index ab157f13f..6f02935c0 100644 --- a/Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.cpp +++ b/Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ContrastAdaptiveSharpeningPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" #include "Engine/Graphics/GPUContext.h" @@ -38,7 +38,7 @@ bool ContrastAdaptiveSharpeningPass::setupResources() if (_lazyInit && !_shader) { _lazyInit = false; - _shader = Content::LoadAsyncInternal(TEXT("Shaders/CAS")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/AntiAliasing/CAS")); if (!_shader) return true; BIND_SHADER_RELOADING(_shader, ContrastAdaptiveSharpeningPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.h b/Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.h similarity index 95% rename from Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.h rename to Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.h index 53d33ff83..639460397 100644 --- a/Source/Engine/Renderer/ContrastAdaptiveSharpeningPass.h +++ b/Source/Engine/Renderer/AntiAliasing/ContrastAdaptiveSharpeningPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/PostProcessSettings.h" /// diff --git a/Source/Engine/Renderer/AntiAliasing/FXAA.cpp b/Source/Engine/Renderer/AntiAliasing/FXAA.cpp index a6ad556d9..229ec9805 100644 --- a/Source/Engine/Renderer/AntiAliasing/FXAA.cpp +++ b/Source/Engine/Renderer/AntiAliasing/FXAA.cpp @@ -20,7 +20,7 @@ String FXAA::ToString() const bool FXAA::Init() { _psFXAA.CreatePipelineStates(); - _shader = Content::LoadAsyncInternal(TEXT("Shaders/FXAA")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/AntiAliasing/FXAA")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, FXAA, OnShaderReloading); diff --git a/Source/Engine/Renderer/AntiAliasing/FXAA.h b/Source/Engine/Renderer/AntiAliasing/FXAA.h index 5bcbc1534..c66f09e72 100644 --- a/Source/Engine/Renderer/AntiAliasing/FXAA.h +++ b/Source/Engine/Renderer/AntiAliasing/FXAA.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" /// diff --git a/Source/Engine/Renderer/AntiAliasing/SMAA.cpp b/Source/Engine/Renderer/AntiAliasing/SMAA.cpp index f53b2d943..de1a204a7 100644 --- a/Source/Engine/Renderer/AntiAliasing/SMAA.cpp +++ b/Source/Engine/Renderer/AntiAliasing/SMAA.cpp @@ -33,7 +33,7 @@ bool SMAA::setupResources() _psNeighbor = GPUDevice::Instance->CreatePipelineState(); // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/SMAA")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/AntiAliasing/SMAA")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, SMAA, OnShaderReloading); diff --git a/Source/Engine/Renderer/AntiAliasing/SMAA.h b/Source/Engine/Renderer/AntiAliasing/SMAA.h index 2f685d417..e29f6431e 100644 --- a/Source/Engine/Renderer/AntiAliasing/SMAA.h +++ b/Source/Engine/Renderer/AntiAliasing/SMAA.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" #define SMAA_AREA_TEX TEXT("Engine/Textures/SMAA_AreaTex") diff --git a/Source/Engine/Renderer/AntiAliasing/TAA.cpp b/Source/Engine/Renderer/AntiAliasing/TAA.cpp index cda294886..2a890879d 100644 --- a/Source/Engine/Renderer/AntiAliasing/TAA.cpp +++ b/Source/Engine/Renderer/AntiAliasing/TAA.cpp @@ -6,12 +6,12 @@ #include "Engine/Graphics/GPUContext.h" #include "Engine/Graphics/RenderTargetPool.h" #include "Engine/Graphics/RenderBuffers.h" -#include "Engine/Renderer/RenderList.h" #include "Engine/Graphics/RenderContext.h" +#include "Engine/Graphics/RenderTools.h" +#include "Engine/Graphics/Graphics.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Renderer/GBufferPass.h" #include "Engine/Engine/Engine.h" -#include "Engine/Graphics/Graphics.h" -#include "Engine/Graphics/RenderTools.h" GPU_CB_STRUCT(Data { Float2 ScreenSizeInv; @@ -27,7 +27,7 @@ GPU_CB_STRUCT(Data { bool TAA::Init() { _psTAA.CreatePipelineStates(); - _shader = Content::LoadAsyncInternal(TEXT("Shaders/TAA")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/AntiAliasing/TAA")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, TAA, OnShaderReloading); diff --git a/Source/Engine/Renderer/AntiAliasing/TAA.h b/Source/Engine/Renderer/AntiAliasing/TAA.h index 9d029cc33..7c9829bbb 100644 --- a/Source/Engine/Renderer/AntiAliasing/TAA.h +++ b/Source/Engine/Renderer/AntiAliasing/TAA.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" /// diff --git a/Source/Engine/Renderer/ForwardPass.cpp b/Source/Engine/Renderer/ForwardPass.cpp index e82822fc6..520866421 100644 --- a/Source/Engine/Renderer/ForwardPass.cpp +++ b/Source/Engine/Renderer/ForwardPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ForwardPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Core/Collections/Sorting.h" #include "Engine/Content/Assets/Model.h" #include "Engine/Content/Assets/Shader.h" diff --git a/Source/Engine/Renderer/ForwardPass.h b/Source/Engine/Renderer/ForwardPass.h index be3126e0e..33e20894a 100644 --- a/Source/Engine/Renderer/ForwardPass.h +++ b/Source/Engine/Renderer/ForwardPass.h @@ -2,8 +2,7 @@ #pragma once -#include "Engine/Graphics/RenderView.h" -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Content/Assets/Shader.h" /// diff --git a/Source/Engine/Renderer/GBufferPass.cpp b/Source/Engine/Renderer/GBufferPass.cpp index fc2726eab..1a1e2929b 100644 --- a/Source/Engine/Renderer/GBufferPass.cpp +++ b/Source/Engine/Renderer/GBufferPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "GBufferPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #if GPU_ENABLE_DEVELOPMENT #include "Engine/Renderer/Editor/VertexColors.h" #include "Engine/Renderer/Editor/LightmapUVsDensity.h" @@ -13,7 +13,6 @@ #include "Engine/Graphics/GPUContext.h" #include "Engine/Graphics/GPUPass.h" #include "Engine/Graphics/Shaders/GPUShader.h" -#include "Engine/Graphics/RenderTask.h" #include "Engine/Graphics/RenderContext.h" #include "Engine/Graphics/RenderBuffers.h" #include "Engine/Graphics/RenderTargetPool.h" diff --git a/Source/Engine/Renderer/GBufferPass.h b/Source/Engine/Renderer/GBufferPass.h index db404dd94..9c8fa15bf 100644 --- a/Source/Engine/Renderer/GBufferPass.h +++ b/Source/Engine/Renderer/GBufferPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #if GPU_ENABLE_DEVELOPMENT #include "Engine/Core/Collections/Dictionary.h" #endif diff --git a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp index 58ddd4f20..e3cafc82d 100644 --- a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp +++ b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp @@ -2,8 +2,6 @@ #include "DynamicDiffuseGlobalIllumination.h" #include "GlobalSurfaceAtlasPass.h" -#include "../GlobalSignDistanceFieldPass.h" -#include "../RenderList.h" #include "Engine/Core/Random.h" #include "Engine/Core/Types/Variant.h" #include "Engine/Core/Math/Int3.h" @@ -26,8 +24,10 @@ #include "Engine/Graphics/RenderContext.h" #include "Engine/Graphics/Shaders/GPUShader.h" #include "Engine/Level/Actors/BrushMode.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Renderer/GBufferPass.h" #include "Engine/Renderer/Utils/MultiScaler.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" // Implementation based on: // "Dynamic Diffuse Global Illumination with Ray-Traced Irradiance Probes", Journal of Computer Graphics Tools, April 2019 diff --git a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h index 2f6ebdc6f..abbf1ae0c 100644 --- a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h +++ b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Core/Math/Int4.h" #include "Engine/Graphics/Textures/GPUTexture.h" diff --git a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp index b8bc5d6ae..c572a168a 100644 --- a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp +++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp @@ -2,10 +2,8 @@ #include "GlobalSurfaceAtlasPass.h" #include "DynamicDiffuseGlobalIllumination.h" -#include "../GlobalSignDistanceFieldPass.h" #include "../GBufferPass.h" #include "../RenderList.h" -#include "../ShadowsPass.h" #include "Engine/Core/Math/Matrix3x3.h" #include "Engine/Core/Math/OrientedBoundingBox.h" #include "Engine/Core/Collections/Sorting.h" @@ -25,9 +23,11 @@ #include "Engine/Graphics/Shaders/GPUVertexLayout.h" #include "Engine/Level/Actors/StaticModel.h" #include "Engine/Level/Scene/SceneRendering.h" -#include "Engine/Renderer/ColorGradingPass.h" -#include "Engine/Renderer/EyeAdaptationPass.h" -#include "Engine/Renderer/PostProcessingPass.h" +#include "Engine/Renderer/Lighting/ShadowsPass.h" +#include "Engine/Renderer/PostFX/ColorGradingPass.h" +#include "Engine/Renderer/PostFX/EyeAdaptationPass.h" +#include "Engine/Renderer/PostFX/PostProcessingPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" #include "Engine/Threading/JobSystem.h" #include "Engine/Utilities/RectPack.h" diff --git a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h index 05da101d5..8618ecb8c 100644 --- a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h +++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" /// /// Global Surface Atlas rendering pass. Captures scene geometry into a single atlas texture which contains surface diffuse color, normal vector, emission light, and calculates direct+indirect lighting. Used by Global Illumination and Reflections. diff --git a/Source/Engine/Renderer/AmbientOcclusionPass.cpp b/Source/Engine/Renderer/Lighting/AmbientOcclusionPass.cpp similarity index 99% rename from Source/Engine/Renderer/AmbientOcclusionPass.cpp rename to Source/Engine/Renderer/Lighting/AmbientOcclusionPass.cpp index 7816e6baf..599f31329 100644 --- a/Source/Engine/Renderer/AmbientOcclusionPass.cpp +++ b/Source/Engine/Renderer/Lighting/AmbientOcclusionPass.cpp @@ -1,8 +1,8 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "AmbientOcclusionPass.h" -#include "RenderList.h" -#include "GBufferPass.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/GBufferPass.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" #include "Engine/Graphics/Graphics.h" @@ -102,7 +102,7 @@ bool AmbientOcclusionPass::Init() _depthBounds = GPUDevice::Instance->Limits.HasDepthBounds && GPUDevice::Instance->Limits.HasReadOnlyDepth; // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/SSAO")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/SSAO")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, AmbientOcclusionPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/AmbientOcclusionPass.h b/Source/Engine/Renderer/Lighting/AmbientOcclusionPass.h similarity index 99% rename from Source/Engine/Renderer/AmbientOcclusionPass.h rename to Source/Engine/Renderer/Lighting/AmbientOcclusionPass.h index 16e3db3d5..c814fdf33 100644 --- a/Source/Engine/Renderer/AmbientOcclusionPass.h +++ b/Source/Engine/Renderer/Lighting/AmbientOcclusionPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" // Config #define SSAO_DEPTH_MIP_LEVELS 4 // <- must match shader define diff --git a/Source/Engine/Renderer/AtmospherePreCompute.cpp b/Source/Engine/Renderer/Lighting/AtmospherePreCompute.cpp similarity index 99% rename from Source/Engine/Renderer/AtmospherePreCompute.cpp rename to Source/Engine/Renderer/Lighting/AtmospherePreCompute.cpp index a60a7c798..49edcb54a 100644 --- a/Source/Engine/Renderer/AtmospherePreCompute.cpp +++ b/Source/Engine/Renderer/Lighting/AtmospherePreCompute.cpp @@ -1,6 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "AtmospherePreCompute.h" +#include "Engine/Core/Log.h" #include "Engine/Engine/Engine.h" #include "Engine/Engine/Time.h" #include "Engine/Content/Content.h" @@ -13,7 +14,8 @@ #include "Engine/Graphics/Textures/GPUTexture.h" #include "Engine/Graphics/Textures/TextureData.h" #include "Engine/Platform/Window.h" -#include "RendererPass.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/AssetReference.h" #include "Engine/Graphics/RenderTargetPool.h" @@ -285,7 +287,7 @@ void AtmospherePreComputeService::Update() // Wait for the shader if (!_shader) - _shader = Content::LoadAsyncInternal(TEXT("Shaders/AtmospherePreCompute")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/AtmospherePreCompute")); if (_shader && !_shader->IsLoaded()) return; if (InitAtmospherePreCompute()) diff --git a/Source/Engine/Renderer/AtmospherePreCompute.h b/Source/Engine/Renderer/Lighting/AtmospherePreCompute.h similarity index 100% rename from Source/Engine/Renderer/AtmospherePreCompute.h rename to Source/Engine/Renderer/Lighting/AtmospherePreCompute.h diff --git a/Source/Engine/Renderer/LightPass.cpp b/Source/Engine/Renderer/Lighting/LightPass.cpp similarity index 99% rename from Source/Engine/Renderer/LightPass.cpp rename to Source/Engine/Renderer/Lighting/LightPass.cpp index 9829adfd9..cf0973b3d 100644 --- a/Source/Engine/Renderer/LightPass.cpp +++ b/Source/Engine/Renderer/Lighting/LightPass.cpp @@ -2,7 +2,8 @@ #include "LightPass.h" #include "ShadowsPass.h" -#include "GBufferPass.h" +#include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Core/Collections/Sorting.h" #include "Engine/Graphics/RenderBuffers.h" #include "Engine/Graphics/RenderTools.h" @@ -38,7 +39,7 @@ bool LightPass::Init() _depthBounds = GPUDevice::Instance->Limits.HasDepthBounds && GPUDevice::Instance->Limits.HasReadOnlyDepth; // Load assets - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lights")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/Lights")); _sphereModel = Content::LoadAsyncInternal(TEXT("Engine/Models/Sphere")); if (_shader == nullptr || _sphereModel == nullptr) return true; diff --git a/Source/Engine/Renderer/LightPass.h b/Source/Engine/Renderer/Lighting/LightPass.h similarity index 98% rename from Source/Engine/Renderer/LightPass.h rename to Source/Engine/Renderer/Lighting/LightPass.h index a918c7ec4..015295417 100644 --- a/Source/Engine/Renderer/LightPass.h +++ b/Source/Engine/Renderer/Lighting/LightPass.h @@ -4,7 +4,7 @@ #include "Engine/Graphics/RenderView.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Assets/Model.h" diff --git a/Source/Engine/Renderer/ShadowsPass.cpp b/Source/Engine/Renderer/Lighting/ShadowsPass.cpp similarity index 99% rename from Source/Engine/Renderer/ShadowsPass.cpp rename to Source/Engine/Renderer/Lighting/ShadowsPass.cpp index 7a2e7810d..ea755fabf 100644 --- a/Source/Engine/Renderer/ShadowsPass.cpp +++ b/Source/Engine/Renderer/Lighting/ShadowsPass.cpp @@ -1,8 +1,8 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ShadowsPass.h" -#include "GBufferPass.h" #include "VolumetricFogPass.h" +#include "Engine/Renderer/GBufferPass.h" #include "Engine/Graphics/Graphics.h" #include "Engine/Graphics/GPUContext.h" #include "Engine/Graphics/RenderContext.h" @@ -610,7 +610,7 @@ bool ShadowsPass::Init() _depthBounds = GPUDevice::Instance->Limits.HasDepthBounds && GPUDevice::Instance->Limits.HasReadOnlyDepth; // Load assets - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Shadows")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Shadows/Shadows")); _sphereModel = Content::LoadAsyncInternal(TEXT("Engine/Models/Sphere")); if (_shader == nullptr || _sphereModel == nullptr) return true; diff --git a/Source/Engine/Renderer/ShadowsPass.h b/Source/Engine/Renderer/Lighting/ShadowsPass.h similarity index 98% rename from Source/Engine/Renderer/ShadowsPass.h rename to Source/Engine/Renderer/Lighting/ShadowsPass.h index 1960e761d..3d1c363c2 100644 --- a/Source/Engine/Renderer/ShadowsPass.h +++ b/Source/Engine/Renderer/Lighting/ShadowsPass.h @@ -3,8 +3,8 @@ #pragma once #include "Engine/Graphics/GPUPipelineStatePermutations.h" -#include "RenderList.h" -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Assets/Model.h" #include "Engine/Graphics/RenderTask.h" diff --git a/Source/Engine/Renderer/VolumetricFogPass.cpp b/Source/Engine/Renderer/Lighting/VolumetricFogPass.cpp similarity index 99% rename from Source/Engine/Renderer/VolumetricFogPass.cpp rename to Source/Engine/Renderer/Lighting/VolumetricFogPass.cpp index b030b2e52..17f2abba9 100644 --- a/Source/Engine/Renderer/VolumetricFogPass.cpp +++ b/Source/Engine/Renderer/Lighting/VolumetricFogPass.cpp @@ -2,9 +2,9 @@ #include "VolumetricFogPass.h" #include "ShadowsPass.h" -#include "GBufferPass.h" -#include "DrawCall.h" -#include "GI/DynamicDiffuseGlobalIllumination.h" +#include "Engine/Renderer/DrawCall.h" +#include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h" #include "Engine/Graphics/Graphics.h" #include "Engine/Graphics/RenderContext.h" #include "Engine/Graphics/RenderTools.h" @@ -101,7 +101,7 @@ bool VolumetricFogPass::Init() _psInjectLight.CreatePipelineStates(); // Load assets - _shader = Content::LoadAsyncInternal(TEXT("Shaders/VolumetricFog")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Lighting/VolumetricFog")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, VolumetricFogPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/VolumetricFogPass.h b/Source/Engine/Renderer/Lighting/VolumetricFogPass.h similarity index 98% rename from Source/Engine/Renderer/VolumetricFogPass.h rename to Source/Engine/Renderer/Lighting/VolumetricFogPass.h index 2efdc45cc..0ec645c8c 100644 --- a/Source/Engine/Renderer/VolumetricFogPass.h +++ b/Source/Engine/Renderer/Lighting/VolumetricFogPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" struct VolumetricFogOptions; diff --git a/Source/Engine/Renderer/ColorGradingPass.cpp b/Source/Engine/Renderer/PostFX/ColorGradingPass.cpp similarity index 98% rename from Source/Engine/Renderer/ColorGradingPass.cpp rename to Source/Engine/Renderer/PostFX/ColorGradingPass.cpp index 83cc73e58..5fd5c6b8e 100644 --- a/Source/Engine/Renderer/ColorGradingPass.cpp +++ b/Source/Engine/Renderer/PostFX/ColorGradingPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ColorGradingPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Content.h" #include "Engine/Engine/Engine.h" #include "Engine/Graphics/GPUContext.h" @@ -114,7 +114,7 @@ String ColorGradingPass::ToString() const bool ColorGradingPass::Init() { _psLut.CreatePipelineStates(); - _shader = Content::LoadAsyncInternal(TEXT("Shaders/ColorGrading")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/ColorGrading")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, ColorGradingPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/ColorGradingPass.h b/Source/Engine/Renderer/PostFX/ColorGradingPass.h similarity index 96% rename from Source/Engine/Renderer/ColorGradingPass.h rename to Source/Engine/Renderer/PostFX/ColorGradingPass.h index dd17e7786..cf717d7d6 100644 --- a/Source/Engine/Renderer/ColorGradingPass.h +++ b/Source/Engine/Renderer/PostFX/ColorGradingPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" /// diff --git a/Source/Engine/Renderer/DepthOfFieldPass.cpp b/Source/Engine/Renderer/PostFX/DepthOfFieldPass.cpp similarity index 99% rename from Source/Engine/Renderer/DepthOfFieldPass.cpp rename to Source/Engine/Renderer/PostFX/DepthOfFieldPass.cpp index 6dc7c9cc2..24584aa63 100644 --- a/Source/Engine/Renderer/DepthOfFieldPass.cpp +++ b/Source/Engine/Renderer/PostFX/DepthOfFieldPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "DepthOfFieldPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" #include "Engine/Graphics/Textures/GPUTexture.h" @@ -76,7 +76,7 @@ bool DepthOfFieldPass::Init() // Load shaders if (_platformSupportsDoF) { - _shader = Content::LoadAsyncInternal(TEXT("Shaders/DepthOfField")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/DepthOfField")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, DepthOfFieldPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/DepthOfFieldPass.h b/Source/Engine/Renderer/PostFX/DepthOfFieldPass.h similarity index 98% rename from Source/Engine/Renderer/DepthOfFieldPass.h rename to Source/Engine/Renderer/PostFX/DepthOfFieldPass.h index 098c4061e..2c6cc338a 100644 --- a/Source/Engine/Renderer/DepthOfFieldPass.h +++ b/Source/Engine/Renderer/PostFX/DepthOfFieldPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/PostProcessSettings.h" /// diff --git a/Source/Engine/Renderer/EyeAdaptationPass.cpp b/Source/Engine/Renderer/PostFX/EyeAdaptationPass.cpp similarity index 98% rename from Source/Engine/Renderer/EyeAdaptationPass.cpp rename to Source/Engine/Renderer/PostFX/EyeAdaptationPass.cpp index 6a9abecd7..9570c66f0 100644 --- a/Source/Engine/Renderer/EyeAdaptationPass.cpp +++ b/Source/Engine/Renderer/PostFX/EyeAdaptationPass.cpp @@ -2,7 +2,7 @@ #include "EyeAdaptationPass.h" #include "HistogramPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Core/Math/Vector2.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" @@ -229,7 +229,7 @@ bool EyeAdaptationPass::Init() _psHistogram = device->CreatePipelineState(); // Load shaders - _shader = Content::LoadAsyncInternal(TEXT("Shaders/EyeAdaptation")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/EyeAdaptation")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, EyeAdaptationPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/EyeAdaptationPass.h b/Source/Engine/Renderer/PostFX/EyeAdaptationPass.h similarity index 97% rename from Source/Engine/Renderer/EyeAdaptationPass.h rename to Source/Engine/Renderer/PostFX/EyeAdaptationPass.h index 1f7617012..bc516de69 100644 --- a/Source/Engine/Renderer/EyeAdaptationPass.h +++ b/Source/Engine/Renderer/PostFX/EyeAdaptationPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" /// /// Eye adaptation effect based on color buffer luminance. diff --git a/Source/Engine/Renderer/HistogramPass.cpp b/Source/Engine/Renderer/PostFX/HistogramPass.cpp similarity index 96% rename from Source/Engine/Renderer/HistogramPass.cpp rename to Source/Engine/Renderer/PostFX/HistogramPass.cpp index 6a5b612ab..9042a52c8 100644 --- a/Source/Engine/Renderer/HistogramPass.cpp +++ b/Source/Engine/Renderer/PostFX/HistogramPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "HistogramPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" #include "Engine/Graphics/GPUContext.h" @@ -87,7 +87,7 @@ bool HistogramPass::Init() return true; // Load shaders - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Histogram")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/Histogram")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, HistogramPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/HistogramPass.h b/Source/Engine/Renderer/PostFX/HistogramPass.h similarity index 97% rename from Source/Engine/Renderer/HistogramPass.h rename to Source/Engine/Renderer/PostFX/HistogramPass.h index 3384723ab..0414961cd 100644 --- a/Source/Engine/Renderer/HistogramPass.h +++ b/Source/Engine/Renderer/PostFX/HistogramPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" /// /// Luminance histogram rendering pass. Uses compute shaders. diff --git a/Source/Engine/Renderer/MotionBlurPass.cpp b/Source/Engine/Renderer/PostFX/MotionBlurPass.cpp similarity index 98% rename from Source/Engine/Renderer/MotionBlurPass.cpp rename to Source/Engine/Renderer/PostFX/MotionBlurPass.cpp index 4542cbcbb..b01a7a940 100644 --- a/Source/Engine/Renderer/MotionBlurPass.cpp +++ b/Source/Engine/Renderer/PostFX/MotionBlurPass.cpp @@ -1,9 +1,9 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "MotionBlurPass.h" -#include "GBufferPass.h" -#include "Renderer.h" -#include "RenderList.h" +#include "Engine/Renderer/Renderer.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/GBufferPass.h" #include "Engine/Core/Config/GraphicsSettings.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" @@ -59,7 +59,7 @@ bool MotionBlurPass::Init() _psMotionBlur = GPUDevice::Instance->CreatePipelineState(); // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/MotionBlur")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/MotionBlur")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, MotionBlurPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/MotionBlurPass.h b/Source/Engine/Renderer/PostFX/MotionBlurPass.h similarity index 98% rename from Source/Engine/Renderer/MotionBlurPass.h rename to Source/Engine/Renderer/PostFX/MotionBlurPass.h index c6dde97c2..25cdc3c18 100644 --- a/Source/Engine/Renderer/MotionBlurPass.h +++ b/Source/Engine/Renderer/PostFX/MotionBlurPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" /// /// Anti aliasing rendering service diff --git a/Source/Engine/Renderer/PostProcessingPass.cpp b/Source/Engine/Renderer/PostFX/PostProcessingPass.cpp similarity index 99% rename from Source/Engine/Renderer/PostProcessingPass.cpp rename to Source/Engine/Renderer/PostFX/PostProcessingPass.cpp index 9c505ea42..decc1cbae 100644 --- a/Source/Engine/Renderer/PostProcessingPass.cpp +++ b/Source/Engine/Renderer/PostFX/PostProcessingPass.cpp @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "PostProcessingPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" #include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Content.h" #include "Engine/Graphics/Graphics.h" @@ -90,7 +90,7 @@ bool PostProcessingPass::Init() _psComposite.CreatePipelineStates(); // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostProcessing")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/PostFX/PostProcessing")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, PostProcessingPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/PostProcessingPass.h b/Source/Engine/Renderer/PostFX/PostProcessingPass.h similarity index 97% rename from Source/Engine/Renderer/PostProcessingPass.h rename to Source/Engine/Renderer/PostFX/PostProcessingPass.h index 811ff145c..e6d79dabc 100644 --- a/Source/Engine/Renderer/PostProcessingPass.h +++ b/Source/Engine/Renderer/PostFX/PostProcessingPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Core/Math/Viewport.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" diff --git a/Source/Engine/Renderer/ProbesRenderer.cpp b/Source/Engine/Renderer/Reflections/ProbesRenderer.cpp similarity index 99% rename from Source/Engine/Renderer/ProbesRenderer.cpp rename to Source/Engine/Renderer/Reflections/ProbesRenderer.cpp index 38c4f598b..13610d4b1 100644 --- a/Source/Engine/Renderer/ProbesRenderer.cpp +++ b/Source/Engine/Renderer/Reflections/ProbesRenderer.cpp @@ -1,8 +1,8 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ProbesRenderer.h" -#include "Renderer.h" -#include "RenderList.h" +#include "Engine/Renderer/Renderer.h" +#include "Engine/Renderer/RenderList.h" #include "ReflectionsPass.h" #include "Engine/Core/Config/GraphicsSettings.h" #include "Engine/Engine/Time.h" @@ -256,7 +256,7 @@ bool ProbesRendererService::LazyInit() // Load shader if (_shader == nullptr) { - _shader = Content::LoadAsyncInternal(TEXT("Shaders/ProbesFilter")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Reflections/ProbesFilter")); _initFailed = _shader == nullptr; if (_initFailed) return false; diff --git a/Source/Engine/Renderer/ProbesRenderer.h b/Source/Engine/Renderer/Reflections/ProbesRenderer.h similarity index 100% rename from Source/Engine/Renderer/ProbesRenderer.h rename to Source/Engine/Renderer/Reflections/ProbesRenderer.h diff --git a/Source/Engine/Renderer/ReflectionsPass.cpp b/Source/Engine/Renderer/Reflections/ReflectionsPass.cpp similarity index 98% rename from Source/Engine/Renderer/ReflectionsPass.cpp rename to Source/Engine/Renderer/Reflections/ReflectionsPass.cpp index 3be23544c..bc0f00ffa 100644 --- a/Source/Engine/Renderer/ReflectionsPass.cpp +++ b/Source/Engine/Renderer/Reflections/ReflectionsPass.cpp @@ -1,10 +1,10 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "ReflectionsPass.h" -#include "GBufferPass.h" -#include "RenderList.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h" #include "ScreenSpaceReflectionsPass.h" -#include "GI/DynamicDiffuseGlobalIllumination.h" #include "Engine/Core/Collections/Sorting.h" #include "Engine/Content/Content.h" #include "Engine/Core/Math/OrientedBoundingBox.h" @@ -172,7 +172,7 @@ bool ReflectionsPass::Init() _depthBounds = GPUDevice::Instance->Limits.HasDepthBounds && GPUDevice::Instance->Limits.HasReadOnlyDepth; // Load assets - _shader = Content::LoadAsyncInternal(TEXT("Shaders/Reflections")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Reflections/Reflections")); _sphereModel = Content::LoadAsyncInternal(TEXT("Engine/Models/Sphere")); _boxModel = Content::LoadAsyncInternal(TEXT("Engine/Models/Box")); _preIntegratedGF = Content::LoadAsyncInternal(PRE_INTEGRATED_GF_ASSET_NAME); diff --git a/Source/Engine/Renderer/ReflectionsPass.h b/Source/Engine/Renderer/Reflections/ReflectionsPass.h similarity index 97% rename from Source/Engine/Renderer/ReflectionsPass.h rename to Source/Engine/Renderer/Reflections/ReflectionsPass.h index d462d5fcb..f80871084 100644 --- a/Source/Engine/Renderer/ReflectionsPass.h +++ b/Source/Engine/Renderer/Reflections/ReflectionsPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" #include "Engine/Content/Assets/Model.h" #include "Engine/Content/Assets/Shader.h" diff --git a/Source/Engine/Renderer/ScreenSpaceReflectionsPass.cpp b/Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.cpp similarity index 98% rename from Source/Engine/Renderer/ScreenSpaceReflectionsPass.cpp rename to Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.cpp index 7d95d75a3..bac14b445 100644 --- a/Source/Engine/Renderer/ScreenSpaceReflectionsPass.cpp +++ b/Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.cpp @@ -2,11 +2,11 @@ #include "ScreenSpaceReflectionsPass.h" #include "ReflectionsPass.h" -#include "GBufferPass.h" -#include "RenderList.h" -#include "GlobalSignDistanceFieldPass.h" -#include "GI/GlobalSurfaceAtlasPass.h" -#include "Utils/MultiScaler.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Utils/MultiScaler.h" #include "Engine/Engine/Engine.h" #include "Engine/Platform/Window.h" #include "Engine/Content/Content.h" @@ -64,7 +64,7 @@ bool ScreenSpaceReflectionsPass::Init() _psTemporalPass = GPUDevice::Instance->CreatePipelineState(); // Load assets - _shader = Content::LoadAsyncInternal(TEXT("Shaders/SSR")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Reflections/SSR")); _preIntegratedGF = Content::LoadAsyncInternal(PRE_INTEGRATED_GF_ASSET_NAME); if (_shader == nullptr || _preIntegratedGF == nullptr) return true; diff --git a/Source/Engine/Renderer/ScreenSpaceReflectionsPass.h b/Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.h similarity index 98% rename from Source/Engine/Renderer/ScreenSpaceReflectionsPass.h rename to Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.h index 3de490cfb..14be24eca 100644 --- a/Source/Engine/Renderer/ScreenSpaceReflectionsPass.h +++ b/Source/Engine/Renderer/Reflections/ScreenSpaceReflectionsPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" #include "Engine/Content/Assets/Model.h" #include "Engine/Content/Assets/Shader.h" diff --git a/Source/Engine/Renderer/Renderer.cpp b/Source/Engine/Renderer/Renderer.cpp index 5b359b8f3..2390fa479 100644 --- a/Source/Engine/Renderer/Renderer.cpp +++ b/Source/Engine/Renderer/Renderer.cpp @@ -11,28 +11,28 @@ #include "Engine/Engine/EngineService.h" #include "GBufferPass.h" #include "ForwardPass.h" -#include "ShadowsPass.h" -#include "LightPass.h" -#include "ReflectionsPass.h" -#include "ScreenSpaceReflectionsPass.h" -#include "AmbientOcclusionPass.h" -#include "DepthOfFieldPass.h" -#include "EyeAdaptationPass.h" -#include "PostProcessingPass.h" -#include "ColorGradingPass.h" -#include "MotionBlurPass.h" -#include "VolumetricFogPass.h" -#include "HistogramPass.h" -#include "AtmospherePreCompute.h" -#include "ContrastAdaptiveSharpeningPass.h" -#include "GlobalSignDistanceFieldPass.h" +#include "Reflections/ReflectionsPass.h" +#include "Reflections/ScreenSpaceReflectionsPass.h" +#include "PostFX/DepthOfFieldPass.h" +#include "PostFX/EyeAdaptationPass.h" +#include "PostFX/PostProcessingPass.h" +#include "PostFX/ColorGradingPass.h" +#include "PostFX/MotionBlurPass.h" +#include "PostFX/HistogramPass.h" +#include "Lighting/ShadowsPass.h" +#include "Lighting/LightPass.h" +#include "Lighting/VolumetricFogPass.h" +#include "Lighting/AtmospherePreCompute.h" +#include "Lighting/AmbientOcclusionPass.h" #include "GI/GlobalSurfaceAtlasPass.h" #include "GI/DynamicDiffuseGlobalIllumination.h" +#include "Utils/GlobalSignDistanceFieldPass.h" #include "Utils/MultiScaler.h" #include "Utils/BitonicSort.h" #include "AntiAliasing/FXAA.h" #include "AntiAliasing/TAA.h" #include "AntiAliasing/SMAA.h" +#include "AntiAliasing/ContrastAdaptiveSharpeningPass.h" #include "Engine/Level/Actor.h" #include "Engine/Level/Level.h" #include "Engine/Level/Scene/SceneRendering.h" diff --git a/Source/Engine/Renderer/Utils/BitonicSort.cpp b/Source/Engine/Renderer/Utils/BitonicSort.cpp index 287dac084..91392bda8 100644 --- a/Source/Engine/Renderer/Utils/BitonicSort.cpp +++ b/Source/Engine/Renderer/Utils/BitonicSort.cpp @@ -36,7 +36,7 @@ bool BitonicSort::Init() return true; // Load asset - _shader = Content::LoadAsyncInternal(TEXT("Shaders/BitonicSort")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Utils/BitonicSort")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, BitonicSort, OnShaderReloading); diff --git a/Source/Engine/Renderer/Utils/BitonicSort.h b/Source/Engine/Renderer/Utils/BitonicSort.h index 1fd5d50cd..000d014ef 100644 --- a/Source/Engine/Renderer/Utils/BitonicSort.h +++ b/Source/Engine/Renderer/Utils/BitonicSort.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" /// diff --git a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp b/Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp similarity index 99% rename from Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp rename to Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp index 5537c4caf..59fff8bfb 100644 --- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp +++ b/Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp @@ -1,9 +1,10 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "GlobalSignDistanceFieldPass.h" -#include "GBufferPass.h" -#include "RenderList.h" -#include "GI/DynamicDiffuseGlobalIllumination.h" +#include "Engine/Renderer/Renderer.h" +#include "Engine/Renderer/RenderList.h" +#include "Engine/Renderer/GBufferPass.h" +#include "Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h" #include "Engine/Core/Math/Vector3.h" #include "Engine/Core/Math/Matrix3x4.h" #include "Engine/Core/Collections/HashSet.h" @@ -700,7 +701,7 @@ bool GlobalSignDistanceFieldPass::setupResources() // Load shader if (!_shader) { - _shader = Content::LoadAsyncInternal(TEXT("Shaders/GlobalSignDistanceField")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Utils/GlobalSignDistanceField")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, GlobalSignDistanceFieldPass, OnShaderReloading); diff --git a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.h b/Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h similarity index 98% rename from Source/Engine/Renderer/GlobalSignDistanceFieldPass.h rename to Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h index ee2aabd02..77edfbf1a 100644 --- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.h +++ b/Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h @@ -2,7 +2,7 @@ #pragma once -#include "RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Core/Math/Vector3.h" /// diff --git a/Source/Engine/Renderer/Utils/MultiScaler.cpp b/Source/Engine/Renderer/Utils/MultiScaler.cpp index e9a89b279..0bb5f848c 100644 --- a/Source/Engine/Renderer/Utils/MultiScaler.cpp +++ b/Source/Engine/Renderer/Utils/MultiScaler.cpp @@ -3,8 +3,8 @@ #include "MultiScaler.h" #include "Engine/Graphics/Textures/GPUTexture.h" #include "Engine/Graphics/GPUContext.h" -#include "Engine/Content/Content.h" #include "Engine/Graphics/GPUPass.h" +#include "Engine/Content/Content.h" GPU_CB_STRUCT(Data { Float2 TexelSize; @@ -26,7 +26,7 @@ bool MultiScaler::Init() _psUpscale = GPUDevice::Instance->CreatePipelineState(); // Load asset - _shader = Content::LoadAsyncInternal(TEXT("Shaders/MultiScaler")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Utils/MultiScaler")); if (_shader == nullptr) return true; BIND_SHADER_RELOADING(_shader, MultiScaler, OnShaderReloading); diff --git a/Source/Engine/Renderer/Utils/MultiScaler.h b/Source/Engine/Renderer/Utils/MultiScaler.h index c83981463..ce21e7731 100644 --- a/Source/Engine/Renderer/Utils/MultiScaler.h +++ b/Source/Engine/Renderer/Utils/MultiScaler.h @@ -2,7 +2,7 @@ #pragma once -#include "../RendererPass.h" +#include "Engine/Renderer/RendererPass.h" #include "Engine/Core/Collections/Dictionary.h" #include "Engine/Core/Math/Viewport.h" #include "Engine/Graphics/GPUPipelineStatePermutations.h" diff --git a/Source/Engine/ShadowsOfMordor/Builder.cpp b/Source/Engine/ShadowsOfMordor/Builder.cpp index 80383227e..81d2d8230 100644 --- a/Source/Engine/ShadowsOfMordor/Builder.cpp +++ b/Source/Engine/ShadowsOfMordor/Builder.cpp @@ -461,7 +461,7 @@ bool ShadowsOfMordor::Builder::initResources() _task->Resize(HEMISPHERES_RESOLUTION, HEMISPHERES_RESOLUTION); // Load shader - _shader = Content::LoadAsyncInternal(TEXT("Shaders/BakeLightmap")); + _shader = Content::LoadAsyncInternal(TEXT("Shaders/Editor/BakeLightmap")); if (_shader == nullptr) return true; if (_shader->WaitForLoaded()) diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp index d4eea1616..17c9b1446 100644 --- a/Source/Engine/Terrain/Terrain.cpp +++ b/Source/Engine/Terrain/Terrain.cpp @@ -18,7 +18,7 @@ #include "Engine/Level/Scene/Scene.h" #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Profiler/ProfilerMemory.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" #include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h" Terrain::Terrain(const SpawnParams& params) diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp index 80f53924a..71ede26c8 100644 --- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp +++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp @@ -785,7 +785,7 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value) { const auto linear = tryGetValue(node->GetBox(0), Value::Zero).AsFloat3(); value = writeLocal(linear.Type, String::Format(TEXT("LinearToSrgb({0})"), linear.Value), node); - _includes.Add(TEXT("./Flax/GammaCorrectionCommon.hlsl")); + _includes.Add(TEXT("./Flax/PostFX/GammaCorrectionCommon.hlsl")); break; } // sRGB to Linear @@ -793,7 +793,7 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value) { const auto sRGB = tryGetValue(node->GetBox(0), Value::Zero).AsFloat3(); value = writeLocal(sRGB.Type, String::Format(TEXT("sRGBToLinear({0})"), sRGB.Value), node); - _includes.Add(TEXT("./Flax/GammaCorrectionCommon.hlsl")); + _includes.Add(TEXT("./Flax/PostFX/GammaCorrectionCommon.hlsl")); break; } default: diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp index ee47db85e..25d51b320 100644 --- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp +++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp @@ -677,7 +677,7 @@ void MaterialGenerator::ProcessGroupTextures(Box* box, Node* node, Value& value) Value worldPosition = tryGetValue(node->GetBox(1), Value(VariantType::Float3, TEXT("input.WorldPosition.xyz"))).Cast(VariantType::Float3); Value startCascade = tryGetValue(node->TryGetBox(2), 0, Value::Zero).Cast(VariantType::Uint); value = writeLocal(VariantType::Float, String::Format(TEXT("SampleGlobalSDF({0}, {0}_Tex, {0}_Mip, {1}, {2})"), param.ShaderName, worldPosition.Value, startCascade.Value), node); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); break; } // Sample Global SDF Gradient @@ -690,7 +690,7 @@ void MaterialGenerator::ProcessGroupTextures(Box* box, Node* node, Value& value) Value startCascade = tryGetValue(node->TryGetBox(3), 0, Value::Zero).Cast(VariantType::Uint); auto distance = writeLocal(VariantType::Float, node); auto gradient = writeLocal(VariantType::Float3, String::Format(TEXT("SampleGlobalSDFGradient({0}, {0}_Tex, {0}_Mip, {1}, {2}, {3})"), param.ShaderName, worldPosition.Value, distance.Value, startCascade.Value), node); - _includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl")); + _includes.Add(TEXT("./Flax/Utils/GlobalSignDistanceField.hlsl")); gradientBox->Cache = gradient; distanceBox->Cache = distance; value = box == gradientBox ? gradient : distance; diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp index 3388c965f..b9b12d445 100644 --- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp +++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Tools.cpp @@ -27,7 +27,7 @@ void MaterialGenerator::ProcessGroupTools(Box* box, Node* node, Value& value) auto local4 = writeFunction2(node, local3, exponent, TEXT("ClampedPow"), VariantType::Float); auto local5 = writeLocal(VariantType::Float, String::Format(TEXT("{0} * (1.0 - {1})"), local4.Value, fraction.Value), node); auto local6 = writeOperation2(node, local5, fraction, '+'); - _includes.Add(TEXT("./Flax/Math.hlsl")); + _includes.Add(TEXT("./Flax/Math/Math.hlsl")); // Gets value value = local6; diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp index 5103b26f8..1166a1985 100644 --- a/Source/Engine/Tools/ModelTool/ModelTool.cpp +++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp @@ -114,7 +114,7 @@ public: GPUModelSDFTask(ConditionVariable& signal, MeshAccelerationStructure* scene, Model* inputModel, const ModelData* modelData, int32 lodIndex, const Int3& resolution, ModelBase::SDFData* sdf, GPUTexture* sdfResult, const Float3& xyzToLocalMul, const Float3& xyzToLocalAdd, float backfacesThreshold) : GPUTask(Type::Custom, GPU_ALLOW_PROFILE_EVENTS ? 4 : GPU_ASYNC_LATENCY) // Fix timer query result reading with some more latency , _signal(&signal) - , _shader(Content::LoadAsyncInternal(TEXT("Shaders/SDF"))) + , _shader(Content::LoadAsyncInternal(TEXT("Shaders/Utils/SDF"))) , _scene(scene) , _inputModel(inputModel) , _modelData(modelData) diff --git a/Source/Engine/Visject/ShaderGraph.cpp b/Source/Engine/Visject/ShaderGraph.cpp index b42b62f74..e97216d6e 100644 --- a/Source/Engine/Visject/ShaderGraph.cpp +++ b/Source/Engine/Visject/ShaderGraph.cpp @@ -312,7 +312,7 @@ void ShaderGenerator::ProcessGroupMath(Box* box, Node* node, Value& value) Value v1 = tryGetValue(node->GetBox(0), Value::Zero); String text = String::Format(TEXT("ExtractLargestComponent({0})"), Value::Cast(v1, ValueType::Float3).Value); value = writeLocal(ValueType::Float3, text, node); - _includes.Add(TEXT("./Flax/Math.hlsl")); + _includes.Add(TEXT("./Flax/Math/Math.hlsl")); break; } // Asine @@ -352,7 +352,7 @@ void ShaderGenerator::ProcessGroupMath(Box* box, Node* node, Value& value) const auto graphValue = tryGetValue(node->GetBox(2), Value::Zero).AsFloat3(); const auto position = tryGetValue(node->GetBox(3), Value::Zero).AsFloat3(); const String text = String::Format(TEXT("RotateAboutAxis(float4({0}, {1}), {2}, {3})"), normalizedRotationAxis.Value, shaderGraphValue.Value, graphValue.Value, position.Value); - _includes.Add(TEXT("./Flax/Math.hlsl")); + _includes.Add(TEXT("./Flax/Math/Math.hlsl")); value = writeLocal(ValueType::Float3, text, node); break; } @@ -835,7 +835,7 @@ void ShaderGenerator::ProcessGroupTools(Box* box, Node* node, Value& value) case 33: case 34: { - _includes.Add(TEXT("./Flax/Noise.hlsl")); + _includes.Add(TEXT("./Flax/Math/Noise.hlsl")); const Char* format; ValueType pointType = VariantType::Float2; ValueType resultType = VariantType::Float; diff --git a/Source/Engine/Visject/ShaderGraphUtilities.cpp b/Source/Engine/Visject/ShaderGraphUtilities.cpp index 4f2232904..82ba05753 100644 --- a/Source/Engine/Visject/ShaderGraphUtilities.cpp +++ b/Source/Engine/Visject/ShaderGraphUtilities.cpp @@ -11,7 +11,7 @@ #include "Engine/Content/Assets/CubeTexture.h" #include "Engine/Engine/GameplayGlobals.h" #include "Engine/Graphics/Config.h" -#include "Engine/Renderer/GlobalSignDistanceFieldPass.h" +#include "Engine/Renderer/Utils/GlobalSignDistanceFieldPass.h" void ShaderGraphUtilities::GenerateShaderConstantBuffer(TextWriterUnicode& writer, Array& parameters) { diff --git a/Source/Shaders/CAS.shader b/Source/Shaders/AntiAliasing/CAS.shader similarity index 100% rename from Source/Shaders/CAS.shader rename to Source/Shaders/AntiAliasing/CAS.shader diff --git a/Source/Shaders/FXAA.shader b/Source/Shaders/AntiAliasing/FXAA.shader similarity index 100% rename from Source/Shaders/FXAA.shader rename to Source/Shaders/AntiAliasing/FXAA.shader diff --git a/Source/Shaders/SMAA.shader b/Source/Shaders/AntiAliasing/SMAA.shader similarity index 100% rename from Source/Shaders/SMAA.shader rename to Source/Shaders/AntiAliasing/SMAA.shader diff --git a/Source/Shaders/TAA.shader b/Source/Shaders/AntiAliasing/TAA.shader similarity index 99% rename from Source/Shaders/TAA.shader rename to Source/Shaders/AntiAliasing/TAA.shader index f41613d0b..77d2cdde7 100644 --- a/Source/Shaders/TAA.shader +++ b/Source/Shaders/AntiAliasing/TAA.shader @@ -25,8 +25,8 @@ #include "./Flax/Common.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/Temporal.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/AntiAliasing/Temporal.hlsl" META_CB_BEGIN(0, Data) float2 ScreenSizeInv; diff --git a/Source/Shaders/Temporal.hlsl b/Source/Shaders/AntiAliasing/Temporal.hlsl similarity index 100% rename from Source/Shaders/Temporal.hlsl rename to Source/Shaders/AntiAliasing/Temporal.hlsl diff --git a/Source/Shaders/BakeLightmap.shader b/Source/Shaders/Editor/BakeLightmap.shader similarity index 99% rename from Source/Shaders/BakeLightmap.shader rename to Source/Shaders/Editor/BakeLightmap.shader index 3c101f6a5..2b10bf482 100644 --- a/Source/Shaders/BakeLightmap.shader +++ b/Source/Shaders/Editor/BakeLightmap.shader @@ -4,7 +4,7 @@ #include "./Flax/Common.hlsl" #include "./Flax/MaterialCommon.hlsl" -#include "./Flax/SH.hlsl" +#include "./Flax/Math/SH.hlsl" // This config must match C++ code #define HEMISPHERES_RESOLUTION 64 diff --git a/Source/Shaders/GBuffer.shader b/Source/Shaders/GBuffer.shader index 50478e2c9..71c81e566 100644 --- a/Source/Shaders/GBuffer.shader +++ b/Source/Shaders/GBuffer.shader @@ -4,8 +4,8 @@ #include "./Flax/Common.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/BRDF.hlsl" -#include "./Flax/GammaCorrectionCommon.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" +#include "./Flax/PostFX/GammaCorrectionCommon.hlsl" META_CB_BEGIN(0, Data) GBufferData GBuffer; diff --git a/Source/Shaders/GI/DDGI.hlsl b/Source/Shaders/GI/DDGI.hlsl index 7a5a96048..7bf73b160 100644 --- a/Source/Shaders/GI/DDGI.hlsl +++ b/Source/Shaders/GI/DDGI.hlsl @@ -10,8 +10,8 @@ // "Dynamic Diffuse Global Illumination with Ray-Traced Irradiance Fields", https://jcgt.org/published/0008/02/01/ #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" -#include "./Flax/Octahedral.hlsl" +#include "./Flax/Math/Math.hlsl" +#include "./Flax/Math/Octahedral.hlsl" #define DDGI_PROBE_STATE_INACTIVE 0 #define DDGI_PROBE_STATE_ACTIVATED 1 diff --git a/Source/Shaders/GI/DDGI.shader b/Source/Shaders/GI/DDGI.shader index ba7ae0cb6..8c7b2f1c5 100644 --- a/Source/Shaders/GI/DDGI.shader +++ b/Source/Shaders/GI/DDGI.shader @@ -14,12 +14,12 @@ //#define GLOBAL_SDF_SAMPLER SamplerPointClamp #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" -#include "./Flax/Noise.hlsl" #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/Quaternion.hlsl" -#include "./Flax/MonteCarlo.hlsl" -#include "./Flax/GlobalSignDistanceField.hlsl" +#include "./Flax/Math/Math.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Math/Quaternion.hlsl" +#include "./Flax/Math/MonteCarlo.hlsl" +#include "./Flax/Utils/GlobalSignDistanceField.hlsl" #include "./Flax/GI/GlobalSurfaceAtlas.hlsl" #include "./Flax/GI/DDGI.hlsl" @@ -966,8 +966,8 @@ void CS_UpdateProbes(uint3 GroupThreadId : SV_GroupThreadID, uint3 GroupId : SV_ #if defined(_PS_IndirectLighting) || defined(_PS_SpecularLighting) #include "./Flax/GBuffer.hlsl" -#include "./Flax/Random.hlsl" -#include "./Flax/LightingCommon.hlsl" +#include "./Flax/Math/Random.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" Texture2D ProbesData : register(t4); Texture2D ProbesDistance : register(t5); diff --git a/Source/Shaders/GI/GlobalSurfaceAtlas.hlsl b/Source/Shaders/GI/GlobalSurfaceAtlas.hlsl index b4509effe..1e50f3238 100644 --- a/Source/Shaders/GI/GlobalSurfaceAtlas.hlsl +++ b/Source/Shaders/GI/GlobalSurfaceAtlas.hlsl @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/Collisions.hlsl" +#include "./Flax/Math/Collisions.hlsl" #if CAN_USE_GATHER #define CAN_USE_GLOBAL_SURFACE_ATLAS 1 diff --git a/Source/Shaders/GI/GlobalSurfaceAtlas.shader b/Source/Shaders/GI/GlobalSurfaceAtlas.shader index 752f51dce..1982fb76e 100644 --- a/Source/Shaders/GI/GlobalSurfaceAtlas.shader +++ b/Source/Shaders/GI/GlobalSurfaceAtlas.shader @@ -4,10 +4,10 @@ #define LIGHTING_NO_SPECULAR 1 #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/LightingCommon.hlsl" -#include "./Flax/GlobalSignDistanceField.hlsl" +#include "./Flax/Math/Math.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" +#include "./Flax/Utils/GlobalSignDistanceField.hlsl" #include "./Flax/GI/GlobalSurfaceAtlas.hlsl" #include "./Flax/GI/DDGI.hlsl" @@ -101,8 +101,8 @@ float4 PS_ClearLighting(AtlasVertexOutput input) : SV_Target #ifdef _PS_Lighting #include "./Flax/GBuffer.hlsl" -#include "./Flax/Matrix.hlsl" -#include "./Flax/Lighting.hlsl" +#include "./Flax/Math/Matrix.hlsl" +#include "./Flax/Lighting/Lighting.hlsl" // GBuffer+Depth at 0-3 slots Buffer GlobalSurfaceAtlasObjects : register(t4); @@ -224,7 +224,7 @@ float4 PS_Lighting(AtlasVertexOutput input) : SV_Target #if defined(_CS_CullObjects) -#include "./Flax/Collisions.hlsl" +#include "./Flax/Math/Collisions.hlsl" RWByteAddressBuffer RWGlobalSurfaceAtlasChunks : register(u0); RWByteAddressBuffer RWGlobalSurfaceAtlasCulledObjects : register(u1); diff --git a/Source/Shaders/GUICommon.hlsl b/Source/Shaders/GUICommon.hlsl index 83a814f89..2d4df1d29 100644 --- a/Source/Shaders/GUICommon.hlsl +++ b/Source/Shaders/GUICommon.hlsl @@ -4,7 +4,7 @@ #define __GUI_COMMON__ #include "./Flax/Common.hlsl" -#include "./Flax/GammaCorrectionCommon.hlsl" +#include "./Flax/PostFX/GammaCorrectionCommon.hlsl" #define CLIPPING_ENABLE 1 diff --git a/Source/Shaders/Atmosphere.hlsl b/Source/Shaders/Lighting/Atmosphere.hlsl similarity index 100% rename from Source/Shaders/Atmosphere.hlsl rename to Source/Shaders/Lighting/Atmosphere.hlsl diff --git a/Source/Shaders/AtmosphereFog.hlsl b/Source/Shaders/Lighting/AtmosphereFog.hlsl similarity index 99% rename from Source/Shaders/AtmosphereFog.hlsl rename to Source/Shaders/Lighting/AtmosphereFog.hlsl index 635f82ece..8571c1e27 100644 --- a/Source/Shaders/AtmosphereFog.hlsl +++ b/Source/Shaders/Lighting/AtmosphereFog.hlsl @@ -20,7 +20,7 @@ // http://www-evasion.imag.fr/Membres/Eric.Bruneton/PrecomputedAtmosphericScattering2.zip, Author: Eric Bruneton, // 08/16/2011, Copyright (c) 2008 INRIA, All Rights Reserved, which have been altered from their original version. -#include "./Flax/Atmosphere.hlsl" +#include "./Flax/Lighting/Atmosphere.hlsl" // Structure that contains information about atmosphere fog struct AtmosphericFogData diff --git a/Source/Shaders/AtmospherePreCompute.shader b/Source/Shaders/Lighting/AtmospherePreCompute.shader similarity index 99% rename from Source/Shaders/AtmospherePreCompute.shader rename to Source/Shaders/Lighting/AtmospherePreCompute.shader index 9ba929557..42f930cee 100644 --- a/Source/Shaders/AtmospherePreCompute.shader +++ b/Source/Shaders/Lighting/AtmospherePreCompute.shader @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/Atmosphere.hlsl" +#include "./Flax/Lighting/Atmosphere.hlsl" // Provides functions for atmospheric scattering and aerial perspective. // diff --git a/Source/Shaders/BRDF.hlsl b/Source/Shaders/Lighting/BRDF.hlsl similarity index 99% rename from Source/Shaders/BRDF.hlsl rename to Source/Shaders/Lighting/BRDF.hlsl index 2cf86adc7..5f87bd90c 100644 --- a/Source/Shaders/BRDF.hlsl +++ b/Source/Shaders/Lighting/BRDF.hlsl @@ -3,7 +3,7 @@ #ifndef __BRDF__ #define __BRDF__ -#include "./Flax/Math.hlsl" +#include "./Flax/Math/Math.hlsl" float3 Diffuse_Lambert(float3 diffuseColor) { diff --git a/Source/Shaders/ExponentialHeightFog.hlsl b/Source/Shaders/Lighting/ExponentialHeightFog.hlsl similarity index 99% rename from Source/Shaders/ExponentialHeightFog.hlsl rename to Source/Shaders/Lighting/ExponentialHeightFog.hlsl index f6fb918f5..ff47c3023 100644 --- a/Source/Shaders/ExponentialHeightFog.hlsl +++ b/Source/Shaders/Lighting/ExponentialHeightFog.hlsl @@ -4,7 +4,7 @@ #define __EXPONENTIAL_HEIGHT_FOG__ #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" +#include "./Flax/Math/Math.hlsl" // Structure that contains information about exponential height fog struct ExponentialHeightFogData diff --git a/Source/Shaders/Fog.shader b/Source/Shaders/Lighting/Fog.shader similarity index 94% rename from Source/Shaders/Fog.shader rename to Source/Shaders/Lighting/Fog.shader index ce5a95a00..5a9952e9d 100644 --- a/Source/Shaders/Fog.shader +++ b/Source/Shaders/Lighting/Fog.shader @@ -5,8 +5,8 @@ #include "./Flax/Common.hlsl" #include "./Flax/GBufferCommon.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/VolumetricFog.hlsl" -#include "./Flax/ExponentialHeightFog.hlsl" +#include "./Flax/Lighting/VolumetricFog.hlsl" +#include "./Flax/Lighting/ExponentialHeightFog.hlsl" // Disable Volumetric Fog if is not supported #if VOLUMETRIC_FOG && !CAN_USE_COMPUTE_SHADER diff --git a/Source/Shaders/IESProfile.hlsl b/Source/Shaders/Lighting/IESProfile.hlsl similarity index 100% rename from Source/Shaders/IESProfile.hlsl rename to Source/Shaders/Lighting/IESProfile.hlsl diff --git a/Source/Shaders/Lighting.hlsl b/Source/Shaders/Lighting/Lighting.hlsl similarity index 99% rename from Source/Shaders/Lighting.hlsl rename to Source/Shaders/Lighting/Lighting.hlsl index 28b8a3feb..1c02c28d1 100644 --- a/Source/Shaders/Lighting.hlsl +++ b/Source/Shaders/Lighting/Lighting.hlsl @@ -3,7 +3,7 @@ #ifndef __LIGHTING__ #define __LIGHTING__ -#include "./Flax/LightingCommon.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" ShadowSample GetShadow(LightData lightData, GBufferSample gBuffer, float4 shadowMask) { diff --git a/Source/Shaders/LightingCommon.hlsl b/Source/Shaders/Lighting/LightingCommon.hlsl similarity index 99% rename from Source/Shaders/LightingCommon.hlsl rename to Source/Shaders/Lighting/LightingCommon.hlsl index 04a32a5b9..16c5f5337 100644 --- a/Source/Shaders/LightingCommon.hlsl +++ b/Source/Shaders/Lighting/LightingCommon.hlsl @@ -3,7 +3,7 @@ #ifndef __LIGHTING_COMMON__ #define __LIGHTING_COMMON__ -#include "./Flax/BRDF.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" #include "./Flax/GBufferCommon.hlsl" // Disables directional lighting (no shadowing with dot(N, L), eg. for smoke particles) diff --git a/Source/Shaders/Lights.shader b/Source/Shaders/Lighting/Lights.shader similarity index 95% rename from Source/Shaders/Lights.shader rename to Source/Shaders/Lighting/Lights.shader index fa4763faf..b147bf39b 100644 --- a/Source/Shaders/Lights.shader +++ b/Source/Shaders/Lighting/Lights.shader @@ -4,11 +4,11 @@ #include "./Flax/Common.hlsl" #include "./Flax/MaterialCommon.hlsl" -#include "./Flax/LightingCommon.hlsl" -#include "./Flax/IESProfile.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" +#include "./Flax/Lighting/IESProfile.hlsl" +#include "./Flax/Lighting/Lighting.hlsl" +#include "./Flax/Math/Noise.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/Lighting.hlsl" -#include "./Flax/Noise.hlsl" // Per light data META_CB_BEGIN(0, PerLight) @@ -142,7 +142,7 @@ float4 PS_Overlap(Model_VS2PS input) : SV_Target0 #ifdef _PS_Complexity -#include "./Flax/Outlines.hlsl" +#include "./Flax/Utils/Outlines.hlsl" // Pixel shader for light complexity rendering META_PS(true, FEATURE_LEVEL_ES2) diff --git a/Source/Shaders/SSAO.shader b/Source/Shaders/Lighting/SSAO.shader similarity index 100% rename from Source/Shaders/SSAO.shader rename to Source/Shaders/Lighting/SSAO.shader diff --git a/Source/Shaders/Sky.shader b/Source/Shaders/Lighting/Sky.shader similarity index 95% rename from Source/Shaders/Sky.shader rename to Source/Shaders/Lighting/Sky.shader index 95cde2ffc..60a9816c4 100644 --- a/Source/Shaders/Sky.shader +++ b/Source/Shaders/Lighting/Sky.shader @@ -3,9 +3,8 @@ #include "./Flax/Common.hlsl" #include "./Flax/MaterialCommon.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/Common.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/AtmosphereFog.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Lighting/AtmosphereFog.hlsl" META_CB_BEGIN(0, Data) float4x4 WorldViewProjection; diff --git a/Source/Shaders/VolumetricFog.hlsl b/Source/Shaders/Lighting/VolumetricFog.hlsl similarity index 98% rename from Source/Shaders/VolumetricFog.hlsl rename to Source/Shaders/Lighting/VolumetricFog.hlsl index ad74a10c5..ea9eff650 100644 --- a/Source/Shaders/VolumetricFog.hlsl +++ b/Source/Shaders/Lighting/VolumetricFog.hlsl @@ -3,7 +3,7 @@ #ifndef __VOLUMETRIC_FOG__ #define __VOLUMETRIC_FOG__ -#include "./Flax/Noise.hlsl" +#include "./Flax/Math/Noise.hlsl" #define VOLUMETRIC_FOG_GRID_Z_LINEAR 1 diff --git a/Source/Shaders/VolumetricFog.shader b/Source/Shaders/Lighting/VolumetricFog.shader similarity index 98% rename from Source/Shaders/VolumetricFog.shader rename to Source/Shaders/Lighting/VolumetricFog.shader index b098174a9..651383e79 100644 --- a/Source/Shaders/VolumetricFog.shader +++ b/Source/Shaders/Lighting/VolumetricFog.shader @@ -17,11 +17,11 @@ #define DEBUG_VOXELS 0 #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" -#include "./Flax/LightingCommon.hlsl" -#include "./Flax/ShadowsSampling.hlsl" +#include "./Flax/Math/Math.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" +#include "./Flax/Shadows/ShadowsSampling.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/VolumetricFog.hlsl" +#include "./Flax/Lighting/VolumetricFog.hlsl" #include "./Flax/GI/DDGI.hlsl" struct SkyLightData diff --git a/Source/Shaders/Collisions.hlsl b/Source/Shaders/Math/Collisions.hlsl similarity index 100% rename from Source/Shaders/Collisions.hlsl rename to Source/Shaders/Math/Collisions.hlsl diff --git a/Source/Shaders/Math.hlsl b/Source/Shaders/Math/Math.hlsl similarity index 100% rename from Source/Shaders/Math.hlsl rename to Source/Shaders/Math/Math.hlsl diff --git a/Source/Shaders/Matrix.hlsl b/Source/Shaders/Math/Matrix.hlsl similarity index 100% rename from Source/Shaders/Matrix.hlsl rename to Source/Shaders/Math/Matrix.hlsl diff --git a/Source/Shaders/MonteCarlo.hlsl b/Source/Shaders/Math/MonteCarlo.hlsl similarity index 100% rename from Source/Shaders/MonteCarlo.hlsl rename to Source/Shaders/Math/MonteCarlo.hlsl diff --git a/Source/Shaders/Noise.hlsl b/Source/Shaders/Math/Noise.hlsl similarity index 100% rename from Source/Shaders/Noise.hlsl rename to Source/Shaders/Math/Noise.hlsl diff --git a/Source/Shaders/Octahedral.hlsl b/Source/Shaders/Math/Octahedral.hlsl similarity index 100% rename from Source/Shaders/Octahedral.hlsl rename to Source/Shaders/Math/Octahedral.hlsl diff --git a/Source/Shaders/Packing.hlsl b/Source/Shaders/Math/Packing.hlsl similarity index 100% rename from Source/Shaders/Packing.hlsl rename to Source/Shaders/Math/Packing.hlsl diff --git a/Source/Shaders/Quaternion.hlsl b/Source/Shaders/Math/Quaternion.hlsl similarity index 100% rename from Source/Shaders/Quaternion.hlsl rename to Source/Shaders/Math/Quaternion.hlsl diff --git a/Source/Shaders/Random.hlsl b/Source/Shaders/Math/Random.hlsl similarity index 100% rename from Source/Shaders/Random.hlsl rename to Source/Shaders/Math/Random.hlsl diff --git a/Source/Shaders/SH.hlsl b/Source/Shaders/Math/SH.hlsl similarity index 100% rename from Source/Shaders/SH.hlsl rename to Source/Shaders/Math/SH.hlsl diff --git a/Source/Shaders/ACES.hlsl b/Source/Shaders/PostFX/ACES.hlsl similarity index 100% rename from Source/Shaders/ACES.hlsl rename to Source/Shaders/PostFX/ACES.hlsl diff --git a/Source/Shaders/ColorGrading.shader b/Source/Shaders/PostFX/ColorGrading.shader similarity index 99% rename from Source/Shaders/ColorGrading.shader rename to Source/Shaders/PostFX/ColorGrading.shader index e4ea1c847..bedabde1f 100644 --- a/Source/Shaders/ColorGrading.shader +++ b/Source/Shaders/PostFX/ColorGrading.shader @@ -1,8 +1,8 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/GammaCorrectionCommon.hlsl" -#include "./Flax/ACES.hlsl" +#include "./Flax/PostFX/GammaCorrectionCommon.hlsl" +#include "./Flax/PostFX/ACES.hlsl" #ifdef _PS_Lut3D #define USE_VOLUME_LUT 1 diff --git a/Source/Shaders/DepthOfField.shader b/Source/Shaders/PostFX/DepthOfField.shader similarity index 100% rename from Source/Shaders/DepthOfField.shader rename to Source/Shaders/PostFX/DepthOfField.shader diff --git a/Source/Shaders/EyeAdaptation.shader b/Source/Shaders/PostFX/EyeAdaptation.shader similarity index 100% rename from Source/Shaders/EyeAdaptation.shader rename to Source/Shaders/PostFX/EyeAdaptation.shader diff --git a/Source/Shaders/GammaCorrectionCommon.hlsl b/Source/Shaders/PostFX/GammaCorrectionCommon.hlsl similarity index 98% rename from Source/Shaders/GammaCorrectionCommon.hlsl rename to Source/Shaders/PostFX/GammaCorrectionCommon.hlsl index 671682fd2..9b8355f61 100644 --- a/Source/Shaders/GammaCorrectionCommon.hlsl +++ b/Source/Shaders/PostFX/GammaCorrectionCommon.hlsl @@ -3,7 +3,7 @@ #ifndef __GAMMA_CORRECTION_COMMON__ #define __GAMMA_CORRECTION_COMMON__ -#include "./Flax/Math.hlsl" +#include "./Flax/Math/Math.hlsl" // Shared configs for Color Grading LUT #define COLOR_GRADING_LUT_LOG 1 diff --git a/Source/Shaders/Histogram.shader b/Source/Shaders/PostFX/Histogram.shader similarity index 100% rename from Source/Shaders/Histogram.shader rename to Source/Shaders/PostFX/Histogram.shader diff --git a/Source/Shaders/MotionBlur.shader b/Source/Shaders/PostFX/MotionBlur.shader similarity index 100% rename from Source/Shaders/MotionBlur.shader rename to Source/Shaders/PostFX/MotionBlur.shader diff --git a/Source/Shaders/PostProcessing.shader b/Source/Shaders/PostFX/PostProcessing.shader similarity index 99% rename from Source/Shaders/PostProcessing.shader rename to Source/Shaders/PostFX/PostProcessing.shader index e3e1509a7..65b6fe8f7 100644 --- a/Source/Shaders/PostProcessing.shader +++ b/Source/Shaders/PostFX/PostProcessing.shader @@ -21,9 +21,9 @@ // #include "./Flax/Common.hlsl" -#include "./Flax/Random.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/GammaCorrectionCommon.hlsl" +#include "./Flax/Math/Random.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/PostFX/GammaCorrectionCommon.hlsl" #define GB_RADIUS 6 #define GB_KERNEL_SIZE (GB_RADIUS * 2 + 1) diff --git a/Source/Shaders/ProbesFilter.shader b/Source/Shaders/Reflections/ProbesFilter.shader similarity index 93% rename from Source/Shaders/ProbesFilter.shader rename to Source/Shaders/Reflections/ProbesFilter.shader index c64a281f2..a49c19bf3 100644 --- a/Source/Shaders/ProbesFilter.shader +++ b/Source/Shaders/Reflections/ProbesFilter.shader @@ -1,9 +1,9 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/BRDF.hlsl" -#include "./Flax/MonteCarlo.hlsl" -#include "./Flax/SH.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" +#include "./Flax/Math/MonteCarlo.hlsl" +#include "./Flax/Math/SH.hlsl" META_CB_BEGIN(0, Data) float2 Dummy0; diff --git a/Source/Shaders/Reflections.shader b/Source/Shaders/Reflections/Reflections.shader similarity index 96% rename from Source/Shaders/Reflections.shader rename to Source/Shaders/Reflections/Reflections.shader index d195efeb7..c0d9a4095 100644 --- a/Source/Shaders/Reflections.shader +++ b/Source/Shaders/Reflections/Reflections.shader @@ -1,11 +1,11 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/BRDF.hlsl" -#include "./Flax/Noise.hlsl" #include "./Flax/GBuffer.hlsl" #include "./Flax/MaterialCommon.hlsl" -#include "./Flax/ReflectionsCommon.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Reflections/ReflectionsCommon.hlsl" // Enable/disable blurring SSR during sampling results and mixing with reflections buffer #define SSR_MIX_BLUR (!defined(PLATFORM_WEB) && !defined(PLATFORM_ANDROID) && !defined(PLATFORM_IOS) && !defined(PLATFORM_SWITCH)) diff --git a/Source/Shaders/ReflectionsCommon.hlsl b/Source/Shaders/Reflections/ReflectionsCommon.hlsl similarity index 98% rename from Source/Shaders/ReflectionsCommon.hlsl rename to Source/Shaders/Reflections/ReflectionsCommon.hlsl index ef05adefc..e10ed7956 100644 --- a/Source/Shaders/ReflectionsCommon.hlsl +++ b/Source/Shaders/Reflections/ReflectionsCommon.hlsl @@ -4,8 +4,8 @@ #define __REFLECTIONS_COMMON__ #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/Quaternion.hlsl" -#include "./Flax/BRDF.hlsl" +#include "./Flax/Math/Quaternion.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" // Packed env probe data struct EnvProbeData diff --git a/Source/Shaders/SSR.hlsl b/Source/Shaders/Reflections/SSR.hlsl similarity index 98% rename from Source/Shaders/SSR.hlsl rename to Source/Shaders/Reflections/SSR.hlsl index 63d55c062..ee43fe4a8 100644 --- a/Source/Shaders/SSR.hlsl +++ b/Source/Shaders/Reflections/SSR.hlsl @@ -1,9 +1,9 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/BRDF.hlsl" -#include "./Flax/Random.hlsl" -#include "./Flax/MonteCarlo.hlsl" +#include "./Flax/Lighting/BRDF.hlsl" +#include "./Flax/Math/Random.hlsl" +#include "./Flax/Math/MonteCarlo.hlsl" #include "./Flax/GBufferCommon.hlsl" #if SSR_USE_HZB #if REVERSE_Z diff --git a/Source/Shaders/SSR.shader b/Source/Shaders/Reflections/SSR.shader similarity index 97% rename from Source/Shaders/SSR.shader rename to Source/Shaders/Reflections/SSR.shader index 7a132bb7a..a3c56fe89 100644 --- a/Source/Shaders/SSR.shader +++ b/Source/Shaders/Reflections/SSR.shader @@ -10,12 +10,12 @@ #define SSR_REDUCE_HIGHLIGHTS 1 #include "./Flax/Common.hlsl" -#include "./Flax/LightingCommon.hlsl" -#include "./Flax/ReflectionsCommon.hlsl" -#include "./Flax/SSR.hlsl" #include "./Flax/GBuffer.hlsl" -#include "./Flax/Temporal.hlsl" -#include "./Flax/GlobalSignDistanceField.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" +#include "./Flax/Reflections/ReflectionsCommon.hlsl" +#include "./Flax/Reflections/SSR.hlsl" +#include "./Flax/AntiAliasing/Temporal.hlsl" +#include "./Flax/Utils/GlobalSignDistanceField.hlsl" #include "./Flax/GI/GlobalSurfaceAtlas.hlsl" #define SSR_USE_SDF (USE_GLOBAL_SURFACE_ATLAS && CAN_USE_GLOBAL_SURFACE_ATLAS) diff --git a/Source/Shaders/Shadows.shader b/Source/Shaders/Shadows/Shadows.shader similarity index 98% rename from Source/Shaders/Shadows.shader rename to Source/Shaders/Shadows/Shadows.shader index 97d293604..309402cbd 100644 --- a/Source/Shaders/Shadows.shader +++ b/Source/Shaders/Shadows/Shadows.shader @@ -6,7 +6,7 @@ #include "./Flax/Common.hlsl" #include "./Flax/GBuffer.hlsl" #include "./Flax/MaterialCommon.hlsl" -#include "./Flax/ShadowsSampling.hlsl" +#include "./Flax/Shadows/ShadowsSampling.hlsl" META_CB_BEGIN(0, PerLight) GBufferData GBuffer; @@ -26,7 +26,7 @@ DECLARE_GBUFFERDATA_ACCESS(GBuffer) #if CONTACT_SHADOWS -#include "./Flax/Noise.hlsl" +#include "./Flax/Math/Noise.hlsl" float RayCastScreenSpaceShadow(GBufferData gBufferData, GBufferSample gBuffer, float3 rayStartWS, float3 rayDirWS, float rayLength, float dither = 0.5f) { diff --git a/Source/Shaders/ShadowsCommon.hlsl b/Source/Shaders/Shadows/ShadowsCommon.hlsl similarity index 100% rename from Source/Shaders/ShadowsCommon.hlsl rename to Source/Shaders/Shadows/ShadowsCommon.hlsl diff --git a/Source/Shaders/ShadowsSampling.hlsl b/Source/Shaders/Shadows/ShadowsSampling.hlsl similarity index 99% rename from Source/Shaders/ShadowsSampling.hlsl rename to Source/Shaders/Shadows/ShadowsSampling.hlsl index 8a1b6fb1f..d0678e9f9 100644 --- a/Source/Shaders/ShadowsSampling.hlsl +++ b/Source/Shaders/Shadows/ShadowsSampling.hlsl @@ -13,11 +13,11 @@ #define SHADOWS_PCSS (SHADOWS_QUALITY >= 3) #endif -#include "./Flax/ShadowsCommon.hlsl" +#include "./Flax/Shadows/ShadowsCommon.hlsl" #include "./Flax/GBufferCommon.hlsl" -#include "./Flax/LightingCommon.hlsl" +#include "./Flax/Lighting/LightingCommon.hlsl" #if SHADOWS_CSM_DITHERING || SHADOWS_PCSS -#include "./Flax/Random.hlsl" +#include "./Flax/Math/Random.hlsl" #endif #if FEATURE_LEVEL >= FEATURE_LEVEL_SM5 || defined(WGSL) diff --git a/Source/Shaders/BitonicSort.shader b/Source/Shaders/Utils/BitonicSort.shader similarity index 99% rename from Source/Shaders/BitonicSort.shader rename to Source/Shaders/Utils/BitonicSort.shader index a72ee59b7..a77d6fbe9 100644 --- a/Source/Shaders/BitonicSort.shader +++ b/Source/Shaders/Utils/BitonicSort.shader @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" +#include "./Flax/Math/Math.hlsl" #ifndef THREAD_GROUP_SIZE #define THREAD_GROUP_SIZE 1024 diff --git a/Source/Shaders/DebugDraw.shader b/Source/Shaders/Utils/DebugDraw.shader similarity index 100% rename from Source/Shaders/DebugDraw.shader rename to Source/Shaders/Utils/DebugDraw.shader diff --git a/Source/Shaders/GPUParticlesSorting.shader b/Source/Shaders/Utils/GPUParticlesSorting.shader similarity index 100% rename from Source/Shaders/GPUParticlesSorting.shader rename to Source/Shaders/Utils/GPUParticlesSorting.shader diff --git a/Source/Shaders/GlobalSignDistanceField.hlsl b/Source/Shaders/Utils/GlobalSignDistanceField.hlsl similarity index 99% rename from Source/Shaders/GlobalSignDistanceField.hlsl rename to Source/Shaders/Utils/GlobalSignDistanceField.hlsl index 6987e10cb..2609b3f25 100644 --- a/Source/Shaders/GlobalSignDistanceField.hlsl +++ b/Source/Shaders/Utils/GlobalSignDistanceField.hlsl @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/Collisions.hlsl" +#include "./Flax/Math/Collisions.hlsl" // This must match C++ #define GLOBAL_SDF_RASTERIZE_CHUNK_SIZE 32 diff --git a/Source/Shaders/GlobalSignDistanceField.shader b/Source/Shaders/Utils/GlobalSignDistanceField.shader similarity index 98% rename from Source/Shaders/GlobalSignDistanceField.shader rename to Source/Shaders/Utils/GlobalSignDistanceField.shader index 3713e049a..b4a763d4f 100644 --- a/Source/Shaders/GlobalSignDistanceField.shader +++ b/Source/Shaders/Utils/GlobalSignDistanceField.shader @@ -1,9 +1,9 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/Math.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/GlobalSignDistanceField.hlsl" +#include "./Flax/Math/Math.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Utils/GlobalSignDistanceField.hlsl" #include "./Flax/TerrainCommon.hlsl" #define GLOBAL_SDF_RASTERIZE_MODEL_MAX_COUNT 28 @@ -366,8 +366,8 @@ float4 PS_Debug(Quad_VS2PS input) : SV_Target #define NO_GBUFFER_SAMPLING #include "./Flax/GBuffer.hlsl" -#include "./Flax/Noise.hlsl" -#include "./Flax/Outlines.hlsl" +#include "./Flax/Math/Noise.hlsl" +#include "./Flax/Utils/Outlines.hlsl" META_CB_BEGIN(2, OverdrawData) GBufferData GBuffer; diff --git a/Source/Shaders/MeshAccelerationStructure.hlsl b/Source/Shaders/Utils/MeshAccelerationStructure.hlsl similarity index 99% rename from Source/Shaders/MeshAccelerationStructure.hlsl rename to Source/Shaders/Utils/MeshAccelerationStructure.hlsl index 0559e5f55..2c0bbc840 100644 --- a/Source/Shaders/MeshAccelerationStructure.hlsl +++ b/Source/Shaders/Utils/MeshAccelerationStructure.hlsl @@ -3,7 +3,7 @@ #ifndef __MESH_ACCELERATION_STRUCTURE__ #define __MESH_ACCELERATION_STRUCTURE__ -#include "./Flax/Collisions.hlsl" +#include "./Flax/Math/Collisions.hlsl" // This must match MeshAccelerationStructure::ToGPU #define BVH_STACK_SIZE 32 diff --git a/Source/Shaders/MultiScaler.shader b/Source/Shaders/Utils/MultiScaler.shader similarity index 100% rename from Source/Shaders/MultiScaler.shader rename to Source/Shaders/Utils/MultiScaler.shader diff --git a/Source/Shaders/Outlines.hlsl b/Source/Shaders/Utils/Outlines.hlsl similarity index 100% rename from Source/Shaders/Outlines.hlsl rename to Source/Shaders/Utils/Outlines.hlsl diff --git a/Source/Shaders/SDF.shader b/Source/Shaders/Utils/SDF.shader similarity index 98% rename from Source/Shaders/SDF.shader rename to Source/Shaders/Utils/SDF.shader index 77e27d8f9..21a910ab0 100644 --- a/Source/Shaders/SDF.shader +++ b/Source/Shaders/Utils/SDF.shader @@ -1,7 +1,7 @@ // Copyright (c) Wojciech Figat. All rights reserved. #include "./Flax/Common.hlsl" -#include "./Flax/MeshAccelerationStructure.hlsl" +#include "./Flax/Utils/MeshAccelerationStructure.hlsl" META_CB_BEGIN(0, Data) int3 Resolution;