feat: Updated unity version and dependencies (#33)

decentraland · Apr 5, 2023 · 063885b · 063885b
1 parent 50b5375
commit 063885b
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 73 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -29,7 +29,7 @@ jobs:
           context: .
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: quay.io/decentraland/asset-bundle-converter:next,quay.io/decentraland/asset-bundle-converter:${{ github.sha }}
-          # load: true
+          #load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |

diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN npm ci --only=production
 
 ########################## END OF BUILD STAGE ##########################
 
-FROM unityci/editor:2021.3.14f1-webgl-1
+FROM unityci/editor:2021.3.20f1-webgl-1
 
 RUN    apt-get update -y \
     && apt-get -y install \

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.asmdef b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.asmdef
@@ -22,7 +22,8 @@
     "overrideReferences": true,
     "precompiledReferences": [
         "Newtonsoft.Json.dll",
-        "Sentry.dll"
+        "Sentry.dll",
+        "Unity.Plastic.Newtonsoft.Json.dll"
     ],
     "autoReferenced": true,
     "defineConstraints": [],

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs
@@ -88,6 +88,8 @@ public enum Step
         private double visualTestStartupTime;
         private double visualTestEndTime;
 
+        private bool isExitForced = false;
+
         public AssetBundleConverter(Environment env, ClientSettings settings)
         {
             this.settings = settings;
@@ -111,7 +113,7 @@ public static async Task WaitUntilAsync(Func<bool> predicate, int sleep = 50)
         /// </summary>
         /// <param name="rawContents"></param>
         /// <returns></returns>
-        public async Task<State> Convert(IReadOnlyList<ContentServerUtils.MappingPair> rawContents)
+        public async Task<State> ConvertAsync(IReadOnlyList<ContentServerUtils.MappingPair> rawContents)
         {
             log.verboseEnabled = settings.verbose;
             var scene = EditorSceneManager.OpenScene(SCENE_NAME, OpenSceneMode.Single);
@@ -147,13 +149,17 @@ public async Task<State> Convert(IReadOnlyList<ContentServerUtils.MappingPair> r
             // Third step: we import gltfs
             importStartupTime = EditorApplication.timeSinceStartup;
 
+            if (isExitForced) return CurrentState;
+
             if (await ImportAllGltf())
             {
                 OnFinish();
 
                 return CurrentState;
             }
 
+            if (isExitForced) return CurrentState;
+
             importEndTime = EditorApplication.timeSinceStartup;
 
             EditorUtility.ClearProgressBar();
@@ -188,6 +194,8 @@ public async Task<State> Convert(IReadOnlyList<ContentServerUtils.MappingPair> r
                 bundlesEndTime = EditorApplication.timeSinceStartup;
             }
 
+            if (isExitForced) return CurrentState;
+
             if (settings.visualTest)
             {
                 visualTestStartupTime = EditorApplication.timeSinceStartup;
@@ -215,6 +223,8 @@ private async Task<bool> ImportAllGltf()
 
             foreach (GltfImportSettings gltf in gltfToWait)
             {
+                if (isExitForced) break;
+
                 var gltfUrl = gltf.url;
                 var gltfImport = gltf.import;
 
@@ -291,7 +301,7 @@ private async Task<bool> ImportAllGltf()
                             var message = "Fatal error when importing this object, check previous error messages";
                             log.Error(message);
                             errorReporter.ReportError(message, settings);
-                            Utils.Exit((int)ErrorCodes.GLTFAST_CRITICAL_ERROR);
+                            ForceExit((int)ErrorCodes.GLTFAST_CRITICAL_ERROR);
                             break;
                         }
                     }
@@ -300,7 +310,7 @@ private async Task<bool> ImportAllGltf()
                         var message = $"Failed to get the gltf importer for {gltfUrl} \nPath: {relativePath}";
                         log.Error(message);
                         errorReporter.ReportError(message, settings);
-                        Utils.Exit((int)ErrorCodes.GLTF_IMPORTER_NOT_FOUND);
+                        ForceExit((int)ErrorCodes.GLTF_IMPORTER_NOT_FOUND);
                         continue;
                     }
 
@@ -333,7 +343,7 @@ private async Task<bool> ImportAllGltf()
                     log.Error("UNCAUGHT FATAL: Failed to load GLTF " + gltf.AssetPath.hash);
                     Debug.LogException(e);
                     errorReporter.ReportException(new ConversionException(ConversionStep.Import, settings, e));
-                    Utils.Exit((int)ErrorCodes.GLTFAST_CRITICAL_ERROR);
+                    ForceExit((int)ErrorCodes.GLTFAST_CRITICAL_ERROR);
                     break;
                 }
             }
@@ -407,7 +417,7 @@ private void ExtractEmbedMaterialsFromGltf(List<Texture2D> textures, GltfImportS
                             var message = $"Failed to set texture \"{texName}\" to material \"{matName}\". This will cause white materials";
                             log.Error(message);
                             errorReporter.ReportError(message, settings);
-                            Utils.Exit((int)ErrorCodes.EMBED_MATERIAL_FAILURE);
+                            ForceExit((int)ErrorCodes.EMBED_MATERIAL_FAILURE);
                             return;
                         }
                     }
