From b551a556e10a2a9f97cda73f17c743ee7cbcab9a Mon Sep 17 00:00:00 2001 From: Geoff Birch Date: Thu, 29 May 2025 12:12:53 +0100 Subject: [PATCH 1/9] Update Shared Deps Submodule for diversion to package approach --- Explorer/Assets/git-submodules/unity-shared-dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Explorer/Assets/git-submodules/unity-shared-dependencies b/Explorer/Assets/git-submodules/unity-shared-dependencies index a82710fbd45..117a9706630 160000 --- a/Explorer/Assets/git-submodules/unity-shared-dependencies +++ b/Explorer/Assets/git-submodules/unity-shared-dependencies @@ -1 +1 @@ -Subproject commit a82710fbd45c0a7ede463418734a6bcc9bbc89f3 +Subproject commit 117a970663035f08070f4aa481e0b108176a498a From 70c99f9d1da598c9680a89563d577627cb34eaa8 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:14:08 -0300 Subject: [PATCH 2/9] Update windows package --- .../StreamingAssets/AssetBundles/dcl/scene_ignore_windows | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_windows b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_windows index c0b169fb455..c734e26c996 100644 --- a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_windows +++ b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_windows @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2388b8798dd7928076b3dad1dd4288450ef9e9f0ebadc9e2714aaaf042a7ea98 -size 660704 +oid sha256:fc00878ce3694e1a90cdf055b1e2e636e8a25557a7570bffe341dbc5425b44c9 +size 563584 From ad53ad9454c438a897b2bbb9eec33eade99a45d7 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:23:00 -0300 Subject: [PATCH 3/9] Deleted the submodule --- Explorer/Assets/git-submodules.meta | 8 -------- Explorer/Assets/git-submodules/unity-shared-dependencies | 1 - .../Assets/git-submodules/unity-shared-dependencies.meta | 8 -------- Explorer/Packages/manifest.json | 1 + Explorer/Packages/packages-lock.json | 7 +++++++ 5 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 Explorer/Assets/git-submodules.meta delete mode 160000 Explorer/Assets/git-submodules/unity-shared-dependencies delete mode 100644 Explorer/Assets/git-submodules/unity-shared-dependencies.meta diff --git a/Explorer/Assets/git-submodules.meta b/Explorer/Assets/git-submodules.meta deleted file mode 100644 index 9c5448ef472..00000000000 --- a/Explorer/Assets/git-submodules.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0a6e736223f72446a8920c398e9d0fb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Assets/git-submodules/unity-shared-dependencies b/Explorer/Assets/git-submodules/unity-shared-dependencies deleted file mode 160000 index 117a9706630..00000000000 --- a/Explorer/Assets/git-submodules/unity-shared-dependencies +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 117a970663035f08070f4aa481e0b108176a498a diff --git a/Explorer/Assets/git-submodules/unity-shared-dependencies.meta b/Explorer/Assets/git-submodules/unity-shared-dependencies.meta deleted file mode 100644 index de91ea75c04..00000000000 --- a/Explorer/Assets/git-submodules/unity-shared-dependencies.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 912580fb0a59bdb4da4963bce5bee891 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Explorer/Packages/manifest.json b/Explorer/Packages/manifest.json index e75bd95d804..d39dc38442c 100644 --- a/Explorer/Packages/manifest.json +++ b/Explorer/Packages/manifest.json @@ -10,6 +10,7 @@ "com.dcl.gpui-assets": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.dcl.gpui-assets", "com.decentraland.livekit-sdk": "https://github.com/decentraland/client-sdk-unity.git", "com.decentraland.rpc-csharp": "https://github.com/decentraland/rpc-csharp.git?path=rpc-csharp/src", + "com.decentraland.unity-shared-dependencies": "https://github.com/decentraland/unity-shared-dependencies.git", "com.gurbu.gpui-pro": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.gurbu.gpui-pro", "com.gurbu.gpui-pro.terrain": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.gurbu.gpui-pro.terrain", "com.mackysoft.serializereference-extensions": "1.3.1", diff --git a/Explorer/Packages/packages-lock.json b/Explorer/Packages/packages-lock.json index 2435a1e101c..5d3180605bf 100644 --- a/Explorer/Packages/packages-lock.json +++ b/Explorer/Packages/packages-lock.json @@ -77,6 +77,13 @@ "dependencies": {}, "hash": "8aeefd7c62ed6543651a68ad43285cf519212931" }, + "com.decentraland.unity-shared-dependencies": { + "version": "https://github.com/decentraland/unity-shared-dependencies.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "117a970663035f08070f4aa481e0b108176a498a" + }, "com.gurbu.gpui-pro": { "version": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.gurbu.gpui-pro", "depth": 0, From 077eed0ed1cecaef8c9d3f863c3b09213cee223a Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:27:11 -0300 Subject: [PATCH 4/9] Update readme --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 11086b0f1c0..90bc9cb89ab 100644 --- a/README.md +++ b/README.md @@ -46,13 +46,7 @@ Unity Explorer is the official desktop client implementation for Decentraland 2. git clone https://github.com/decentraland/unity-explorer.git ``` -2. Install and update the submodules: - ``` - git submodule update --init - git submodule update . - ``` - -3. Open the project in Unity +2. Open the project in Unity ## 🎮 Quick Start From 2e92e89bbc1e5ca47a42507a394eb10f6a76b490 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:30:54 -0300 Subject: [PATCH 5/9] Update cloud build action --- .../StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs | 2 +- Explorer/Assets/Editor/CloudBuild.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs index 212e8e52731..a105a4ee674 100644 --- a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs +++ b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs @@ -66,7 +66,7 @@ public static void CompileTheSceneShader(BuildTarget bt) } } - const string PATH = "Assets/git-submodules/unity-shared-dependencies/Runtime/Shaders/SceneRendering/"; + const string PATH = "Library/PackageCache/com.decentraland.unity-shared-dependencies@117a97066303/Runtime/Shaders/SceneRendering/"; var importers = new List(); diff --git a/Explorer/Assets/Editor/CloudBuild.cs b/Explorer/Assets/Editor/CloudBuild.cs index a4225ac77dd..70c5bbc9403 100644 --- a/Explorer/Assets/Editor/CloudBuild.cs +++ b/Explorer/Assets/Editor/CloudBuild.cs @@ -34,8 +34,6 @@ public static void PreExport() //This should ensure that the roslyn compiler has been run and everything is generated as needed. EditorApplication.ExecuteMenuItem("File/Save Project"); - CompileSceneShader.CompileTheSceneShader(EditorUserBuildSettings.activeBuildTarget); - // Set version for this build var buildVersion = Parameters["BUILD_VERSION"] as string; PlayerSettings.bundleVersion = buildVersion; From b857ec30c772dc2861b9a0b65061fd73ee6d3a98 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:41:30 -0300 Subject: [PATCH 6/9] Package update --- Explorer/Packages/packages-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Explorer/Packages/packages-lock.json b/Explorer/Packages/packages-lock.json index 5d3180605bf..ce89562b0bb 100644 --- a/Explorer/Packages/packages-lock.json +++ b/Explorer/Packages/packages-lock.json @@ -82,7 +82,7 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "117a970663035f08070f4aa481e0b108176a498a" + "hash": "e4cb3c41a94ba810f35e743bfdabbbaaa8fd8ab2" }, "com.gurbu.gpui-pro": { "version": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.gurbu.gpui-pro", From 88dd7de0e970c8d1ba63830789a99717b5ed20b6 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Molteni Date: Mon, 2 Jun 2025 14:58:31 -0300 Subject: [PATCH 7/9] Wrote TODO --- .../AssetBundles/Editor/CompileSceneShader.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs index a105a4ee674..03af1ff8c20 100644 --- a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs +++ b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/Editor/CompileSceneShader.cs @@ -66,7 +66,8 @@ public static void CompileTheSceneShader(BuildTarget bt) } } - const string PATH = "Library/PackageCache/com.decentraland.unity-shared-dependencies@117a97066303/Runtime/Shaders/SceneRendering/"; + //TODO: This path is not used anymore since we are using packages now. We need to find the best way to rebuild the package that can fit our pipeline + const string PATH = "Assets/git-submodules/unity-shared-dependencies/Runtime/Shaders/SceneRendering/"; var importers = new List(); From 3b7a73ede90ea390b0183bb22eb65685fdbc03ea Mon Sep 17 00:00:00 2001 From: Juan Molteni Date: Mon, 2 Jun 2025 15:12:24 -0300 Subject: [PATCH 8/9] Updated mac asset --- .../Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_mac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_mac b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_mac index ecc3757fc5f..cf053142f0c 100644 --- a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_mac +++ b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_mac @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a8dba348a487140bec26eb65266e4daec7fd4d8c6f78e01e241fbfa6a4d2362 -size 3512400 +oid sha256:8d7d823fb2755d1ced76a745880e9fdf022481ce2f83d8542064b84ffca2b4fe +size 1567392 From f67e57d66cb8e21f34a58fade165a3554ac413ed Mon Sep 17 00:00:00 2001 From: Juan Molteni Date: Mon, 2 Jun 2025 15:24:29 -0300 Subject: [PATCH 9/9] Fix none compiling shaders --- .../Avatar_CelShading/Avatar_CelShading_LitForwardPass.hlsl | 2 +- .../Shaders/Avatar_CelShading/Avatar_CelShading_LitInput.hlsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitForwardPass.hlsl b/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitForwardPass.hlsl index 4af3739acce..63ec3115d4b 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitForwardPass.hlsl +++ b/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitForwardPass.hlsl @@ -4,7 +4,7 @@ #include "Avatar_CelShading_Input.hlsl" #include "Avatar_CelShading_SurfaceData.hlsl" #include "Avatar_CelShading_Lighting.hlsl" -#include "Assets/git-submodules/unity-shared-dependencies/Runtime/Shaders/URP/FadeDithering.hlsl" +#include "Packages/com.decentraland.unity-shared-dependencies/Runtime/Shaders/URP/FadeDithering.hlsl" #if (defined(_NORMALMAP) || (defined(_PARALLAXMAP) && !defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR))) || defined(_DETAIL) #define REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR diff --git a/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitInput.hlsl b/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitInput.hlsl index 458f8348ab4..29076d8e367 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitInput.hlsl +++ b/Explorer/Assets/DCL/AvatarRendering/Shaders/Avatar_CelShading/Avatar_CelShading_LitInput.hlsl @@ -3,7 +3,7 @@ #include "Avatar_CelShading_Core.hlsl" #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl" -#include "Assets/git-submodules/unity-shared-dependencies/Runtime/Shaders/URP/Constants.hlsl" +#include "Packages/com.decentraland.unity-shared-dependencies/Runtime/Shaders/URP/Constants.hlsl" #include "Avatar_CelShading_Shadows.hlsl" #include "Avatar_CelShading_Input.hlsl" #include "Avatar_CelShading_SurfaceData.hlsl"