release: 20220913 (#382)

decentraland · Sep 14, 2022 · a54aaa7 · a54aaa7
1 parent 52c962e
commit a54aaa7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktop.asmdef b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktop.asmdef
@@ -14,7 +14,9 @@
         "GUID:692b6c9fa5079416bb81826fb3806890",
         "GUID:55e59fab5b4394ec7b7e1960c6f1453f",
         "GUID:ddbcaa1d8ce9f489bb115e9daa589565",
-        "GUID:8ea35c85a2f0dc44788f8c3945cee408"
+        "GUID:8ea35c85a2f0dc44788f8c3945cee408",
+        "GUID:0e967802b778d404eac1ca5ea340e290",
+        "GUID:2f3b53e8380cc4aae947b17780173adb"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktopFactory.cs b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktopFactory.cs
@@ -19,7 +19,7 @@ public override IHUD CreateHUD(HUDElementID hudElementId)
                 hudElement = new ProfileHUDControllerDesktop(new UserProfileWebInterfaceBridge());
                 break;
             case HUDElementID.MINIMAP:
-                hudElement = new MinimapHUDControllerDesktop();
+                hudElement = new MinimapHUDControllerDesktop(MinimapMetadataController.i, new WebInterfaceHomeLocationController());
                 break;
             case HUDElementID.LOADING:
                 hudElement = new LoadingHUDControllerDesktop();

diff --git a/...top/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDControllerDesktop.cs b/...top/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDControllerDesktop.cs
@@ -6,4 +6,11 @@ protected override MinimapHUDView CreateView()
     {
         return MinimapHUDViewDesktop.Create(this);
     }
+
+    public MinimapHUDControllerDesktop(MinimapMetadataController minimapMetadataController, IHomeLocationController locationController) : base(minimapMetadataController, locationController)
+    {
+    }
+    public MinimapHUDControllerDesktop(MinimapHUDModel model, MinimapMetadataController minimapMetadataController, IHomeLocationController locationController) : base(model, minimapMetadataController, locationController)
+    {
+    }
 }
diff --git a/...r-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDDesktop.asmdef b/...r-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDDesktop.asmdef
@@ -3,7 +3,9 @@
     "rootNamespace": "",
     "references": [
         "GUID:692b6c9fa5079416bb81826fb3806890",
-        "GUID:b1087c5731ff68448a0a9c625bb7e52d"
+        "GUID:b1087c5731ff68448a0a9c625bb7e52d",
+        "GUID:0e967802b778d404eac1ca5ea340e290",
+        "GUID:2f3b53e8380cc4aae947b17780173adb"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/unity-renderer-desktop/Packages/packages-lock.json b/unity-renderer-desktop/Packages/packages-lock.json
@@ -79,7 +79,7 @@
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0"
       },
-      "hash": "dec78e7fe6669d49f6af87202b3c5d5b5af8880e"
+      "hash": "c5cb9f8cc6ee66872adb340e3d281aa3df0c425d"
     },
     "com.decentraland.videoplayer": {
       "version": "git+https://github.com/decentraland/DCLVideoPlayerUnity.git?path=Assets#main",

diff --git a/unity-renderer-desktop/TestResources/GLB/gltfshape-asset-bundle-colliders-no-renderers.glb b/unity-renderer-desktop/TestResources/GLB/gltfshape-asset-bundle-colliders-no-renderers.glb