@@ -576,7 +586,7 @@ public void CleanAndExit(ErrorCodes errorCode)
             log.Info(logBuffer);
             Application.SetStackTraceLogType(LogType.Log, StackTraceLogType.ScriptOnly);
 
-            Utils.Exit((int)errorCode);
+            ForceExit((int)errorCode);
         }
 
         internal void CleanupWorkingFolders()
@@ -620,7 +630,7 @@ public virtual bool BuildAssetBundles(out AssetBundleManifest manifest)
                 var message = "Error generating asset bundle!";
                 log.Error(message);
                 errorReporter.ReportError(message, settings);
-                Utils.Exit((int)ErrorCodes.ASSET_BUNDLE_BUILD_FAIL);
+                ForceExit((int)ErrorCodes.ASSET_BUNDLE_BUILD_FAIL);
                 return false;
             }
 
@@ -727,6 +737,8 @@ private bool DownloadAssets(IReadOnlyList<ContentServerUtils.MappingPair> rawCon
 
                 foreach (var gltfPath in gltfPaths)
                 {
+                    if (isExitForced) break;
+
                     if (!string.IsNullOrEmpty(settings.importOnlyEntity))
                         if (!string.Equals(gltfPath.hash, settings.importOnlyEntity, StringComparison.CurrentCultureIgnoreCase))
                             continue;
@@ -807,6 +819,8 @@ internal List<AssetPath> DownloadImportableAssets(List<AssetPath> assetPaths)
 
             for (var i = 0; i < assetPaths.Count; i++)
             {
+                if (isExitForced) break;
+
                 EditorUtility.DisplayProgressBar("Asset Bundle Converter", "Downloading Importable Assets",
                     i / (float)assetPaths.Count);
 
@@ -838,11 +852,9 @@ internal List<AssetPath> DownloadImportableAssets(List<AssetPath> assetPaths)
 
                     ReduceTextureSizeIfNeeded(finalTexturePath, MAX_TEXTURE_SIZE);
                 }
-                else
-                {
-                    env.assetDatabase.ImportAsset(assetPath.finalPath, ImportAssetOptions.ForceUpdate);
-                    env.assetDatabase.SaveAssets();
-                }
+
+                env.assetDatabase.ImportAsset(assetPath.finalPath, ImportAssetOptions.ForceUpdate);
+                env.assetDatabase.SaveAssets();
 
                 SetDeterministicAssetDatabaseGuid(assetPath);
 
@@ -951,7 +963,7 @@ void FinallyImportAsset()
                 var message = $"Download Failed {finalUrl} -- {e.Message}";
                 log.Error(message);
                 errorReporter.ReportError(message, settings);
-                Utils.Exit((int)ErrorCodes.DOWNLOAD_FAILED);
+                ForceExit((int)ErrorCodes.DOWNLOAD_FAILED);
                 return null;
             }
 
@@ -998,7 +1010,7 @@ private void ReduceTextureSizeIfNeeded(string texturePath, float maxSize)
 
             float maxTextureSize = maxSize;
 
-            if (width < maxTextureSize && height < maxTextureSize)
+            if (width <= maxTextureSize && height <= maxTextureSize)
                 return;
 
             if (width >= height)
@@ -1011,9 +1023,6 @@ private void ReduceTextureSizeIfNeeded(string texturePath, float maxSize)
             Object.DestroyImmediate(tmpTex);
 
             File.WriteAllBytes(texturePath, endTex);
-
-            AssetDatabase.ImportAsset(PathUtils.GetRelativePathTo(Application.dataPath, texturePath), ImportAssetOptions.ForceUpdate);
-            AssetDatabase.SaveAssets();
         }
 
         /// <summary>
@@ -1030,6 +1039,8 @@ internal List<AssetPath> DownloadRawAssets(List<AssetPath> bufferPaths)
 
             for (var i = 0; i < bufferPaths.Count; i++)
             {
+                if (isExitForced) break;
+
                 EditorUtility.DisplayProgressBar("Asset Bundle Converter", "Downloading Raw Assets",
                     i / (float)bufferPaths.Count);
 
@@ -1060,5 +1071,11 @@ internal AssetPath DownloadGltf(AssetPath gltfPath)
 
             return path != null ? gltfPath : null;
         }
+
+        private void ForceExit(int errorCode = 0)
+        {
+            isExitForced = true;
+            Utils.Exit(errorCode);
+        }
     }
 }
diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/SceneClient.cs b/asset-bundle-converter/Assets/AssetBundleConverter/SceneClient.cs
@@ -318,13 +318,12 @@ private static AssetBundleConverter.State GetUnexpectedResult() =>
 
             log.Info($"Converting {mappingPairs.Count} entities...");
 
