Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public static void CompileTheSceneShader(BuildTarget bt)
}
}

//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
Comment thread
dalkia marked this conversation as resolved.
const string PATH = "Assets/git-submodules/unity-shared-dependencies/Runtime/Shaders/SceneRendering/";

var importers = new List<AssetImporter>();
Expand Down
2 changes: 0 additions & 2 deletions Explorer/Assets/Editor/CloudBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Comment thread
dalkia marked this conversation as resolved.

// Set version for this build
var buildVersion = Parameters["BUILD_VERSION"] as string;
PlayerSettings.bundleVersion = buildVersion;
Expand Down
Git LFS file not shown
Git LFS file not shown
8 changes: 0 additions & 8 deletions Explorer/Assets/git-submodules.meta

This file was deleted.

1 change: 0 additions & 1 deletion Explorer/Assets/git-submodules/unity-shared-dependencies
Submodule unity-shared-dependencies deleted from a82710
8 changes: 0 additions & 8 deletions Explorer/Assets/git-submodules/unity-shared-dependencies.meta

This file was deleted.

1 change: 1 addition & 0 deletions Explorer/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions Explorer/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "e4cb3c41a94ba810f35e743bfdabbbaaa8fd8ab2"
},
"com.gurbu.gpui-pro": {
"version": "git@github.com:decentraland/unity-explorer-packages.git?path=/GPUInstancerPro/com.gurbu.gpui-pro",
"depth": 0,
Expand Down
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down