-            if (settings.verbose)
-                log.Info(string.Join('\n',mappingPairs.Select(mp => mp.file)));
+            log.Info(string.Join('\n',mappingPairs.Select(mp => mp.file)));
 
             EnsureEnvironment();
 
             var core = new AssetBundleConverter(env, settings);
-            await core.Convert(mappingPairs);
+            await core.ConvertAsync(mappingPairs);
             return core.CurrentState;
         }
     }

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Utils.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Utils.cs
@@ -7,7 +7,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
+using Unity.Plastic.Newtonsoft.Json;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Networking;

diff --git a/...erter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/GltFastFileProvider.cs b/...erter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/GltFastFileProvider.cs
@@ -70,6 +70,9 @@ class SyncTextureLoader : SyncFileLoader, ITextureDownload
 
         public override bool Success => Texture != null;
 
+        public IDisposableTexture GetTexture(bool forceSampleLinear) =>
+            new NonReusableTexture(Texture);
+
         public SyncTextureLoader(Uri url)
             : base(url)
         {
@@ -113,7 +116,7 @@ public async Task<IDownload> Request(Uri url)
             return new SyncFileLoader(newUrl);
         }
 
-        public async Task<ITextureDownload> RequestTexture(Uri url, bool nonReadable)
+        public async Task<ITextureDownload> RequestTexture(Uri url, bool nonReadable, bool forceLinear)
         {
             Uri newUrl = GetDependenciesPaths(RebuildUrl(url));
 

diff --git a/asset-bundle-converter/Assets/_Downloaded.meta b/asset-bundle-converter/Assets/_Downloaded.meta
diff --git a/asset-bundle-converter/Assets/git-submodules/glTFast b/asset-bundle-converter/Assets/git-submodules/glTFast
diff --git a/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies b/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies
diff --git a/asset-bundle-converter/Packages/manifest.json b/asset-bundle-converter/Packages/manifest.json
@@ -2,12 +2,12 @@
   "dependencies": {
     "com.atteneder.draco": "4.0.2",
     "com.atteneder.ktx": "2.2.3",
-    "com.unity.collab-proxy": "1.17.6",
-    "com.unity.ide.rider": "3.0.16",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.collab-proxy": "2.0.1",
+    "com.unity.ide.rider": "3.0.18",
+    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.meshopt.decompress": "0.1.0-preview.5",
-    "com.unity.render-pipelines.universal": "12.1.8",
+    "com.unity.render-pipelines.universal": "12.1.10",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",

diff --git a/asset-bundle-converter/Packages/packages-lock.json b/asset-bundle-converter/Packages/packages-lock.json
@@ -19,7 +19,7 @@
       "url": "https://package.openupm.com"
     },
     "com.unity.burst": {
-      "version": "1.7.3",
+      "version": "1.8.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -28,12 +28,10 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "2.0.1",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.0.1"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
@@ -44,7 +42,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.16",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -53,7 +51,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -85,15 +83,8 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.render-pipelines.core": {
-      "version": "12.1.8",
+      "version": "12.1.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -103,14 +94,14 @@
       }
     },
     "com.unity.render-pipelines.universal": {
-      "version": "12.1.8",
+      "version": "12.1.10",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.7.3",
-        "com.unity.render-pipelines.core": "12.1.8",
-        "com.unity.shadergraph": "12.1.8"
+        "com.unity.burst": "1.8.2",
+        "com.unity.render-pipelines.core": "12.1.10",
+        "com.unity.shadergraph": "12.1.10"
       }
     },
     "com.unity.searcher": {
@@ -120,23 +111,12 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.services.core": {
-      "version": "1.6.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.shadergraph": {
-      "version": "12.1.8",
+      "version": "12.1.10",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "12.1.8",
+        "com.unity.render-pipelines.core": "12.1.10",
         "com.unity.searcher": "4.9.1"
       }
     },
+10 −7		Editor/Scripts/EditorDownloadProvider.cs
+3 −3		Runtime/Scripts/GameObjectInstantiator.cs
+47 −34		Runtime/Scripts/GltfImport.cs
+10 −0		Runtime/Scripts/IDisposableTexture.cs
+3 −0		Runtime/Scripts/IDisposableTexture.cs.meta
+1 −1		Runtime/Scripts/Loading/CustomHeaderDownloadProvider.cs
+5 −2		Runtime/Scripts/Loading/DefaultDownloadProvider.cs
+3 −2		Runtime/Scripts/Loading/IDownload.cs
+2 −18		Runtime/Scripts/Material/ShaderGraphMaterialGenerator.cs
+25 −0		Runtime/Scripts/NonReusableTexture.cs
+3 −0		Runtime/Scripts/NonReusableTexture.cs.meta
+4 −1		Runtime/Shaders/SRPBatchingHelper.cs
+13 −1		Runtime/Shaders/URP/Lighting.hlsl
+4 −0		Runtime/Shaders/URP/LitInput.hlsl