From a40bff3939c88c8ac8785b8cfe01ecd609c1b3d4 Mon Sep 17 00:00:00 2001 From: godzzz Date: Tue, 25 Jun 2024 21:33:43 +0400 Subject: [PATCH 1/6] [v0.2.8-pre.1] Package renamed --- Editor/Depra.Assets.Editor.asmdef | 4 ++-- Editor/Drawers/ResourcesReferenceDrawer.cs | 6 +++--- .../SerializedPropertyExtensions.cs | 2 +- Editor/Files/EditorDatabaseAsset.cs | 14 +++++++------- Editor/Files/PreloadedAsset.cs | 10 +++++----- Plugins/Depra.Asset.dll | Bin 0 -> 18432 bytes ...a.Assets.dll.meta => Depra.Asset.dll.meta} | 4 ++-- Plugins/Depra.Assets.dll | Bin 18432 -> 0 bytes ....Unity.asmdef => Depra.Asset.Unity.asmdef} | 6 +++--- ...def.meta => Depra.Asset.Unity.asmdef.meta} | 0 Runtime/Exceptions/AssetCanNotBeLoaded.cs | 2 +- Runtime/Exceptions/Guard.cs | 2 +- Runtime/Extensions/DirectoryInfoExtensions.cs | 2 +- Runtime/Extensions/StringExtensions.cs | 2 +- Runtime/Extensions/TaskExtensions.cs | 2 +- .../Files.Bundles/Depra.Assets.Bundles.asmdef | 18 ++++++++++++++++++ .../Depra.Assets.Bundles.asmdef.meta | 3 +++ .../Exceptions/AssetBundleFileNotLoaded.cs | 2 +- .../Exceptions/AssetBundleNotLoaded.cs | 2 +- .../Exceptions/UnityWebRequestFailed.cs | 2 +- .../AssetBundleCreateRequestExtensions.cs | 2 +- .../AssetBundleRequestExtensions.cs | 2 +- ...UnityWebRequestAsyncOperationExtensions.cs | 4 ++-- .../Extensions/UnityWebRequestExtensions.cs | 2 +- .../Files/AssetBundleAssetFile.cs | 12 ++++++------ .../Files/AssetBundleDependenciesExtractor.cs | 6 +++--- .../Files.Bundles/Files/AssetBundleFile.cs | 12 ++++++------ Runtime/Files.Bundles/Files/AssetBundleUri.cs | 8 ++++---- .../Sources/AssetBundleFromFile.cs | 8 ++++---- .../Sources/AssetBundleFromMemory.cs | 8 ++++---- .../Sources/AssetBundleFromStream.cs | 8 ++++---- .../Sources/AssetBundleFromWeb.cs | 8 ++++---- .../Files.Bundles/Sources/AssetBundleSize.cs | 4 ++-- .../Sources/IAssetBundleSource.cs | 4 ++-- .../Files.Database/AssetCatNotBeCreated.cs | 2 +- Runtime/Files.Database/DatabaseAssetUri.cs | 4 ++-- .../Files.Database/RuntimeDatabaseAsset.cs | 8 ++++---- .../PathDoesNotContainResourcesFolder.cs | 2 +- .../Exceptions/ResourceNotLoaded.cs | 2 +- .../ResourceRequestExtensions.cs | 2 +- Runtime/Files.Resource/ResourcesAsset.cs | 10 +++++----- Runtime/Files.Resource/ResourcesPath.cs | 12 ++++++------ Runtime/Files.Resource/ResourcesReference.cs | 2 +- Runtime/Files/UnityFileSize.cs | 4 ++-- Runtime/{Common.meta => Internal.meta} | 0 Runtime/{Common => Internal}/AssetTypes.cs | 2 +- .../{Common => Internal}/AssetTypes.cs.meta | 0 Runtime/{Common => Internal}/Module.cs | 4 ++-- Runtime/{Common => Internal}/Module.cs.meta | 0 Runtime/{Common => Internal}/UnityProject.cs | 2 +- .../{Common => Internal}/UnityProject.cs.meta | 0 Runtime/Properties/AssemblyInfo.cs | 11 ++++++----- package.json | 10 +++++----- 53 files changed, 135 insertions(+), 113 deletions(-) create mode 100644 Plugins/Depra.Asset.dll rename Plugins/{Depra.Assets.dll.meta => Depra.Asset.dll.meta} (91%) delete mode 100644 Plugins/Depra.Assets.dll rename Runtime/{Depra.Assets.Unity.asmdef => Depra.Asset.Unity.asmdef} (75%) rename Runtime/{Depra.Assets.Unity.asmdef.meta => Depra.Asset.Unity.asmdef.meta} (100%) create mode 100644 Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef create mode 100644 Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta rename Runtime/{Common.meta => Internal.meta} (100%) rename Runtime/{Common => Internal}/AssetTypes.cs (87%) rename Runtime/{Common => Internal}/AssetTypes.cs.meta (100%) rename Runtime/{Common => Internal}/Module.cs (80%) rename Runtime/{Common => Internal}/Module.cs.meta (100%) rename Runtime/{Common => Internal}/UnityProject.cs (95%) rename Runtime/{Common => Internal}/UnityProject.cs.meta (100%) diff --git a/Editor/Depra.Assets.Editor.asmdef b/Editor/Depra.Assets.Editor.asmdef index e828db3..9d30046 100644 --- a/Editor/Depra.Assets.Editor.asmdef +++ b/Editor/Depra.Assets.Editor.asmdef @@ -1,5 +1,5 @@ { - "name": "Depra.Assets.Editor", + "name": "Depra.Asset.Editor", "rootNamespace": "Depra.Assets", "references": [ "GUID:ce2ab5ef472b35f498b9d47a89be9396" @@ -11,7 +11,7 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "Depra.Assets.dll" + "Depra.Asset.dll" ], "autoReferenced": true, "defineConstraints": [], diff --git a/Editor/Drawers/ResourcesReferenceDrawer.cs b/Editor/Drawers/ResourcesReferenceDrawer.cs index 648f056..731d81b 100644 --- a/Editor/Drawers/ResourcesReferenceDrawer.cs +++ b/Editor/Drawers/ResourcesReferenceDrawer.cs @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -using Depra.Assets.Editor.Extensions; -using Depra.Assets.Files.Resource; +using Depra.Asset.Editor.Extensions; +using Depra.Asset.Files.Resource; using UnityEditor; using UnityEngine; -namespace Depra.Assets.Editor.Drawers +namespace Depra.Asset.Editor.Drawers { [CustomPropertyDrawer(typeof(ResourcesReference), true)] internal sealed class ResourcesReferenceDrawer : PropertyDrawer diff --git a/Editor/Extensions/SerializedPropertyExtensions.cs b/Editor/Extensions/SerializedPropertyExtensions.cs index d1a4cc6..dd0e727 100644 --- a/Editor/Extensions/SerializedPropertyExtensions.cs +++ b/Editor/Extensions/SerializedPropertyExtensions.cs @@ -9,7 +9,7 @@ using System.Text.RegularExpressions; using UnityEditor; -namespace Depra.Assets.Editor.Extensions +namespace Depra.Asset.Editor.Extensions { internal static class SerializedPropertyExtensions { diff --git a/Editor/Files/EditorDatabaseAsset.cs b/Editor/Files/EditorDatabaseAsset.cs index 36c1052..b1326ab 100644 --- a/Editor/Files/EditorDatabaseAsset.cs +++ b/Editor/Files/EditorDatabaseAsset.cs @@ -6,17 +6,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.Extensions; -using Depra.Assets.Files; -using Depra.Assets.Files.Database; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.Extensions; +using Depra.Asset.Files; +using Depra.Asset.Files.Database; +using Depra.Asset.ValueObjects; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Editor.Files +namespace Depra.Asset.Editor.Files { public sealed class EditorDatabaseAsset : IAssetFile, IDisposable where TAsset : ScriptableObject { diff --git a/Editor/Files/PreloadedAsset.cs b/Editor/Files/PreloadedAsset.cs index 87ef4ec..8050096 100644 --- a/Editor/Files/PreloadedAsset.cs +++ b/Editor/Files/PreloadedAsset.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.Files; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.Files; +using Depra.Asset.ValueObjects; using UnityEditor; using Object = UnityEngine.Object; -namespace Depra.Assets.Editor.Files +namespace Depra.Asset.Editor.Files { public sealed class PreloadedAsset : IAssetFile, IDisposable where TAsset : Object { diff --git a/Plugins/Depra.Asset.dll b/Plugins/Depra.Asset.dll new file mode 100644 index 0000000000000000000000000000000000000000..30e148b7aa638015e1816316a51eb90150817ba9 GIT binary patch literal 18432 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 akJW#H>nip4L?@U27x3l3UHDIr!2bu7t8dK! literal 0 HcmV?d00001 diff --git a/Plugins/Depra.Assets.dll.meta b/Plugins/Depra.Asset.dll.meta similarity index 91% rename from Plugins/Depra.Assets.dll.meta rename to Plugins/Depra.Asset.dll.meta index db3b087..55d760a 100644 --- a/Plugins/Depra.Assets.dll.meta +++ b/Plugins/Depra.Asset.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12144cd499077c94f82093417464f995 +guid: 94dc0d35dd433de4cbd96cd7e3c3f342 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -7,7 +7,7 @@ PluginImporter: executionOrder: {} defineConstraints: [] isPreloaded: 0 - isOverridable: 1 + isOverridable: 0 isExplicitlyReferenced: 0 validateReferences: 1 platformData: diff --git a/Plugins/Depra.Assets.dll b/Plugins/Depra.Assets.dll deleted file mode 100644 index 517ba532a2e3b47bb92a117f6eb45c1b860b1994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18432 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 b4<5Jw;%lS&o1(W?{TH|UKh6EOh`|2`2&j%K diff --git a/Runtime/Depra.Assets.Unity.asmdef b/Runtime/Depra.Asset.Unity.asmdef similarity index 75% rename from Runtime/Depra.Assets.Unity.asmdef rename to Runtime/Depra.Asset.Unity.asmdef index e2834ed..b10813b 100644 --- a/Runtime/Depra.Assets.Unity.asmdef +++ b/Runtime/Depra.Asset.Unity.asmdef @@ -1,13 +1,13 @@ { - "name": "Depra.Assets.Unity", - "rootNamespace": "Depra.Assets", + "name": "Depra.Asset.Unity", + "rootNamespace": "Depra.Asset", "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "Depra.Assets.dll" + "Depra.Asset.dll" ], "autoReferenced": true, "defineConstraints": [], diff --git a/Runtime/Depra.Assets.Unity.asmdef.meta b/Runtime/Depra.Asset.Unity.asmdef.meta similarity index 100% rename from Runtime/Depra.Assets.Unity.asmdef.meta rename to Runtime/Depra.Asset.Unity.asmdef.meta diff --git a/Runtime/Exceptions/AssetCanNotBeLoaded.cs b/Runtime/Exceptions/AssetCanNotBeLoaded.cs index 579d207..6512e8b 100644 --- a/Runtime/Exceptions/AssetCanNotBeLoaded.cs +++ b/Runtime/Exceptions/AssetCanNotBeLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Assets.Exceptions +namespace Depra.Asset.Exceptions { internal sealed class AssetCanNotBeLoaded : Exception { diff --git a/Runtime/Exceptions/Guard.cs b/Runtime/Exceptions/Guard.cs index 9962ada..75e492a 100644 --- a/Runtime/Exceptions/Guard.cs +++ b/Runtime/Exceptions/Guard.cs @@ -6,7 +6,7 @@ using System.IO; using System.Runtime.CompilerServices; -namespace Depra.Assets.Exceptions +namespace Depra.Asset.Exceptions { internal static class Guard { diff --git a/Runtime/Extensions/DirectoryInfoExtensions.cs b/Runtime/Extensions/DirectoryInfoExtensions.cs index 41fff61..9c4a262 100644 --- a/Runtime/Extensions/DirectoryInfoExtensions.cs +++ b/Runtime/Extensions/DirectoryInfoExtensions.cs @@ -4,7 +4,7 @@ using System.IO; using System.Runtime.CompilerServices; -namespace Depra.Assets.Extensions +namespace Depra.Asset.Extensions { public static class DirectoryInfoExtensions { diff --git a/Runtime/Extensions/StringExtensions.cs b/Runtime/Extensions/StringExtensions.cs index f4c01af..e7d42c6 100644 --- a/Runtime/Extensions/StringExtensions.cs +++ b/Runtime/Extensions/StringExtensions.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; -namespace Depra.Assets.Extensions +namespace Depra.Asset.Extensions { public static class StringExtensions { diff --git a/Runtime/Extensions/TaskExtensions.cs b/Runtime/Extensions/TaskExtensions.cs index d722cd0..7a09818 100644 --- a/Runtime/Extensions/TaskExtensions.cs +++ b/Runtime/Extensions/TaskExtensions.cs @@ -6,7 +6,7 @@ using System.Runtime.ExceptionServices; using System.Threading.Tasks; -namespace Depra.Assets.Extensions +namespace Depra.Asset.Extensions { internal static class TaskExtensions { diff --git a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef new file mode 100644 index 0000000..54f7585 --- /dev/null +++ b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef @@ -0,0 +1,18 @@ +{ + "name": "Depra.Asset.Bundles", + "rootNamespace": "Depra.Asset.Bundles", + "references": [ + "GUID:ce2ab5ef472b35f498b9d47a89be9396" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "Depra.Asset.dll" + ], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta new file mode 100644 index 0000000..a6eca00 --- /dev/null +++ b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 007f974573e04f5cbfab7ed51f223fdc +timeCreated: 1719335572 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs b/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs index 75e69be..8d18b53 100644 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs +++ b/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Assets.Files.Bundles.Exceptions +namespace Depra.Asset.Files.Bundles.Exceptions { internal sealed class AssetBundleFileNotLoaded : Exception { diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs b/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs index 94ae48d..693720f 100644 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs +++ b/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Assets.Files.Bundles.Exceptions +namespace Depra.Asset.Files.Bundles.Exceptions { internal sealed class AssetBundleNotLoaded : Exception { diff --git a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs b/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs index 0a26629..544a748 100644 --- a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs +++ b/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs @@ -4,7 +4,7 @@ using System; using UnityEngine.Networking; -namespace Depra.Assets.Files.Bundles.Exceptions +namespace Depra.Asset.Files.Bundles.Exceptions { internal sealed class UnityWebRequestFailed : Exception { diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs index 5079a56..6e00262 100644 --- a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs +++ b/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace Depra.Assets.Files.Bundles.Extensions +namespace Depra.Asset.Files.Bundles.Extensions { internal static class AssetBundleCreateRequestExtensions { diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs index 1258d8d..a13daf9 100644 --- a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs +++ b/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs @@ -7,7 +7,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Bundles.Extensions +namespace Depra.Asset.Files.Bundles.Extensions { internal static class AssetBundleRequestExtensions { diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs b/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs index 2486277..522ff66 100644 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs +++ b/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs @@ -4,10 +4,10 @@ using System; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Files.Bundles.Exceptions; +using Depra.Asset.Files.Bundles.Exceptions; using UnityEngine.Networking; -namespace Depra.Assets.Files.Bundles.Extensions +namespace Depra.Asset.Files.Bundles.Extensions { internal static class UnityWebRequestAsyncOperationExtensions { diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs index dcba984..40f8d56 100644 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs +++ b/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs @@ -3,7 +3,7 @@ using UnityEngine.Networking; -namespace Depra.Assets.Files.Bundles.Extensions +namespace Depra.Asset.Files.Bundles.Extensions { internal static class UnityWebRequestExtensions { diff --git a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs b/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs index 49140cc..35ec5c4 100644 --- a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs +++ b/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs @@ -5,15 +5,15 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Bundles.Exceptions; -using Depra.Assets.Files.Bundles.Extensions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Bundles.Exceptions; +using Depra.Asset.Files.Bundles.Extensions; +using Depra.Asset.ValueObjects; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Bundles +namespace Depra.Asset.Files.Bundles { public sealed class AssetBundleAssetFile : IAssetFile, IDisposable where TAsset : Object { diff --git a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs b/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs index a7c4468..11ea127 100644 --- a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs +++ b/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; -using Depra.Assets.Files.Bundles.Exceptions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Files.Bundles.Exceptions; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles +namespace Depra.Asset.Files.Bundles { internal static class AssetBundleDependenciesExtractor { diff --git a/Runtime/Files.Bundles/Files/AssetBundleFile.cs b/Runtime/Files.Bundles/Files/AssetBundleFile.cs index dc215d8..1cfdd15 100644 --- a/Runtime/Files.Bundles/Files/AssetBundleFile.cs +++ b/Runtime/Files.Bundles/Files/AssetBundleFile.cs @@ -5,14 +5,14 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Bundles.Exceptions; -using Depra.Assets.Files.Bundles.Sources; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Bundles.Exceptions; +using Depra.Asset.Files.Bundles.Sources; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles +namespace Depra.Asset.Files.Bundles { public sealed class AssetBundleFile : IAssetFile, IDisposable { diff --git a/Runtime/Files.Bundles/Files/AssetBundleUri.cs b/Runtime/Files.Bundles/Files/AssetBundleUri.cs index 31996ba..0d5c507 100644 --- a/Runtime/Files.Bundles/Files/AssetBundleUri.cs +++ b/Runtime/Files.Bundles/Files/AssetBundleUri.cs @@ -2,10 +2,10 @@ // © 2023-2024 Nikolay Melnikov using System.IO; -using Depra.Assets.Extensions; -using Depra.Assets.ValueObjects; +//using Depra.Assets.Extensions; +using Depra.Asset.ValueObjects; -namespace Depra.Assets.Files.Bundles +namespace Depra.Asset.Files.Bundles { public sealed record AssetBundleUri : IAssetUri { @@ -20,7 +20,7 @@ public sealed record AssetBundleUri : IAssetUri public AssetBundleUri(string path) { _fileInfo = new FileInfo(path); - _fileInfo.Directory.Require(); + //_fileInfo.Directory.Require(); Name = string.IsNullOrEmpty(Extension) ? _fileInfo.Name diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs index 2289c84..a5995dc 100644 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs +++ b/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs @@ -4,12 +4,12 @@ using System; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Bundles.Extensions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Bundles.Extensions; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public readonly struct AssetBundleFromFile : IAssetBundleSource { diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs index 514ee49..f7ab253 100644 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs +++ b/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Bundles.Extensions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Bundles.Extensions; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public readonly struct AssetBundleFromMemory : IAssetBundleSource { diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs index a172cc9..4769ec1 100644 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs +++ b/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Bundles.Extensions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Bundles.Extensions; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public readonly struct AssetBundleFromStream : IAssetBundleSource { diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs index 27c161f..90e09e9 100644 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs +++ b/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs @@ -4,13 +4,13 @@ using System; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Files.Bundles.Exceptions; -using Depra.Assets.Files.Bundles.Extensions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Files.Bundles.Exceptions; +using Depra.Asset.Files.Bundles.Extensions; +using Depra.Asset.ValueObjects; using UnityEngine; using UnityEngine.Networking; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public sealed class AssetBundleFromWeb : IAssetBundleSource { diff --git a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs b/Runtime/Files.Bundles/Sources/AssetBundleSize.cs index 6a11ac3..a80f25e 100644 --- a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs +++ b/Runtime/Files.Bundles/Sources/AssetBundleSize.cs @@ -5,11 +5,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Depra.Assets.ValueObjects; +using Depra.Asset.ValueObjects; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public static class AssetBundleSize { diff --git a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs b/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs index b45f6bd..53f9faf 100644 --- a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs +++ b/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs @@ -4,10 +4,10 @@ using System; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.ValueObjects; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Bundles.Sources +namespace Depra.Asset.Files.Bundles.Sources { public interface IAssetBundleSource { diff --git a/Runtime/Files.Database/AssetCatNotBeCreated.cs b/Runtime/Files.Database/AssetCatNotBeCreated.cs index ff16e3b..fe11608 100644 --- a/Runtime/Files.Database/AssetCatNotBeCreated.cs +++ b/Runtime/Files.Database/AssetCatNotBeCreated.cs @@ -4,7 +4,7 @@ using System; using System.Reflection; -namespace Depra.Assets.Files.Database +namespace Depra.Asset.Files.Database { internal sealed class AssetCatNotBeCreated : Exception { diff --git a/Runtime/Files.Database/DatabaseAssetUri.cs b/Runtime/Files.Database/DatabaseAssetUri.cs index d4742fc..ef634f5 100644 --- a/Runtime/Files.Database/DatabaseAssetUri.cs +++ b/Runtime/Files.Database/DatabaseAssetUri.cs @@ -2,9 +2,9 @@ // © 2023-2024 Nikolay Melnikov using System.IO; -using Depra.Assets.ValueObjects; +using Depra.Asset.ValueObjects; -namespace Depra.Assets.Files.Database +namespace Depra.Asset.Files.Database { public sealed record DatabaseAssetUri : IAssetUri { diff --git a/Runtime/Files.Database/RuntimeDatabaseAsset.cs b/Runtime/Files.Database/RuntimeDatabaseAsset.cs index 839fea1..8cd85d1 100644 --- a/Runtime/Files.Database/RuntimeDatabaseAsset.cs +++ b/Runtime/Files.Database/RuntimeDatabaseAsset.cs @@ -5,12 +5,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.ValueObjects; using UnityEngine; -namespace Depra.Assets.Files.Database +namespace Depra.Asset.Files.Database { public sealed class RuntimeDatabaseAsset : IAssetFile, IDisposable where TAsset : ScriptableObject { diff --git a/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs b/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs index a49d031..a1a0b0e 100644 --- a/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs +++ b/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Assets.Files.Resource.Exceptions +namespace Depra.Asset.Files.Resource.Exceptions { internal sealed class PathDoesNotContainResourcesFolder : Exception { diff --git a/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs b/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs index e9cfe92..0f7d6e0 100644 --- a/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs +++ b/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Assets.Files.Resource.Exceptions +namespace Depra.Asset.Files.Resource.Exceptions { internal sealed class ResourceNotLoaded : Exception { diff --git a/Runtime/Files.Resource/ResourceRequestExtensions.cs b/Runtime/Files.Resource/ResourceRequestExtensions.cs index ad1177c..0f5e628 100644 --- a/Runtime/Files.Resource/ResourceRequestExtensions.cs +++ b/Runtime/Files.Resource/ResourceRequestExtensions.cs @@ -7,7 +7,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Resource +namespace Depra.Asset.Files.Resource { internal static class ResourceRequestExtensions { diff --git a/Runtime/Files.Resource/ResourcesAsset.cs b/Runtime/Files.Resource/ResourcesAsset.cs index d030781..98ae7e6 100644 --- a/Runtime/Files.Resource/ResourcesAsset.cs +++ b/Runtime/Files.Resource/ResourcesAsset.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Assets.Delegates; -using Depra.Assets.Exceptions; -using Depra.Assets.Files.Resource.Exceptions; -using Depra.Assets.ValueObjects; +using Depra.Asset.Delegates; +using Depra.Asset.Exceptions; +using Depra.Asset.Files.Resource.Exceptions; +using Depra.Asset.ValueObjects; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Resource +namespace Depra.Asset.Files.Resource { public sealed class ResourcesAsset : IAssetFile, IDisposable where TAsset : Object { diff --git a/Runtime/Files.Resource/ResourcesPath.cs b/Runtime/Files.Resource/ResourcesPath.cs index c46a8d4..f7f933d 100644 --- a/Runtime/Files.Resource/ResourcesPath.cs +++ b/Runtime/Files.Resource/ResourcesPath.cs @@ -3,13 +3,13 @@ using System; using System.IO; -using Depra.Assets.Exceptions; -using Depra.Assets.Extensions; -using Depra.Assets.Files.Resource.Exceptions; -using Depra.Assets.ValueObjects; -using static Depra.Assets.Common.UnityProject; +using Depra.Asset.Exceptions; +using Depra.Asset.Extensions; +using Depra.Asset.Files.Resource.Exceptions; +using Depra.Asset.ValueObjects; +using static Depra.Asset.Internal.UnityProject; -namespace Depra.Assets.Files.Resource +namespace Depra.Asset.Files.Resource { public sealed record ResourcesPath : IAssetUri { diff --git a/Runtime/Files.Resource/ResourcesReference.cs b/Runtime/Files.Resource/ResourcesReference.cs index 35c7eed..f491767 100644 --- a/Runtime/Files.Resource/ResourcesReference.cs +++ b/Runtime/Files.Resource/ResourcesReference.cs @@ -5,7 +5,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Assets.Files.Resource +namespace Depra.Asset.Files.Resource { [Serializable] public sealed class ResourcesReference : ResourcesReference where TAsset : Object { } diff --git a/Runtime/Files/UnityFileSize.cs b/Runtime/Files/UnityFileSize.cs index a311f9c..4392197 100644 --- a/Runtime/Files/UnityFileSize.cs +++ b/Runtime/Files/UnityFileSize.cs @@ -2,11 +2,11 @@ // © 2023-2024 Nikolay Melnikov using System.Runtime.CompilerServices; -using Depra.Assets.ValueObjects; +using Depra.Asset.ValueObjects; using UnityEngine; using UnityEngine.Profiling; -namespace Depra.Assets.Files +namespace Depra.Asset.Files { internal static class UnityFileSize { diff --git a/Runtime/Common.meta b/Runtime/Internal.meta similarity index 100% rename from Runtime/Common.meta rename to Runtime/Internal.meta diff --git a/Runtime/Common/AssetTypes.cs b/Runtime/Internal/AssetTypes.cs similarity index 87% rename from Runtime/Common/AssetTypes.cs rename to Runtime/Internal/AssetTypes.cs index bc4373d..d77736f 100644 --- a/Runtime/Common/AssetTypes.cs +++ b/Runtime/Internal/AssetTypes.cs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -namespace Depra.Assets.Common +namespace Depra.Asset.Internal { public static class AssetTypes { diff --git a/Runtime/Common/AssetTypes.cs.meta b/Runtime/Internal/AssetTypes.cs.meta similarity index 100% rename from Runtime/Common/AssetTypes.cs.meta rename to Runtime/Internal/AssetTypes.cs.meta diff --git a/Runtime/Common/Module.cs b/Runtime/Internal/Module.cs similarity index 80% rename from Runtime/Common/Module.cs rename to Runtime/Internal/Module.cs index adfcc2d..fc8e513 100644 --- a/Runtime/Common/Module.cs +++ b/Runtime/Internal/Module.cs @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -namespace Depra.Assets.Common +namespace Depra.Asset.Internal { internal static class Module { - public const string MODULE_NAME = nameof(Assets); + public const string MODULE_NAME = nameof(Asset); public const string FRAMEWORK_NAME = nameof(Depra); internal const int DEFAULT_ORDER = 52; diff --git a/Runtime/Common/Module.cs.meta b/Runtime/Internal/Module.cs.meta similarity index 100% rename from Runtime/Common/Module.cs.meta rename to Runtime/Internal/Module.cs.meta diff --git a/Runtime/Common/UnityProject.cs b/Runtime/Internal/UnityProject.cs similarity index 95% rename from Runtime/Common/UnityProject.cs rename to Runtime/Internal/UnityProject.cs index d17b09b..64923d9 100644 --- a/Runtime/Common/UnityProject.cs +++ b/Runtime/Internal/UnityProject.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Depra.Assets.Common +namespace Depra.Asset.Internal { public static class UnityProject { diff --git a/Runtime/Common/UnityProject.cs.meta b/Runtime/Internal/UnityProject.cs.meta similarity index 100% rename from Runtime/Common/UnityProject.cs.meta rename to Runtime/Internal/UnityProject.cs.meta diff --git a/Runtime/Properties/AssemblyInfo.cs b/Runtime/Properties/AssemblyInfo.cs index 3026076..5cca0ba 100644 --- a/Runtime/Properties/AssemblyInfo.cs +++ b/Runtime/Properties/AssemblyInfo.cs @@ -1,9 +1,10 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Depra.Assets.Editor")] +[assembly: InternalsVisibleTo("Depra.Asset.Editor")] +[assembly: InternalsVisibleTo("Depra.Asset.Bundles")] -[assembly: InternalsVisibleTo("Depra.Assets.Tests.EditMode")] -[assembly: InternalsVisibleTo("Depra.Assets.Tests.PlayMode")] +[assembly: InternalsVisibleTo("Depra.Asset.Tests.EditMode")] +[assembly: InternalsVisibleTo("Depra.Asset.Tests.PlayMode")] -[assembly: InternalsVisibleTo("Depra.Assets.Addressable.Runtime")] -[assembly: InternalsVisibleTo("Depra.Assets.Addressable.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("Depra.Asset.Addressable.Runtime")] +[assembly: InternalsVisibleTo("Depra.Asset.Addressable.Tests")] \ No newline at end of file diff --git a/package.json b/package.json index ffad24c..4f1a187 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "com.depra.assets.unity", - "version": "0.2.7", - "displayName": "Depra.Assets", + "name": "com.depra.asset.unity", + "version": "0.2.8-pre.1", + "displayName": "Depra.Asset", "description": "Provides an API for loading Unity asset files in multiple ways through a single interface.", "unity": "2021.3", "license": "Apache-2.0", "keywords": [ "unity", - "assets", + "asset", "editor", "runtime", "resources", @@ -20,6 +20,6 @@ }, "repository": { "type": "git", - "url": "https://github.com/Depra-Inc/Assets.Unity.git" + "url": "https://github.com/Depra-Inc/Asset.Unity.git" } } \ No newline at end of file From 60db6f3737c011738a6b7453c723f15e48b6e8cb Mon Sep 17 00:00:00 2001 From: godzzz Date: Tue, 25 Jun 2024 21:39:50 +0400 Subject: [PATCH 2/6] [v0.2.8-pre.1] Readmes updated --- Docs/README.RU.md | 20 ++++++++++---------- Docs/README.md | 22 +++++++++++----------- package.json | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Docs/README.RU.md b/Docs/README.RU.md index 7d3be17..f963333 100644 --- a/Docs/README.RU.md +++ b/Docs/README.RU.md @@ -1,8 +1,8 @@ # Depra.Assets -![License](https://img.shields.io/github/license/Depra-Inc/Assets.Unity?style=flat-round) -![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Assets.Unity?style=flat-round) -![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Assets.Unity?style=flat-round) +![License](https://img.shields.io/github/license/Depra-Inc/Asset.Unity?style=flat-round) +![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Asset.Unity?style=flat-round) +![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Asset.Unity?style=flat-round)
English | Русский @@ -64,7 +64,7 @@ 1. Откройте окно **Unity Package Manager**. 2. Нажмите на кнопку **+** в правом верхнем углу окна. 3. Выберите **Add package from git URL...**. -4. Введите [ссылку на репозиторий](https://github.com/Depra-Inc/Assets.Unity.git) +4. Введите [ссылку на репозиторий](https://github.com/Depra-Inc/Asset.Unity.git) 5. Нажмите **Add**. ### ⚙️ Через **UPM** используя `manifest.json`: @@ -72,7 +72,7 @@ Добавьте в `Packages/manifest.json` в раздел `dependencies` следующую строку: ``` -"com.depra.assets.unity": "https://github.com/Depra-Inc/Assets.Unity.git" +"com.depra.assets.unity": "https://github.com/Depra-Inc/Asset.Unity.git" ``` ### 🛒 Через Unity Asset Store: @@ -92,7 +92,7 @@ - `IAssetFile`: Определяет основные методы и свойства, необходимые для загрузки и выгрузки ассетов. Он расширяет функциональность интерфейса `IAssetFile`, представленного - в [Depra.Assets](https://github.com/Depra-Inc/Assets), и предоставляет возможность выполнения как синхронной, так и + в [Depra.Assets](https://github.com/Depra-Inc/Asset), и предоставляет возможность выполнения как синхронной, так и асинхронной загрузки ассетов, а также проверки состояния загрузки. Вы можете создать свои реализации этих интерфейсов или использовать уже готовые, представленные в таблице: @@ -160,14 +160,14 @@ preloadedAsset.Unload(); ## 🖇️ Зависимости -- [Depra.Assets](https://github.com/Depra-Inc/Assets) - базовая библиотека для работы с ассетами ( +- [Depra.Assets](https://github.com/Depra-Inc/Asset) - базовая библиотека для работы с ассетами ( поставляется вместе с этим **UPM** пакетом). ## 🤝 Сотрудничество Я рад приветствовать запросы на добавление новых функций и сообщения об ошибках в -разделе [issues](https://github.com/Depra-Inc/Assets.Unity/issues) и также -принимать [pull requests](https://github.com/Depra-Inc/Assets.Unity/pulls). +разделе [issues](https://github.com/Depra-Inc/Asset.Unity/issues) и также +принимать [pull requests](https://github.com/Depra-Inc/Asset.Unity/pulls). ## 🫂 Поддержка @@ -179,7 +179,7 @@ preloadedAsset.Unload(); ## 🔐 Лицензия Этот проект распространяется под лицензией -**[Apache-2.0](https://github.com/Depra-Inc/Assets.Unity/blob/main/LICENSE.md)** +**[Apache-2.0](https://github.com/Depra-Inc/Asset.Unity/blob/main/LICENSE.md)** Copyright (c) 2023 Николай Мельников [n.melnikov@depra.org](mailto:n.melnikov@depra.org) \ No newline at end of file diff --git a/Docs/README.md b/Docs/README.md index 289c57a..5496830 100644 --- a/Docs/README.md +++ b/Docs/README.md @@ -1,8 +1,8 @@ -# Depra.Assets +# Depra.Asset -![License](https://img.shields.io/github/license/Depra-Inc/Assets.Unity?style=flat-round) -![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Assets.Unity?style=flat-round) -![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Assets.Unity?style=flat-round) +![License](https://img.shields.io/github/license/Depra-Inc/Asset.Unity?style=flat-round) +![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Asset.Unity?style=flat-round) +![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Asset.Unity?style=flat-round)
English | Русский @@ -64,7 +64,7 @@ These features make the library even more powerful and convenient for your tasks 1. Open the **Unity Package Manager** window. 2. Click the **+** button in the upper right corner of the window. 3. Select **Add package from git URL...**. -4. Enter the [repository link](https://github.com/Depra-Inc/Assets.Unity.git). +4. Enter the [repository link](https://github.com/Depra-Inc/Asset.Unity.git). 5. Click **Add**. ### ⚙️ Using **UPM** via **manifest.json**: @@ -72,7 +72,7 @@ These features make the library even more powerful and convenient for your tasks Add the following line to `Packages/manifest.json` in the `dependencies` section: ``` -"com.depra.assets.unity": "https://github.com/Depra-Inc/Assets.Unity.git" +"com.depra.asset.unity": "https://github.com/Depra-Inc/Asset.Unity.git" ``` ### 🛒 Using Unity Asset Store: @@ -92,7 +92,7 @@ Add the following line to `Packages/manifest.json` in the `dependencies` section - `IAssetFile`: Defines the fundamental methods and properties required for loading and unloading assets. It extends the functionality of the `IAssetFile` interface presented - in [Depra.Assets](https://github.com/Depra-Inc/Assets) and offers the ability to perform both synchronous and + in [Depra.Asset](https://github.com/Depra-Inc/Asset) and offers the ability to perform both synchronous and asynchronous asset loading, as well as checking the loading state. You can create your own implementations of these interfaces or use ready-made ones presented in the table: @@ -160,14 +160,14 @@ preloadedAsset.Unload(); ## 🖇 Dependencies -- [Depra.Assets](https://github.com/Depra-Inc/Assets.git) - the base library for working with assets (provided +- [Depra.Asset](https://github.com/Depra-Inc/Asset.git) - the base library for working with assets (provided with this **UPM** package). ## 🤝 Collaboration I welcome feature requests and bug reports in -the [issues section](https://github.com/Depra-Inc/Assets.Unity/issues), and I also -accept [pull requests](https://github.com/Depra-Inc/Assets.Unity/pulls). +the [issues section](https://github.com/Depra-Inc/Asset.Unity/issues), and I also +accept [pull requests](https://github.com/Depra-Inc/Asset.Unity/pulls). ## 🫂 Support @@ -178,7 +178,7 @@ my [portfolio](https://github.com/Depra-Inc) and [contact me](mailto:g0dzZz1lla@ ## 🔐 License This project is distributed under the -**[Apache-2.0 license](https://github.com/Depra-Inc/Assets.Unity/blob/main/LICENSE.md)** +**[Apache-2.0 license](https://github.com/Depra-Inc/Asset.Unity/blob/main/LICENSE.md)** Copyright (c) 2023 Nikolay Melnikov [n.melnikov@depra.org](mailto:n.melnikov@depra.org) \ No newline at end of file diff --git a/package.json b/package.json index 4f1a187..80b68ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.depra.asset.unity", - "version": "0.2.8-pre.1", + "version": "0.2.8-pre.2", "displayName": "Depra.Asset", "description": "Provides an API for loading Unity asset files in multiple ways through a single interface.", "unity": "2021.3", From d0d608865ad318b455d877940ebed19c12d332fc Mon Sep 17 00:00:00 2001 From: godzzz Date: Tue, 25 Jun 2024 21:52:16 +0400 Subject: [PATCH 3/6] [v0.2.8-pre.4] Asset bundles moved to separate repo --- Runtime/Files.Bundles.meta | 3 - .../Files.Bundles/Depra.Assets.Bundles.asmdef | 18 --- .../Depra.Assets.Bundles.asmdef.meta | 3 - Runtime/Files.Bundles/Exceptions.meta | 3 - .../Exceptions/AssetBundleFileNotLoaded.cs | 13 --- .../AssetBundleFileNotLoaded.cs.meta | 3 - .../Exceptions/AssetBundleNotLoaded.cs | 12 -- .../Exceptions/AssetBundleNotLoaded.cs.meta | 3 - .../Exceptions/UnityWebRequestFailed.cs | 31 ------ .../Exceptions/UnityWebRequestFailed.cs.meta | 3 - Runtime/Files.Bundles/Extensions.meta | 3 - .../AssetBundleCreateRequestExtensions.cs | 43 ------- ...AssetBundleCreateRequestExtensions.cs.meta | 3 - .../AssetBundleRequestExtensions.cs | 38 ------- .../AssetBundleRequestExtensions.cs.meta | 3 - ...UnityWebRequestAsyncOperationExtensions.cs | 49 -------- ...WebRequestAsyncOperationExtensions.cs.meta | 3 - .../Extensions/UnityWebRequestExtensions.cs | 26 ----- .../UnityWebRequestExtensions.cs.meta | 3 - Runtime/Files.Bundles/Files.meta | 3 - .../Files/AssetBundleAssetFile.cs | 88 --------------- .../Files/AssetBundleAssetFile.cs.meta | 3 - .../Files/AssetBundleDependenciesExtractor.cs | 31 ------ .../AssetBundleDependenciesExtractor.cs.meta | 3 - .../Files.Bundles/Files/AssetBundleFile.cs | 105 ------------------ .../Files/AssetBundleFile.cs.meta | 3 - Runtime/Files.Bundles/Files/AssetBundleUri.cs | 47 -------- .../Files/AssetBundleUri.cs.meta | 3 - Runtime/Files.Bundles/Sources.meta | 3 - .../Sources/AssetBundleFromFile.cs | 35 ------ .../Sources/AssetBundleFromFile.cs.meta | 3 - .../Sources/AssetBundleFromMemory.cs | 39 ------- .../Sources/AssetBundleFromMemory.cs.meta | 3 - .../Sources/AssetBundleFromStream.cs | 45 -------- .../Sources/AssetBundleFromStream.cs.meta | 3 - .../Sources/AssetBundleFromWeb.cs | 55 --------- .../Sources/AssetBundleFromWeb.cs.meta | 3 - .../Files.Bundles/Sources/AssetBundleSize.cs | 71 ------------ .../Sources/AssetBundleSize.cs.meta | 3 - .../Sources/IAssetBundleSource.cs | 20 ---- .../Sources/IAssetBundleSource.cs.meta | 3 - package.json | 5 +- 42 files changed, 2 insertions(+), 838 deletions(-) delete mode 100644 Runtime/Files.Bundles.meta delete mode 100644 Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef delete mode 100644 Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta delete mode 100644 Runtime/Files.Bundles/Exceptions.meta delete mode 100644 Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs delete mode 100644 Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs.meta delete mode 100644 Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs delete mode 100644 Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs.meta delete mode 100644 Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs delete mode 100644 Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs.meta delete mode 100644 Runtime/Files.Bundles/Extensions.meta delete mode 100644 Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs delete mode 100644 Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs.meta delete mode 100644 Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs delete mode 100644 Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs.meta delete mode 100644 Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs delete mode 100644 Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs.meta delete mode 100644 Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs delete mode 100644 Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs.meta delete mode 100644 Runtime/Files.Bundles/Files.meta delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs.meta delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs.meta delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleFile.cs delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleFile.cs.meta delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleUri.cs delete mode 100644 Runtime/Files.Bundles/Files/AssetBundleUri.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources.meta delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleSize.cs delete mode 100644 Runtime/Files.Bundles/Sources/AssetBundleSize.cs.meta delete mode 100644 Runtime/Files.Bundles/Sources/IAssetBundleSource.cs delete mode 100644 Runtime/Files.Bundles/Sources/IAssetBundleSource.cs.meta diff --git a/Runtime/Files.Bundles.meta b/Runtime/Files.Bundles.meta deleted file mode 100644 index 22a3bad..0000000 --- a/Runtime/Files.Bundles.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 1b515f5fd5fb4947b51aca6c4d4add4b -timeCreated: 1678833399 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef deleted file mode 100644 index 54f7585..0000000 --- a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Depra.Asset.Bundles", - "rootNamespace": "Depra.Asset.Bundles", - "references": [ - "GUID:ce2ab5ef472b35f498b9d47a89be9396" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "Depra.Asset.dll" - ], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta b/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta deleted file mode 100644 index a6eca00..0000000 --- a/Runtime/Files.Bundles/Depra.Assets.Bundles.asmdef.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 007f974573e04f5cbfab7ed51f223fdc -timeCreated: 1719335572 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions.meta b/Runtime/Files.Bundles/Exceptions.meta deleted file mode 100644 index 7ecd06f..0000000 --- a/Runtime/Files.Bundles/Exceptions.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a849a6e185684d4e9b7c31aa35363bb3 -timeCreated: 1675007048 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs b/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs deleted file mode 100644 index 8d18b53..0000000 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; - -namespace Depra.Asset.Files.Bundles.Exceptions -{ - internal sealed class AssetBundleFileNotLoaded : Exception - { - public AssetBundleFileNotLoaded(string name, string bundleName) : base( - $"File with name '{name}' form asset bundle '{bundleName}' was not loaded!") { } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs.meta b/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs.meta deleted file mode 100644 index 48de1cf..0000000 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleFileNotLoaded.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0830601e1e2748408111e864be749369 -timeCreated: 1679184587 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs b/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs deleted file mode 100644 index 693720f..0000000 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; - -namespace Depra.Asset.Files.Bundles.Exceptions -{ - internal sealed class AssetBundleNotLoaded : Exception - { - public AssetBundleNotLoaded(string path) : base($"Asset bundle at path '{path}' was not loaded!") { } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs.meta b/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs.meta deleted file mode 100644 index 1924a8c..0000000 --- a/Runtime/Files.Bundles/Exceptions/AssetBundleNotLoaded.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f2cac11d17ff44eeb72d0d577d301d74 -timeCreated: 1678334306 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs b/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs deleted file mode 100644 index 544a748..0000000 --- a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using UnityEngine.Networking; - -namespace Depra.Asset.Files.Bundles.Exceptions -{ - internal sealed class UnityWebRequestFailed : Exception - { - private readonly string _text; - private readonly string _error; - - private string _message; - - public UnityWebRequestFailed(UnityWebRequest webRequest) - { - _error = webRequest.error; - if (webRequest.downloadHandler is DownloadHandlerBuffer buffer) - { - _text = buffer.text; - } - - webRequest.GetResponseHeaders(); - } - - public override string Message => _message ??= string.IsNullOrWhiteSpace(_text) == false - ? _error + Environment.NewLine + _text - : _error; - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs.meta b/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs.meta deleted file mode 100644 index b36b933..0000000 --- a/Runtime/Files.Bundles/Exceptions/UnityWebRequestFailed.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0136a5931ea44508a55463712109d3cb -timeCreated: 1693691555 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions.meta b/Runtime/Files.Bundles/Extensions.meta deleted file mode 100644 index 0d8e0ed..0000000 --- a/Runtime/Files.Bundles/Extensions.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 377f0e77315e477e9f0d161a2816af1c -timeCreated: 1679185654 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs deleted file mode 100644 index 6e00262..0000000 --- a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles.Extensions -{ - internal static class AssetBundleCreateRequestExtensions - { - public static Task ToTask(this AssetBundleCreateRequest self, - Action onProgress = null, CancellationToken cancellationToken = default) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - return self.isDone - ? Task.FromResult(self.assetBundle) - : AwaitWithProgress(self, onProgress, cancellationToken); - } - - private async static Task AwaitWithProgress(this AssetBundleCreateRequest self, - Action onProgress, CancellationToken cancellationToken = default) - { - while (self.isDone == false) - { - if (cancellationToken.IsCancellationRequested) - { - return await Task.FromCanceled(cancellationToken); - } - - onProgress?.Invoke(self.progress); - await Task.Yield(); - } - - return self.assetBundle; - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs.meta b/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs.meta deleted file mode 100644 index 145a2db..0000000 --- a/Runtime/Files.Bundles/Extensions/AssetBundleCreateRequestExtensions.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0b729d14e0b8448e82a608f61f52207a -timeCreated: 1693689257 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs deleted file mode 100644 index a13daf9..0000000 --- a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using UnityEngine; -using Object = UnityEngine.Object; - -namespace Depra.Asset.Files.Bundles.Extensions -{ - internal static class AssetBundleRequestExtensions - { - public static Task ToTask(this AssetBundleRequest self, Action onProgress = null, - CancellationToken cancellationToken = default) => cancellationToken.IsCancellationRequested - ? Task.FromCanceled(cancellationToken) - : self.isDone - ? Task.FromResult(self.asset) - : AwaitWithProgress(self, onProgress, cancellationToken); - - private async static Task AwaitWithProgress(this AssetBundleRequest self, - Action onProgress, CancellationToken cancellationToken = default) - { - while (self.isDone == false) - { - if (cancellationToken.IsCancellationRequested) - { - return await Task.FromCanceled(cancellationToken); - } - - onProgress?.Invoke(self.progress); - await Task.Yield(); - } - - return self.asset; - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs.meta b/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs.meta deleted file mode 100644 index 4df0150..0000000 --- a/Runtime/Files.Bundles/Extensions/AssetBundleRequestExtensions.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 64a5b260684e4a9b9fe7f92c881568e6 -timeCreated: 1693691926 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs b/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs deleted file mode 100644 index 522ff66..0000000 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs +++ /dev/null @@ -1,49 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Files.Bundles.Exceptions; -using UnityEngine.Networking; - -namespace Depra.Asset.Files.Bundles.Extensions -{ - internal static class UnityWebRequestAsyncOperationExtensions - { - public static Task ToTask(this UnityWebRequestAsyncOperation self, - Action onProgress = null, CancellationToken cancellationToken = default) - { - if (cancellationToken.IsCancellationRequested) - { - return Task.FromCanceled(cancellationToken); - } - - if (self.isDone) - { - return self.webRequest.CanGetResult() - ? Task.FromResult(self.webRequest) - : Task.FromException(new UnityWebRequestFailed(self.webRequest)); - } - - return AwaitWithProgress(self, onProgress, cancellationToken); - } - - private async static Task AwaitWithProgress(this UnityWebRequestAsyncOperation self, - Action onProgress, CancellationToken cancellationToken = default) - { - while (self.isDone == false) - { - if (cancellationToken.IsCancellationRequested) - { - return await Task.FromCanceled(cancellationToken); - } - - onProgress?.Invoke(self.progress); - await Task.Yield(); - } - - return self.webRequest; - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs.meta b/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs.meta deleted file mode 100644 index e9dbbf0..0000000 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestAsyncOperationExtensions.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7558da688eae4dbfb151f39ce6d9eebc -timeCreated: 1693689731 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs b/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs deleted file mode 100644 index 40f8d56..0000000 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using UnityEngine.Networking; - -namespace Depra.Asset.Files.Bundles.Extensions -{ - internal static class UnityWebRequestExtensions - { - public static bool CanGetResult(this UnityWebRequest self) => - self.result is UnityWebRequest.Result.ConnectionError - or UnityWebRequest.Result.DataProcessingError - or UnityWebRequest.Result.ProtocolError; - - public static int ParseSize(this UnityWebRequest self) - { - var contentLength = self.GetResponseHeader("Content-Length"); - if (int.TryParse(contentLength, out var returnValue)) - { - return returnValue; - } - - return -1; - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs.meta b/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs.meta deleted file mode 100644 index 654ef2e..0000000 --- a/Runtime/Files.Bundles/Extensions/UnityWebRequestExtensions.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0c36217f40ce46f4be8d17509c831456 -timeCreated: 1693691779 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files.meta b/Runtime/Files.Bundles/Files.meta deleted file mode 100644 index 45b3ad5..0000000 --- a/Runtime/Files.Bundles/Files.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: fef7721586e24a30ae7f34efa92eba7f -timeCreated: 1678833171 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs b/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs deleted file mode 100644 index 35ec5c4..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs +++ /dev/null @@ -1,88 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Bundles.Exceptions; -using Depra.Asset.Files.Bundles.Extensions; -using Depra.Asset.ValueObjects; -using UnityEngine; -using Object = UnityEngine.Object; - -namespace Depra.Asset.Files.Bundles -{ - public sealed class AssetBundleAssetFile : IAssetFile, IDisposable where TAsset : Object - { - private readonly AssetBundle _assetBundle; - private TAsset _loadedAsset; - - public AssetBundleAssetFile(AssetName name, AssetBundle assetBundle) - { - Guard.AgainstNull(name, nameof(name)); - Guard.AgainstNull(assetBundle, nameof(assetBundle)); - - _assetBundle = assetBundle; - Metadata = new AssetMetadata(name, FileSize.Unknown); - } - - public AssetMetadata Metadata { get; } - public bool IsLoaded => _loadedAsset != null; - private string Name => Metadata.Uri.Relative; - - public TAsset Load() - { - if (IsLoaded) - { - return _loadedAsset; - } - - var loadedAsset = _assetBundle.LoadAsset(Name); - Guard.AgainstNull(loadedAsset, () => new AssetBundleFileNotLoaded(Name, _assetBundle.name)); - - _loadedAsset = loadedAsset; - Metadata.Size = UnityFileSize.FromProfiler(_loadedAsset); - - return _loadedAsset; - } - - public void Unload() - { - if (IsLoaded) - { - _loadedAsset = null; - } - } - - public async Task LoadAsync(DownloadProgressDelegate onProgress = null, - CancellationToken cancellationToken = default) - { - if (IsLoaded) - { - onProgress?.Invoke(DownloadProgress.Full); - return _loadedAsset; - } - - var loadedAsset = await _assetBundle - .LoadAssetAsync(Name) - .ToTask(OnProgress, cancellationToken); - - Guard.AgainstNull(loadedAsset, () => new AssetBundleFileNotLoaded(Name, _assetBundle.name)); - - _loadedAsset = (TAsset) loadedAsset; - onProgress?.Invoke(DownloadProgress.Full); - Metadata.Size = UnityFileSize.FromProfiler(_loadedAsset); - - return _loadedAsset; - - void OnProgress(float progress) => onProgress?.Invoke(new DownloadProgress(progress)); - } - - public IEnumerable Dependencies() => AssetBundleDependenciesExtractor.Extract(_assetBundle); - - void IDisposable.Dispose() => Unload(); - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs.meta b/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs.meta deleted file mode 100644 index 8b5de77..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleAssetFile.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 57b8b1e701f2472ab311344d582e8e12 -timeCreated: 1677617200 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs b/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs deleted file mode 100644 index 11ea127..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using Depra.Asset.Files.Bundles.Exceptions; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles -{ - internal static class AssetBundleDependenciesExtractor - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static IEnumerable Extract(AssetBundle assetBundle) - { - const string MANIFEST_NAME = "assetbundlemanifest"; - var manifest = assetBundle.LoadAsset(MANIFEST_NAME); - if (manifest == null) - { - throw new AssetBundleFileNotLoaded(MANIFEST_NAME, assetBundle.name); - } - - var dependencies = manifest.GetAllDependencies(assetBundle.name); - foreach (var dependencyPath in dependencies) - { - yield return new AssetBundleUri(dependencyPath); - } - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs.meta b/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs.meta deleted file mode 100644 index 1e08f55..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleDependenciesExtractor.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: aabb1d126b8e4408bdd8abf082852106 -timeCreated: 1703534281 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleFile.cs b/Runtime/Files.Bundles/Files/AssetBundleFile.cs deleted file mode 100644 index 1cfdd15..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleFile.cs +++ /dev/null @@ -1,105 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Bundles.Exceptions; -using Depra.Asset.Files.Bundles.Sources; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles -{ - public sealed class AssetBundleFile : IAssetFile, IDisposable - { - private readonly AssetBundleUri _uri; - private readonly IAssetBundleSource _source; - - private AssetBundle _loadedAssetBundle; - - public AssetBundleFile(AssetBundleUri uri, IAssetBundleSource source) - { - Guard.AgainstNull(uri, nameof(uri)); - Guard.AgainstNull(source, nameof(source)); - - _source = source; - Metadata = new AssetMetadata(_uri = uri, FileSize.Unknown); - } - - public AssetMetadata Metadata { get; } - public bool IsLoaded => _loadedAssetBundle != null; - - public AssetBundle Load() - { - if (IsLoaded) - { - return _loadedAssetBundle; - } - - var loadedAssetBundle = _source.Load(by: _uri.AbsolutePathWithoutExtension); - Guard.AgainstNull(loadedAssetBundle, () => new AssetBundleNotLoaded(_uri.Absolute)); - - _loadedAssetBundle = loadedAssetBundle; - Metadata.Size = _source.Size(of: _loadedAssetBundle); - - return _loadedAssetBundle; - } - - public async Task LoadAsync(DownloadProgressDelegate onProgress = null, - CancellationToken cancellationToken = default) - { - if (IsLoaded) - { - onProgress?.Invoke(DownloadProgress.Full); - return _loadedAssetBundle; - } - - var loadedAssetBundle = await _source - .LoadAsync(_uri.AbsolutePathWithoutExtension, OnProgress, cancellationToken); - - Guard.AgainstNull(loadedAssetBundle, () => new AssetBundleNotLoaded(_uri.Absolute)); - - _loadedAssetBundle = loadedAssetBundle; - onProgress?.Invoke(DownloadProgress.Full); - Metadata.Size = _source.Size(of: _loadedAssetBundle); - - return _loadedAssetBundle; - - void OnProgress(float progress) => onProgress?.Invoke(new DownloadProgress(progress)); - } - - public void Unload() - { - if (IsLoaded == false) - { - return; - } - - _loadedAssetBundle.Unload(true); - _loadedAssetBundle = null; - } - - public void UnloadAsync() - { - if (IsLoaded == false) - { - return; - } - - _loadedAssetBundle.UnloadAsync(true); - _loadedAssetBundle = null; - } - - public IEnumerable Dependencies() - { - Guard.Against(IsLoaded == false, () => new AssetBundleNotLoaded(_uri.Absolute)); - return AssetBundleDependenciesExtractor.Extract(_loadedAssetBundle); - } - - void IDisposable.Dispose() => Unload(); - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleFile.cs.meta b/Runtime/Files.Bundles/Files/AssetBundleFile.cs.meta deleted file mode 100644 index e309064..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleFile.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3f66e0126c084eefa784bafbcec2f613 -timeCreated: 1675002783 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleUri.cs b/Runtime/Files.Bundles/Files/AssetBundleUri.cs deleted file mode 100644 index 0d5c507..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleUri.cs +++ /dev/null @@ -1,47 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System.IO; -//using Depra.Assets.Extensions; -using Depra.Asset.ValueObjects; - -namespace Depra.Asset.Files.Bundles -{ - public sealed record AssetBundleUri : IAssetUri - { - private const string EXTENSION = ".assetbundle"; - - public static AssetBundleUri Empty => new(string.Empty); - public static AssetBundleUri Invalid => new(nameof(Invalid)); - public static implicit operator AssetBundleUri(string path) => new(path); - - private readonly FileInfo _fileInfo; - - public AssetBundleUri(string path) - { - _fileInfo = new FileInfo(path); - //_fileInfo.Directory.Require(); - - Name = string.IsNullOrEmpty(Extension) - ? _fileInfo.Name - : _fileInfo.Name.Replace(Extension, string.Empty); - - AbsolutePathWithoutExtension = Absolute.Replace(EXTENSION, string.Empty); - } - - public AssetBundleUri(string name, string directory = null) : this(name, directory, EXTENSION) { } - - public AssetBundleUri(string name, string directory, string extension = null) : this( - Path.Combine(directory, name + extension)) { } - - public string Name { get; } - public string Extension => EXTENSION; - public string NameWithExtension => Name + Extension; - - public string Absolute => _fileInfo.FullName; - public string AbsoluteDirectoryPath => _fileInfo.DirectoryName; - public string AbsolutePathWithoutExtension { get; } - - string IAssetUri.Relative => Name; - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Files/AssetBundleUri.cs.meta b/Runtime/Files.Bundles/Files/AssetBundleUri.cs.meta deleted file mode 100644 index a1800c5..0000000 --- a/Runtime/Files.Bundles/Files/AssetBundleUri.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 4e0039a268c44d8abef6239694f41351 -timeCreated: 1681075311 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources.meta b/Runtime/Files.Bundles/Sources.meta deleted file mode 100644 index 45d1147..0000000 --- a/Runtime/Files.Bundles/Sources.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f0305bc0b379403f8ebdb210e9d4fc10 -timeCreated: 1689980205 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs deleted file mode 100644 index a5995dc..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Bundles.Extensions; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public readonly struct AssetBundleFromFile : IAssetBundleSource - { - FileSize IAssetBundleSource.Size(AssetBundle of) => AssetBundleSize.Evaluate(of); - - AssetBundle IAssetBundleSource.Load(string by) - { - Guard.AgainstFileNotFound(by); - - return AssetBundle.LoadFromFile(by); - } - - Task IAssetBundleSource.LoadAsync(string by, Action onProgress, - CancellationToken cancellationToken) - { - Guard.AgainstFileNotFound(by); - - return AssetBundle - .LoadFromFileAsync(by) - .ToTask(onProgress, cancellationToken); - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs.meta b/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs.meta deleted file mode 100644 index df1deac..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromFile.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7d63f73ae55546ea8984094fbed8aac9 -timeCreated: 1689980352 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs deleted file mode 100644 index f7ab253..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.IO; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Bundles.Extensions; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public readonly struct AssetBundleFromMemory : IAssetBundleSource - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static byte[] ReadBytes(string path) => File.ReadAllBytes(path); - - FileSize IAssetBundleSource.Size(AssetBundle of) => AssetBundleSize.Evaluate(of); - - AssetBundle IAssetBundleSource.Load(string by) - { - Guard.AgainstFileNotFound(by); - - return AssetBundle.LoadFromMemory(ReadBytes(by)); - } - - Task IAssetBundleSource.LoadAsync(string by, Action onProgress, CancellationToken cancellationToken) - { - Guard.AgainstFileNotFound(by); - - return AssetBundle - .LoadFromMemoryAsync(ReadBytes(by)) - .ToTask(onProgress, cancellationToken); - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs.meta b/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs.meta deleted file mode 100644 index c490a04..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromMemory.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 9dda631cf3b9436b945ee7b1b50ad7fd -timeCreated: 1689980742 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs deleted file mode 100644 index 4769ec1..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs +++ /dev/null @@ -1,45 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.IO; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Bundles.Extensions; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public readonly struct AssetBundleFromStream : IAssetBundleSource - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static Stream OpenStream(string path) => - new FileStream(path, FileMode.Open, FileAccess.Read); - - FileSize IAssetBundleSource.Size(AssetBundle of) => AssetBundleSize.Evaluate(of); - - AssetBundle IAssetBundleSource.Load(string by) - { - Guard.AgainstFileNotFound(by); - - using var fileStream = OpenStream(by); - - return AssetBundle.LoadFromStream(fileStream); - } - - async Task IAssetBundleSource.LoadAsync(string by, Action onProgress, - CancellationToken cancellationToken) - { - Guard.AgainstFileNotFound(by); - - await using var stream = OpenStream(by); - - return await AssetBundle - .LoadFromStreamAsync(stream) - .ToTask(onProgress, cancellationToken); - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs.meta b/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs.meta deleted file mode 100644 index 666509c..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromStream.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: cce5384652054419bd4304851fd288c3 -timeCreated: 1689980594 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs b/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs deleted file mode 100644 index 90e09e9..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs +++ /dev/null @@ -1,55 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.Files.Bundles.Exceptions; -using Depra.Asset.Files.Bundles.Extensions; -using Depra.Asset.ValueObjects; -using UnityEngine; -using UnityEngine.Networking; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public sealed class AssetBundleFromWeb : IAssetBundleSource - { - private long _contentSize; - - FileSize IAssetBundleSource.Size(AssetBundle of) => - _contentSize == -1 ? AssetBundleSize.Evaluate(of) : new FileSize(_contentSize); - - AssetBundle IAssetBundleSource.Load(string by) - { - using var unityWebRequest = UnityWebRequestAssetBundle.GetAssetBundle(by); - unityWebRequest.SendWebRequest(); - - while (unityWebRequest.isDone == false) - { - // Spinning for Synchronous Behavior (blocking). - } - - if (unityWebRequest.CanGetResult() == false) - { - throw new UnityWebRequestFailed(unityWebRequest); - } - - return DownloadHandlerAssetBundle.GetContent(unityWebRequest); - } - - async Task IAssetBundleSource.LoadAsync(string by, Action onProgress, - CancellationToken cancellationToken) - { - var webRequest = UnityWebRequestAssetBundle.GetAssetBundle(by); - await webRequest - .SendWebRequest() - .ToTask(onProgress, cancellationToken); - - var downloadedBundle = DownloadHandlerAssetBundle.GetContent(webRequest); - _contentSize = webRequest.ParseSize(); - webRequest.Dispose(); - - return downloadedBundle; - } - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs.meta b/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs.meta deleted file mode 100644 index 0f62301..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleFromWeb.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 19827faf232f4eff8cb06200df0fcaa9 -timeCreated: 1689980932 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs b/Runtime/Files.Bundles/Sources/AssetBundleSize.cs deleted file mode 100644 index a80f25e..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs +++ /dev/null @@ -1,71 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Depra.Asset.ValueObjects; -using UnityEngine; -using Object = UnityEngine.Object; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public static class AssetBundleSize - { - public static FileSize Evaluate(AssetBundle assetBundle) - { - FileSize fileSize; -#if UNITY_EDITOR - fileSize = SizeInRAM(assetBundle); - if (fileSize.Bytes == 0) -#endif - { - fileSize = SizeOnDisk(assetBundle); - } - - return fileSize; - } - - private static FileSize SizeOnDisk(AssetBundle assetBundle) - { - var allScenePaths = assetBundle.GetAllScenePaths(); - var sizes = from scenePath in allScenePaths - select Path.Combine(Application.streamingAssetsPath, scenePath) - into absolutePath - select new FileInfo(absolutePath) - into fileInfo - where fileInfo.Exists - select fileInfo.Length; - - return new FileSize(sizes.Sum()); - } - -#if UNITY_EDITOR - /// - /// Returns size of in RAM. - /// - /// for calculating. - /// - /// Source - https://stackoverflow.com/questions/56822948/estimate-an-assetbundle-size-in-ram - private static FileSize SizeInRAM(Object assetBundle) - { - var sizes = new Dictionary(); - var serializedObject = new UnityEditor.SerializedObject(assetBundle); - var serializedProperty = serializedObject.FindProperty("m_PreloadTable"); - for (var index = 0; index < serializedProperty.arraySize; index++) - { - var objectReference = serializedProperty.GetArrayElementAtIndex(index).objectReferenceValue; - var type = objectReference.GetType(); - var size = UnityEngine.Profiling.Profiler.GetRuntimeMemorySizeLong(objectReference); - if (sizes.TryAdd(type, size) == false) - { - sizes[type] += size; - } - } - - return new FileSize(sizes.Sum(x => x.Value)); - } -#endif - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs.meta b/Runtime/Files.Bundles/Sources/AssetBundleSize.cs.meta deleted file mode 100644 index 908592a..0000000 --- a/Runtime/Files.Bundles/Sources/AssetBundleSize.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 60c170ca95ba4895ae0c6f706838c9b6 -timeCreated: 1679185663 \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs b/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs deleted file mode 100644 index 53f9faf..0000000 --- a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// © 2023-2024 Nikolay Melnikov - -using System; -using System.Threading; -using System.Threading.Tasks; -using Depra.Asset.ValueObjects; -using UnityEngine; - -namespace Depra.Asset.Files.Bundles.Sources -{ - public interface IAssetBundleSource - { - FileSize Size(AssetBundle of); - - AssetBundle Load(string by); - - Task LoadAsync(string by, Action onProgress, CancellationToken cancellationToken = default); - } -} \ No newline at end of file diff --git a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs.meta b/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs.meta deleted file mode 100644 index 42b4763..0000000 --- a/Runtime/Files.Bundles/Sources/IAssetBundleSource.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b28d47aaf9854f45bd2712363bda15c3 -timeCreated: 1689980199 \ No newline at end of file diff --git a/package.json b/package.json index 80b68ff..f5472af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.depra.asset.unity", - "version": "0.2.8-pre.2", + "version": "0.2.8-pre.3", "displayName": "Depra.Asset", "description": "Provides an API for loading Unity asset files in multiple ways through a single interface.", "unity": "2021.3", @@ -10,8 +10,7 @@ "asset", "editor", "runtime", - "resources", - "assetBundle" + "resources" ], "author": { "name": "Depra, Inc.", From 471e8fb16036831d521150940fcc1a2703fa83f4 Mon Sep 17 00:00:00 2001 From: godzzz Date: Tue, 25 Jun 2024 23:22:06 +0400 Subject: [PATCH 4/6] [v0.2.8-pre.5] Assembly info fixed --- Runtime/Properties/AssemblyInfo.cs | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Properties/AssemblyInfo.cs b/Runtime/Properties/AssemblyInfo.cs index 5cca0ba..dfb9f52 100644 --- a/Runtime/Properties/AssemblyInfo.cs +++ b/Runtime/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Depra.Asset.Editor")] -[assembly: InternalsVisibleTo("Depra.Asset.Bundles")] +[assembly: InternalsVisibleTo("Depra.Asset.Bundle")] [assembly: InternalsVisibleTo("Depra.Asset.Tests.EditMode")] [assembly: InternalsVisibleTo("Depra.Asset.Tests.PlayMode")] diff --git a/package.json b/package.json index f5472af..9bba113 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.depra.asset.unity", - "version": "0.2.8-pre.3", + "version": "0.2.8-pre.4", "displayName": "Depra.Asset", "description": "Provides an API for loading Unity asset files in multiple ways through a single interface.", "unity": "2021.3", From 1efa594b6574873a5d513f6d540e693dfcf26256 Mon Sep 17 00:00:00 2001 From: godzzz Date: Fri, 12 Jul 2024 20:45:17 +0400 Subject: [PATCH 5/6] [v0.2.8-pre.5] Renaming reverted --- Docs/README.RU.md | 16 +++++++------- Docs/README.md | 20 +++++++++--------- Editor/Depra.Assets.Editor.asmdef | 4 ++-- Editor/Drawers/ResourcesReferenceDrawer.cs | 6 +++--- .../SerializedPropertyExtensions.cs | 2 +- Editor/Files/EditorDatabaseAsset.cs | 14 ++++++------ Editor/Files/PreloadedAsset.cs | 10 ++++----- Plugins/Depra.Asset.dll | Bin 18432 -> 0 bytes Plugins/Depra.Assets.dll | Bin 0 -> 18432 bytes ...a.Asset.dll.meta => Depra.Assets.dll.meta} | 2 +- ...Unity.asmdef => Depra.Assets.Unity.asmdef} | 6 +++--- ...ef.meta => Depra.Assets.Unity.asmdef.meta} | 0 Runtime/Exceptions/AssetCanNotBeLoaded.cs | 2 +- Runtime/Exceptions/Guard.cs | 2 +- Runtime/Extensions/DirectoryInfoExtensions.cs | 2 +- Runtime/Extensions/StringExtensions.cs | 2 +- Runtime/Extensions/TaskExtensions.cs | 2 +- .../Files.Database/AssetCatNotBeCreated.cs | 2 +- Runtime/Files.Database/DatabaseAssetUri.cs | 4 ++-- .../Files.Database/RuntimeDatabaseAsset.cs | 8 +++---- .../PathDoesNotContainResourcesFolder.cs | 2 +- .../Exceptions/ResourceNotLoaded.cs | 2 +- .../ResourceRequestExtensions.cs | 2 +- Runtime/Files.Resource/ResourcesAsset.cs | 10 ++++----- Runtime/Files.Resource/ResourcesPath.cs | 12 +++++------ Runtime/Files.Resource/ResourcesReference.cs | 2 +- Runtime/Files/UnityFileSize.cs | 6 +++--- Runtime/Internal/AssetTypes.cs | 2 +- Runtime/Internal/Module.cs | 4 ++-- Runtime/Internal/UnityProject.cs | 2 +- Runtime/Properties/AssemblyInfo.cs | 14 ++++++------ package.json | 10 ++++----- 32 files changed, 87 insertions(+), 85 deletions(-) delete mode 100644 Plugins/Depra.Asset.dll create mode 100644 Plugins/Depra.Assets.dll rename Plugins/{Depra.Asset.dll.meta => Depra.Assets.dll.meta} (93%) rename Runtime/{Depra.Asset.Unity.asmdef => Depra.Assets.Unity.asmdef} (75%) rename Runtime/{Depra.Asset.Unity.asmdef.meta => Depra.Assets.Unity.asmdef.meta} (100%) diff --git a/Docs/README.RU.md b/Docs/README.RU.md index f963333..7cc559a 100644 --- a/Docs/README.RU.md +++ b/Docs/README.RU.md @@ -1,8 +1,8 @@ # Depra.Assets -![License](https://img.shields.io/github/license/Depra-Inc/Asset.Unity?style=flat-round) -![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Asset.Unity?style=flat-round) -![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Asset.Unity?style=flat-round) +![License](https://img.shields.io/github/license/Depra-Inc/Assets.Unity?style=flat-round) +![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Assets.Unity?style=flat-round) +![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Assets.Unity?style=flat-round)
English | Русский @@ -64,7 +64,7 @@ 1. Откройте окно **Unity Package Manager**. 2. Нажмите на кнопку **+** в правом верхнем углу окна. 3. Выберите **Add package from git URL...**. -4. Введите [ссылку на репозиторий](https://github.com/Depra-Inc/Asset.Unity.git) +4. Введите [ссылку на репозиторий](https://github.com/Depra-Inc/Assets.Unity.git) 5. Нажмите **Add**. ### ⚙️ Через **UPM** используя `manifest.json`: @@ -72,7 +72,7 @@ Добавьте в `Packages/manifest.json` в раздел `dependencies` следующую строку: ``` -"com.depra.assets.unity": "https://github.com/Depra-Inc/Asset.Unity.git" +"com.depra.assets.unity": "https://github.com/Depra-Inc/Assets.Unity.git" ``` ### 🛒 Через Unity Asset Store: @@ -166,8 +166,8 @@ preloadedAsset.Unload(); ## 🤝 Сотрудничество Я рад приветствовать запросы на добавление новых функций и сообщения об ошибках в -разделе [issues](https://github.com/Depra-Inc/Asset.Unity/issues) и также -принимать [pull requests](https://github.com/Depra-Inc/Asset.Unity/pulls). +разделе [issues](https://github.com/Depra-Inc/Assets.Unity/issues) и также +принимать [pull requests](https://github.com/Depra-Inc/Assets.Unity/pulls). ## 🫂 Поддержка @@ -179,7 +179,7 @@ preloadedAsset.Unload(); ## 🔐 Лицензия Этот проект распространяется под лицензией -**[Apache-2.0](https://github.com/Depra-Inc/Asset.Unity/blob/main/LICENSE.md)** +**[Apache-2.0](https://github.com/Depra-Inc/Assets.Unity/blob/main/LICENSE.md)** Copyright (c) 2023 Николай Мельников [n.melnikov@depra.org](mailto:n.melnikov@depra.org) \ No newline at end of file diff --git a/Docs/README.md b/Docs/README.md index 5496830..11c5597 100644 --- a/Docs/README.md +++ b/Docs/README.md @@ -1,8 +1,8 @@ -# Depra.Asset +# Depra.Assets -![License](https://img.shields.io/github/license/Depra-Inc/Asset.Unity?style=flat-round) -![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Asset.Unity?style=flat-round) -![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Asset.Unity?style=flat-round) +![License](https://img.shields.io/github/license/Depra-Inc/Assets.Unity?style=flat-round) +![Last Commit](https://img.shields.io/github/last-commit/Depra-Inc/Assets.Unity?style=flat-round) +![Code Size](https://img.shields.io/github/languages/code-size/Depra-Inc/Assets.Unity?style=flat-round)
English | Русский @@ -64,7 +64,7 @@ These features make the library even more powerful and convenient for your tasks 1. Open the **Unity Package Manager** window. 2. Click the **+** button in the upper right corner of the window. 3. Select **Add package from git URL...**. -4. Enter the [repository link](https://github.com/Depra-Inc/Asset.Unity.git). +4. Enter the [repository link](https://github.com/Depra-Inc/Assets.Unity.git). 5. Click **Add**. ### ⚙️ Using **UPM** via **manifest.json**: @@ -72,7 +72,7 @@ These features make the library even more powerful and convenient for your tasks Add the following line to `Packages/manifest.json` in the `dependencies` section: ``` -"com.depra.asset.unity": "https://github.com/Depra-Inc/Asset.Unity.git" +"com.depra.assets.unity": "https://github.com/Depra-Inc/Assets.Unity.git" ``` ### 🛒 Using Unity Asset Store: @@ -160,14 +160,14 @@ preloadedAsset.Unload(); ## 🖇 Dependencies -- [Depra.Asset](https://github.com/Depra-Inc/Asset.git) - the base library for working with assets (provided +- [Depra.Asset](https://github.com/Depra-Inc/Assets.git) - the base library for working with assets (provided with this **UPM** package). ## 🤝 Collaboration I welcome feature requests and bug reports in -the [issues section](https://github.com/Depra-Inc/Asset.Unity/issues), and I also -accept [pull requests](https://github.com/Depra-Inc/Asset.Unity/pulls). +the [issues section](https://github.com/Depra-Inc/Assets.Unity/issues), and I also +accept [pull requests](https://github.com/Depra-Inc/Assets.Unity/pulls). ## 🫂 Support @@ -178,7 +178,7 @@ my [portfolio](https://github.com/Depra-Inc) and [contact me](mailto:g0dzZz1lla@ ## 🔐 License This project is distributed under the -**[Apache-2.0 license](https://github.com/Depra-Inc/Asset.Unity/blob/main/LICENSE.md)** +**[Apache-2.0 license](https://github.com/Depra-Inc/Assets.Unity/blob/main/LICENSE.md)** Copyright (c) 2023 Nikolay Melnikov [n.melnikov@depra.org](mailto:n.melnikov@depra.org) \ No newline at end of file diff --git a/Editor/Depra.Assets.Editor.asmdef b/Editor/Depra.Assets.Editor.asmdef index 9d30046..e828db3 100644 --- a/Editor/Depra.Assets.Editor.asmdef +++ b/Editor/Depra.Assets.Editor.asmdef @@ -1,5 +1,5 @@ { - "name": "Depra.Asset.Editor", + "name": "Depra.Assets.Editor", "rootNamespace": "Depra.Assets", "references": [ "GUID:ce2ab5ef472b35f498b9d47a89be9396" @@ -11,7 +11,7 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "Depra.Asset.dll" + "Depra.Assets.dll" ], "autoReferenced": true, "defineConstraints": [], diff --git a/Editor/Drawers/ResourcesReferenceDrawer.cs b/Editor/Drawers/ResourcesReferenceDrawer.cs index 731d81b..648f056 100644 --- a/Editor/Drawers/ResourcesReferenceDrawer.cs +++ b/Editor/Drawers/ResourcesReferenceDrawer.cs @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -using Depra.Asset.Editor.Extensions; -using Depra.Asset.Files.Resource; +using Depra.Assets.Editor.Extensions; +using Depra.Assets.Files.Resource; using UnityEditor; using UnityEngine; -namespace Depra.Asset.Editor.Drawers +namespace Depra.Assets.Editor.Drawers { [CustomPropertyDrawer(typeof(ResourcesReference), true)] internal sealed class ResourcesReferenceDrawer : PropertyDrawer diff --git a/Editor/Extensions/SerializedPropertyExtensions.cs b/Editor/Extensions/SerializedPropertyExtensions.cs index dd0e727..d1a4cc6 100644 --- a/Editor/Extensions/SerializedPropertyExtensions.cs +++ b/Editor/Extensions/SerializedPropertyExtensions.cs @@ -9,7 +9,7 @@ using System.Text.RegularExpressions; using UnityEditor; -namespace Depra.Asset.Editor.Extensions +namespace Depra.Assets.Editor.Extensions { internal static class SerializedPropertyExtensions { diff --git a/Editor/Files/EditorDatabaseAsset.cs b/Editor/Files/EditorDatabaseAsset.cs index b1326ab..6322d8e 100644 --- a/Editor/Files/EditorDatabaseAsset.cs +++ b/Editor/Files/EditorDatabaseAsset.cs @@ -6,17 +6,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.Extensions; -using Depra.Asset.Files; -using Depra.Asset.Files.Database; -using Depra.Asset.ValueObjects; +using Depra.Assets.Delegates; +using Depra.Assets.Extensions; +using Depra.Assets.ValueObjects; +using Depra.Assets.Exceptions; +using Depra.Assets.Files; +using Depra.Assets.Files.Database; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Asset.Editor.Files +namespace Depra.Assets.Editor.Files { public sealed class EditorDatabaseAsset : IAssetFile, IDisposable where TAsset : ScriptableObject { diff --git a/Editor/Files/PreloadedAsset.cs b/Editor/Files/PreloadedAsset.cs index 8050096..85a3de1 100644 --- a/Editor/Files/PreloadedAsset.cs +++ b/Editor/Files/PreloadedAsset.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.Files; -using Depra.Asset.ValueObjects; +using Depra.Assets.Delegates; +using Depra.Assets.ValueObjects; +using Depra.Assets.Exceptions; +using Depra.Assets.Files; using UnityEditor; using Object = UnityEngine.Object; -namespace Depra.Asset.Editor.Files +namespace Depra.Assets.Editor.Files { public sealed class PreloadedAsset : IAssetFile, IDisposable where TAsset : Object { diff --git a/Plugins/Depra.Asset.dll b/Plugins/Depra.Asset.dll deleted file mode 100644 index 30e148b7aa638015e1816316a51eb90150817ba9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18432 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 akJW#H>nip4L?@U27x3l3UHDIr!2bu7t8dK! diff --git a/Plugins/Depra.Assets.dll b/Plugins/Depra.Assets.dll new file mode 100644 index 0000000000000000000000000000000000000000..07e6641d4061ab60fa268543258cf3c3c25d6feb GIT binary patch literal 18432 zcmeHud3YSvmG7yl?&`fQwJcl4vfSPq$!;XeHr}zU#TIy%Y%n&FTT)qWyVWIkw~UP} zN5&3>ZGa4rcmlzgFd1e-WLkmMs_UhrogB+R^zdD;B(F*8PazjJQ& zBAYsFd5% zrahyrdu3YZo@6#Ukg@wRiT-F$BAvE#(QYf68B9l$>1fNwj%dH#YsEt$|4hg9rdFbL znn96kbHB*9c8;b;16sXu!c^QJegb6__b%K-WrFL?@7nW?OBzORiOy)FgU>sv920CWEN0(T7-rOIE3!jw*r>Rn+UW3T~sR@@zGf{bmOEfIS8HY%_zx z!F4khATsCr%&AekMx;}R9mJl>&9JRCum!iuV^MI7%&bCnLyvh--JZrZjSTwe*o6QC zZ~7xNIsu3-wp8;IYvZ~R3qd+zRIA;l8}V`aT%T^(NKms*n^31stR0O_hebVxyf^I` zK%dq5f4MCH7 zM>#G?1Y;PUmW(hwaz;3Qqz(;b$Fu!-27@r5aI`7B8r?=(n4AG@0wt#j)2jT?Jh-+n zMi=D)M*pMo;AUs=_Z8}+Kir%ed^M`bkBdhYqn97mQ_iSXa;=h4or_+oF4*&cs^OC` zaOK*w7_tUqZk-4$%N2HlI1uC+y8aWY$ivbda-1&|z3{>G}{CDTIKpdsgijM#5aou5a2g z>;t>@f9r?2G=><)FcJN8XXuByhB3rYvC5QDLrjlq>|wqiJim=W&PnbEm)sAyD*fnI z6?L(tt46S*)S-j>SvR(jd%?DDg0q;3@UCrEP<{F9}Ls06nNI-MA1#F(QQnu-_R?s#&W7=?+{g1VQb7T#GbVB*C z7G$=ac_S=|!Bibv;Wi~7U9`dJ2Rd*KD{=%><#iyP4zPq5);e-L(?`wqc`+~N=$RNb zY}mslMl`wJMc;yLG+EA3V)twu7%)be>?V`}k3PH^rN^|lpcw7|AkPpNHvBe2zPSd~ zwK*IdA^btFXVlyZM7-h!v5vg@kVI_M+*S}Eo!KAedu^;;7#-8T4&}UC&IZi6Xb{V< zpMI{Qs9cj!+o)+eH7i_oRPL%J4cmcEVLEar1vpfkujmW(uupD>9lsg79>wqu08<~{ z$%Qd|0~fAg91{Fy+HDxXJwTjM zwv&vr>RupO47ph#FvMo!$u;T#hgDit17cZM3Y>nW?h!q!Fa5{q^&mnPRz~8<3}|khO{!NcBP@) zX=u0{TH4fT97<#pV(&NSddaYD=-gBr&kmp**$;q|lA7nW-Q%>;2{;T*R_>shDJvti zGpx;Xr>GszB;Zyy%gh=>@*3OnzEU3M7S{5-`A_IF1N0%D8Y;Y)EF}s{d2zr2*dH5Y zqlJ7#>Xv5@fQ5X#5ykL90OaE#E{tI;v7C=XTvQGp=Hf7GARmL0k4(gl0AR}*`Xm!F zwlbWY^H`yH069NdDzjadt$hvy1LwC#0QT+hM>I2bIo#HVj)F03o-w=5~S!LKP6@qpq*c`a5{8qZMs07}8liOC6d0kWWM$KD+ zXFm79(9MtfA z0Q!)EoT$T`3V8;n>@a5tdde!2E#vhe&SCq01`hxPB3kUTDCadxY`GELGyFL&g1Sm^ zEuzOT#SvN$oY99^7|;)MFaz_rB|1n1elErJh)?y*q*Lbo0h1a%44)MEvis&h1w94hCQTI1PV@I(lTLW* z{3g9`GJHzlj|6rIKP31GH`_Vm`JT_D*&&8scQZU7_)?8=3-(R=t-w(ib6kOWVUs>3 zZT+io=4!vwP4eh0UFA9%G--K&;X09iN2Gr*@b3i9lwMqAvgJ;#1)4wd{Q^Gk^0S3m z((WgH%zw$n9-h(|{)?aC?NV!2fbj#u9~4f9c>bz*-s)pJaWBIz@!@Ad*1ua?kBRh{ z@JIX;5T7@t-Rp!iP2hFXmnPQ_Al)Ig)mz7}W)wODK>HAO8E&D&kCAt%c4)`#n@fsCnj;@Ok_uLVzl z!f^;KTx%$5qfqxdvQ0DsS(WQ+!FFhFMhiqs-R}gR2h~Xiysid^W!DMyD|EV@BD8}H z)WabL)I>@Ml@w|c^$7L8P}Q_Ys5MfrhW64i)Vm8YZl_t)FS06wsTio)R2l4Y&!%(U z9``hQ+t}^a=oMox@TZNJAZ_%fA^rEje!xI52dDvV9{G;`5^Wy&OM!O*PNSC4liD=$ z`9A~rknw`Hh|+pgn}7&U6ucMsa=ISyVR{2FD)=WcekOe>v;%NPa5dmNzP~Qu?+5>~ zAU&f!W|(x?{kPym0w(~Kw5YF97&;nNY7MTAksEY>{|r#j?*7sGC7OF4R%)uF&mn zgPu|{?-jngL4Dhyp7!1c>bnm0oc9E%SA{x5vwcU9?bXu=*HQXG@L{)$_yr2l1Kus+ z$J}lja;P>?9=cbkGgRYxlYI1=L+uDY;r7uvp?<0D2tMid)3WJo{4?s;7id)dl$+8y`ogr?$nywd_@@xwAITVld6gngn z+w_`K=w^q?33Z21oRJ~OUJ!~~h?q5WK`7P2RGN+hG zZP@xu`lchh;CmUGFDi<@5L#x=r05*6qAfLA%~|xmLxqhEpw`8d>?+LAIrL?RdNGhN z=g`j_sxPqAm_xr1>Md<8_J%q1FAi0O**Axb%h}3N`WdCPIaKCQ|3@g6aNpTaX<8`m zQGs%+)EpR<<;*lAbL1(mD*Hh+F zdRyANw`wSGD=nj638mJvW%RyK$Ebp0+A=EV10gBR(z zD*8u<`h=d+n&>@;3hNr4Nte_Wtu)bUp^j0#Xm*W}?GfrNZDyG3RpE(>=q>H%u1|ov zOep2&YMSZDSaUUu5RKSW8#$I!LH=RIVp&4W8T^2nn__H)>WPpzv2O;HE z`*Cfj?^fa5fs@pWp%Z{Lu1Bdw@D{<>3BFG7uToq1Sx9#TpU3%>;j>zA_$8b&xo)TE zbPE4@>>od-=QZ9bUeXNrTfk@g-o-g>NAUk*jy&)B9qMim`L&&Lp4%yByPdLb^upUk z+HbTU`j%@cIpL)s?FG(jMNXuLrANo*ba*EP!*9}k;JE3yoEneIdGR>$ntPmhhe*j8 zF-5$-Jm}be$aevJJ~gKB(+Lq8-qd~@<@r}mMX&|`E z$k7tlHvJv(^C8PWWnE zOh8oJS^Pm zsul|uGL?-*JU$F8u>wJ^j=b zp}XjMcNjVK4)FU0|D50_1b>iz1^z?8BlHO1kOJqGC+?``7SZNh)Vfo$hFnhu|z6V5q-Z__cfMH=_Q&=`*jJ_G0Y z^X4jz^;ZdJm*Beu?-6OQ#t|3+|F?i_;iTXv1%FQ9IpLfW{4EEvC!}*N(z#X?_3j8@QbIu8j`d`2s zk5vM92|OA6JT38_46^1(=v%BQu%B+mn&i^P>skF3eYbJDaoTvv=)^9C?~8bT^I)94 z*pK|k;UJ#xLwHMpH&>z4CgD8rJmBlzGk}WI8~y?C`wfOqyIuu+)x&VRm*F>jKLNbQ zuizWN5BeF-66se2{!%{+j;g!CcpEtR-vv}SOLh2VkPgq>fL@du_D2jZ-l6#bCr|)z zB0S}<*5d#tW9QVV8uLZRxw;ZC2Dy%RDw6=O;2A`V@C2jNl{6J_DRx&K^JfO&a=d@g ziBIP`-kw|z*iLouU=h|)6YpBmh{~s-8Km2xIf-6}bP^&u4_1E;d@`LCJcf1_;as*J z`{LvDReG7qw7AxxWwa6P4((y>Z?s=)%k-=D9{sR>OxKOA#&yPCW51Cz{@nN<#(Tym zUH7_NBYd(by{?q=NRjsqR}iNR!Wae6Pj#x8h_VXzB;1!_rcOrR`KqGNqBbEes*E{h zty9i*%D7Y3JLP<*T;!Ddo$^r{6nl@+kMtys(jaZnPSKDyK;P8v$9)R-7p2^beQmG) zJbhDtg|0CEot`i%w1{hp*5qo`PPq)6d;GX@EpJZQX=~+7TE22gS66*kJuUA@-ej%p zb_nJ+%x88}Z*NmJYvov^I4l!UyeDU8m@m}Ip02KzWOg8xIMkdTR60^zdx zMU1sr16I1%O7|qKtTZ89Zej_G`>b47dv=|j=(T!TEKDYwvWL<=%z+Zq4tkNd4Mic` z0res7Fn2NBK{2QbbfkV)1GNpNdr-8urU(12Orkqw3AKMPk;@YjnYN@zIuqG_tk7(y zQdUncX{SMn!kUadI3NUkX0`QJZjar&dN7&lwK5R2!e%O&JJf9V4$F;iT}&(#vCtkYK&n7*zq6(x+Ea1KM9k}#^#T!>LqJ)Ey%RH(Nx zy@`KzXl1j_dlKnBtM~924TQWAp~^~89Eo0pZUMEYbBh*~+JiRel}l*(db@WpWv!&v z4INvzv{GBsx{g-r+_JTmI@+&q?P}l9wZ3&t)9US=tsPx$8@H@)>MRJZX>n}%7Lw_T|}o3APagCDyJ7K_jPrxPW0@< z*ORuSm4akLqTjldD>L^J-L0AAC8|ApkaE;Cz;llJB?~ES<+8a%x;K&Or8R>Bt=!r~ zc26^YU`nm&-uCnXd!I$Ct-fU1!SnfuIYI3_>Fq2}32Lzix!5w8&L#V;&O-y%T37~W zjg@1nEo1jPoDTGgYZs=F#DqIYeLP8En-x2+`}7X@bhz|#Y$Oy zELaZ{$(}?uSKzc*-GhC7R%Ug^zEQ#>ZecbwbajbS)Y{)|^&(4}a`;5nJqRnD5m-(# zlA17EA}T0t%_jP+0!6AB4u6riVK9{%%elmvqA~}$zdLoPGnp&3A+w+~lEoT%V;wnb zpmPsKt8Y(H*qO*6yW8-)W$Q*ev#%&_ zgMwv?^1OFQjNZYXTv3o83$)3!TByShR zYS=|Hi8xozW#f|L8@u;n6UxTb{K8rgZ|ct4DbBG!MVZ&9LWR|bP-_E+HH9-muh^&b zMKso~!9UG5hcA~r@TV!WBZUe~@M1^kr$RUvgtI%3WUbV0YD*>h@{<_}iZElf$upc# z#+~e7NvFMbus@OJ@!)BrzF33nAlxoO=qy%@+1-1w+GFWyPNY)ZSfdGButHkXSu7S`S)1gPf0;OVDFmyt$K|Nn$}wq%h|T^MbD3gGrD|jUA(2Ft}P9W;HeS zC6eiEj*9!i?!Q1)lg5~Uuw$q;b@c=XIc;TSOeTTFTh2@DzGJp>3wM|pyaH#JXxh@*IOA| z?Vjid{?uW$rM6GrFXZ$zW^2X1YxQ>8O5iNn>yqjH)SR*s8ES8n6#x_QKoaLGHBOft zyGV_#a|pw#oa^f9RwpvDb9+#)*4~}N;i=bZLdqV>g6#ypFumd& zudF)DX7g$49EN!9`9_blb-a0%QrkouN_#LF->?vp?S=wY%YU6gF3|+pDPuTVB3_kcIOC-#hx7516}PnLSkXbNgFNJ z?gY*qyf9%c+G1syK-M`JW}<`PIL{(9$@5j}HVqadyfqfYKw|Bir$2QLo@vO=cKgp=uai(1UEX8s@!jqR7ZE z;7B+!^3N;^`O6H$TSGNkjqdgv{!qy6F~WePhr`^nOv&KkA}JCu;amjy#0!pI{rzaU)zKC%kz!lp|HBKkS4ITJ_Kh za=oJtF97_5qI?)~w#KE`@9+&XGM-0bd@u?>@&mwT`gJuJx)1$UC=3?3>_6B^_^kZb zdDJSX+T%vEpK{DsMy>-70ajz|<3=E?;C`}%{b9e^)qEYeqXe7^kaL0VR&ciIUJoqy zDghUP%JPwC!Qu?!QD;iRP-LTv>s)5}$o;zM_0((lNf(BQ`_J{2NB07&@W9D}6RO$r zk~nZ1kytn?jYVQgp{y7YC7)d8L`Br{v0+(_=Jz{sjKo4tAe0rnBMswnlNO#5Mv8En zet^ItqDUjdqv`O26A2Wsoxs9TJu>o$lDFfqYnsA_ne z5;IUS#=)ObV}^-9ygXF#hgaskx!GS_uY-A%7xDtZYrMY&pBY!vR$4=QJMmVzojRz? zfmegwf$yAMfE%$Rv;y0LZ~YtaO_XWocY@On&Kgi$ze)6!l?|w|4fhtvxS2N5Yy~ba zh7EIyTQ}Xv-eJW!=t1w>qwF!#~W(ZGhFHZ$dy@)fq4#gwv$RaV5>n{k0 zvFONxqt?dCGR;ur(GqTubY8HO3Oih09f%r{k?)pQM@C+%R(bYaSBxUt8N>kKJ-+N$ z88PfAUhW$}l!fEL(t|PaP`T^UaQ^UW_?E#}jfR)}o%)1pGl_u>cDitg$I{t{DygrMw8+jT03!8l2>MPou|kZ2j<5cU_Cs(@aDsL8O|@Q z%DGB3UndIHa*cweZQx^!Ms9fPaMU$hqvQJs4tMGyJOSG`$_q8TE(OEa zp2h_hlPIj(QJel@Bx znlq9wRp!$j>pm|BW3CoZ8f+)?lZVHCf61D~JZ(s(Mm)Y3uGsYk!nzXjCIF~IlW5b8F=UO%3qxQ#>Tk@GYIc?+JD z2Bh^k_Tv205tdx^;xVg=8 z=yQbdEDc?L@=BF>{Kwjg*t^o#eKE3wb9{o zWVx+;e+$oie>6s=ZK^nLf-M`K3?fds60bix&Nt)xx<+H`UL2`noa*2ukL@D-n~$&l zjc98Lu=!|rKKk4U*+SrpK`nvi0_ZchNBB#CF9e@88o+IU6}}eBIOQ{-AN5l5O#a9H a;Bos;zBZ}9Cwg_|e{#G3-Q0hP2>gE)^MFSH literal 0 HcmV?d00001 diff --git a/Plugins/Depra.Asset.dll.meta b/Plugins/Depra.Assets.dll.meta similarity index 93% rename from Plugins/Depra.Asset.dll.meta rename to Plugins/Depra.Assets.dll.meta index 55d760a..91521f5 100644 --- a/Plugins/Depra.Asset.dll.meta +++ b/Plugins/Depra.Assets.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94dc0d35dd433de4cbd96cd7e3c3f342 +guid: 77ba2cc553cbfdb44b728b7ed74e24e7 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/Depra.Asset.Unity.asmdef b/Runtime/Depra.Assets.Unity.asmdef similarity index 75% rename from Runtime/Depra.Asset.Unity.asmdef rename to Runtime/Depra.Assets.Unity.asmdef index b10813b..e2834ed 100644 --- a/Runtime/Depra.Asset.Unity.asmdef +++ b/Runtime/Depra.Assets.Unity.asmdef @@ -1,13 +1,13 @@ { - "name": "Depra.Asset.Unity", - "rootNamespace": "Depra.Asset", + "name": "Depra.Assets.Unity", + "rootNamespace": "Depra.Assets", "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "Depra.Asset.dll" + "Depra.Assets.dll" ], "autoReferenced": true, "defineConstraints": [], diff --git a/Runtime/Depra.Asset.Unity.asmdef.meta b/Runtime/Depra.Assets.Unity.asmdef.meta similarity index 100% rename from Runtime/Depra.Asset.Unity.asmdef.meta rename to Runtime/Depra.Assets.Unity.asmdef.meta diff --git a/Runtime/Exceptions/AssetCanNotBeLoaded.cs b/Runtime/Exceptions/AssetCanNotBeLoaded.cs index 6512e8b..579d207 100644 --- a/Runtime/Exceptions/AssetCanNotBeLoaded.cs +++ b/Runtime/Exceptions/AssetCanNotBeLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Asset.Exceptions +namespace Depra.Assets.Exceptions { internal sealed class AssetCanNotBeLoaded : Exception { diff --git a/Runtime/Exceptions/Guard.cs b/Runtime/Exceptions/Guard.cs index 75e492a..9962ada 100644 --- a/Runtime/Exceptions/Guard.cs +++ b/Runtime/Exceptions/Guard.cs @@ -6,7 +6,7 @@ using System.IO; using System.Runtime.CompilerServices; -namespace Depra.Asset.Exceptions +namespace Depra.Assets.Exceptions { internal static class Guard { diff --git a/Runtime/Extensions/DirectoryInfoExtensions.cs b/Runtime/Extensions/DirectoryInfoExtensions.cs index 9c4a262..41fff61 100644 --- a/Runtime/Extensions/DirectoryInfoExtensions.cs +++ b/Runtime/Extensions/DirectoryInfoExtensions.cs @@ -4,7 +4,7 @@ using System.IO; using System.Runtime.CompilerServices; -namespace Depra.Asset.Extensions +namespace Depra.Assets.Extensions { public static class DirectoryInfoExtensions { diff --git a/Runtime/Extensions/StringExtensions.cs b/Runtime/Extensions/StringExtensions.cs index e7d42c6..f4c01af 100644 --- a/Runtime/Extensions/StringExtensions.cs +++ b/Runtime/Extensions/StringExtensions.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; -namespace Depra.Asset.Extensions +namespace Depra.Assets.Extensions { public static class StringExtensions { diff --git a/Runtime/Extensions/TaskExtensions.cs b/Runtime/Extensions/TaskExtensions.cs index 7a09818..d722cd0 100644 --- a/Runtime/Extensions/TaskExtensions.cs +++ b/Runtime/Extensions/TaskExtensions.cs @@ -6,7 +6,7 @@ using System.Runtime.ExceptionServices; using System.Threading.Tasks; -namespace Depra.Asset.Extensions +namespace Depra.Assets.Extensions { internal static class TaskExtensions { diff --git a/Runtime/Files.Database/AssetCatNotBeCreated.cs b/Runtime/Files.Database/AssetCatNotBeCreated.cs index fe11608..ff16e3b 100644 --- a/Runtime/Files.Database/AssetCatNotBeCreated.cs +++ b/Runtime/Files.Database/AssetCatNotBeCreated.cs @@ -4,7 +4,7 @@ using System; using System.Reflection; -namespace Depra.Asset.Files.Database +namespace Depra.Assets.Files.Database { internal sealed class AssetCatNotBeCreated : Exception { diff --git a/Runtime/Files.Database/DatabaseAssetUri.cs b/Runtime/Files.Database/DatabaseAssetUri.cs index ef634f5..d4742fc 100644 --- a/Runtime/Files.Database/DatabaseAssetUri.cs +++ b/Runtime/Files.Database/DatabaseAssetUri.cs @@ -2,9 +2,9 @@ // © 2023-2024 Nikolay Melnikov using System.IO; -using Depra.Asset.ValueObjects; +using Depra.Assets.ValueObjects; -namespace Depra.Asset.Files.Database +namespace Depra.Assets.Files.Database { public sealed record DatabaseAssetUri : IAssetUri { diff --git a/Runtime/Files.Database/RuntimeDatabaseAsset.cs b/Runtime/Files.Database/RuntimeDatabaseAsset.cs index 8cd85d1..839fea1 100644 --- a/Runtime/Files.Database/RuntimeDatabaseAsset.cs +++ b/Runtime/Files.Database/RuntimeDatabaseAsset.cs @@ -5,12 +5,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.ValueObjects; +using Depra.Assets.Delegates; +using Depra.Assets.Exceptions; +using Depra.Assets.ValueObjects; using UnityEngine; -namespace Depra.Asset.Files.Database +namespace Depra.Assets.Files.Database { public sealed class RuntimeDatabaseAsset : IAssetFile, IDisposable where TAsset : ScriptableObject { diff --git a/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs b/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs index a1a0b0e..a49d031 100644 --- a/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs +++ b/Runtime/Files.Resource/Exceptions/PathDoesNotContainResourcesFolder.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Asset.Files.Resource.Exceptions +namespace Depra.Assets.Files.Resource.Exceptions { internal sealed class PathDoesNotContainResourcesFolder : Exception { diff --git a/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs b/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs index 0f7d6e0..e9cfe92 100644 --- a/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs +++ b/Runtime/Files.Resource/Exceptions/ResourceNotLoaded.cs @@ -3,7 +3,7 @@ using System; -namespace Depra.Asset.Files.Resource.Exceptions +namespace Depra.Assets.Files.Resource.Exceptions { internal sealed class ResourceNotLoaded : Exception { diff --git a/Runtime/Files.Resource/ResourceRequestExtensions.cs b/Runtime/Files.Resource/ResourceRequestExtensions.cs index 0f5e628..ad1177c 100644 --- a/Runtime/Files.Resource/ResourceRequestExtensions.cs +++ b/Runtime/Files.Resource/ResourceRequestExtensions.cs @@ -7,7 +7,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Asset.Files.Resource +namespace Depra.Assets.Files.Resource { internal static class ResourceRequestExtensions { diff --git a/Runtime/Files.Resource/ResourcesAsset.cs b/Runtime/Files.Resource/ResourcesAsset.cs index 98ae7e6..d030781 100644 --- a/Runtime/Files.Resource/ResourcesAsset.cs +++ b/Runtime/Files.Resource/ResourcesAsset.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Depra.Asset.Delegates; -using Depra.Asset.Exceptions; -using Depra.Asset.Files.Resource.Exceptions; -using Depra.Asset.ValueObjects; +using Depra.Assets.Delegates; +using Depra.Assets.Exceptions; +using Depra.Assets.Files.Resource.Exceptions; +using Depra.Assets.ValueObjects; using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Asset.Files.Resource +namespace Depra.Assets.Files.Resource { public sealed class ResourcesAsset : IAssetFile, IDisposable where TAsset : Object { diff --git a/Runtime/Files.Resource/ResourcesPath.cs b/Runtime/Files.Resource/ResourcesPath.cs index f7f933d..0c4dc78 100644 --- a/Runtime/Files.Resource/ResourcesPath.cs +++ b/Runtime/Files.Resource/ResourcesPath.cs @@ -3,13 +3,13 @@ using System; using System.IO; -using Depra.Asset.Exceptions; -using Depra.Asset.Extensions; -using Depra.Asset.Files.Resource.Exceptions; -using Depra.Asset.ValueObjects; -using static Depra.Asset.Internal.UnityProject; +using Depra.Assets.Exceptions; +using Depra.Assets.Extensions; +using Depra.Assets.Files.Resource.Exceptions; +using Depra.Assets.ValueObjects; +using static Depra.Assets.Internal.UnityProject; -namespace Depra.Asset.Files.Resource +namespace Depra.Assets.Files.Resource { public sealed record ResourcesPath : IAssetUri { diff --git a/Runtime/Files.Resource/ResourcesReference.cs b/Runtime/Files.Resource/ResourcesReference.cs index f491767..35c7eed 100644 --- a/Runtime/Files.Resource/ResourcesReference.cs +++ b/Runtime/Files.Resource/ResourcesReference.cs @@ -5,7 +5,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Depra.Asset.Files.Resource +namespace Depra.Assets.Files.Resource { [Serializable] public sealed class ResourcesReference : ResourcesReference where TAsset : Object { } diff --git a/Runtime/Files/UnityFileSize.cs b/Runtime/Files/UnityFileSize.cs index 4392197..bcf5714 100644 --- a/Runtime/Files/UnityFileSize.cs +++ b/Runtime/Files/UnityFileSize.cs @@ -2,13 +2,13 @@ // © 2023-2024 Nikolay Melnikov using System.Runtime.CompilerServices; -using Depra.Asset.ValueObjects; +using Depra.Assets.ValueObjects; using UnityEngine; using UnityEngine.Profiling; -namespace Depra.Asset.Files +namespace Depra.Assets.Files { - internal static class UnityFileSize + public static class UnityFileSize { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static FileSize FromProfiler(Object asset) => new(Profiler.GetRuntimeMemorySizeLong(asset)); diff --git a/Runtime/Internal/AssetTypes.cs b/Runtime/Internal/AssetTypes.cs index d77736f..5a4e8a9 100644 --- a/Runtime/Internal/AssetTypes.cs +++ b/Runtime/Internal/AssetTypes.cs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -namespace Depra.Asset.Internal +namespace Depra.Assets.Internal { public static class AssetTypes { diff --git a/Runtime/Internal/Module.cs b/Runtime/Internal/Module.cs index fc8e513..a66ea6e 100644 --- a/Runtime/Internal/Module.cs +++ b/Runtime/Internal/Module.cs @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 // © 2023-2024 Nikolay Melnikov -namespace Depra.Asset.Internal +namespace Depra.Assets.Internal { internal static class Module { - public const string MODULE_NAME = nameof(Asset); + public const string MODULE_NAME = nameof(Assets); public const string FRAMEWORK_NAME = nameof(Depra); internal const int DEFAULT_ORDER = 52; diff --git a/Runtime/Internal/UnityProject.cs b/Runtime/Internal/UnityProject.cs index 64923d9..3dec944 100644 --- a/Runtime/Internal/UnityProject.cs +++ b/Runtime/Internal/UnityProject.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Depra.Asset.Internal +namespace Depra.Assets.Internal { public static class UnityProject { diff --git a/Runtime/Properties/AssemblyInfo.cs b/Runtime/Properties/AssemblyInfo.cs index dfb9f52..61b15ea 100644 --- a/Runtime/Properties/AssemblyInfo.cs +++ b/Runtime/Properties/AssemblyInfo.cs @@ -1,10 +1,12 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Depra.Asset.Editor")] -[assembly: InternalsVisibleTo("Depra.Asset.Bundle")] +[assembly: InternalsVisibleTo("Depra.Assets.Editor")] +[assembly: InternalsVisibleTo("Depra.Assets.Bundle")] -[assembly: InternalsVisibleTo("Depra.Asset.Tests.EditMode")] -[assembly: InternalsVisibleTo("Depra.Asset.Tests.PlayMode")] +[assembly: InternalsVisibleTo("Depra.Assets.Tests.EditMode")] +[assembly: InternalsVisibleTo("Depra.Assets.Tests.PlayMode")] -[assembly: InternalsVisibleTo("Depra.Asset.Addressable.Runtime")] -[assembly: InternalsVisibleTo("Depra.Asset.Addressable.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("Depra.Assets.Addressable.Runtime")] +[assembly: InternalsVisibleTo("Depra.Assets.Addressable.Tests")] + +[assembly: InternalsVisibleTo("Depra.Assets.Bundle")] \ No newline at end of file diff --git a/package.json b/package.json index 9bba113..28cf734 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "com.depra.asset.unity", - "version": "0.2.8-pre.4", - "displayName": "Depra.Asset", + "name": "com.depra.assets.unity", + "version": "0.2.8-pre.5", + "displayName": "Depra.Assets", "description": "Provides an API for loading Unity asset files in multiple ways through a single interface.", "unity": "2021.3", "license": "Apache-2.0", "keywords": [ "unity", - "asset", + "assets", "editor", "runtime", "resources" @@ -19,6 +19,6 @@ }, "repository": { "type": "git", - "url": "https://github.com/Depra-Inc/Asset.Unity.git" + "url": "https://github.com/Depra-Inc/Assets.Unity.git" } } \ No newline at end of file From 893f52fc0df5d0376727c60b0766d0acd6964810 Mon Sep 17 00:00:00 2001 From: godzzz Date: Fri, 12 Jul 2024 21:15:02 +0400 Subject: [PATCH 6/6] Readmes updated --- Docs/README.RU.md | 4 ++-- Docs/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Docs/README.RU.md b/Docs/README.RU.md index 7cc559a..7d3be17 100644 --- a/Docs/README.RU.md +++ b/Docs/README.RU.md @@ -92,7 +92,7 @@ - `IAssetFile`: Определяет основные методы и свойства, необходимые для загрузки и выгрузки ассетов. Он расширяет функциональность интерфейса `IAssetFile`, представленного - в [Depra.Assets](https://github.com/Depra-Inc/Asset), и предоставляет возможность выполнения как синхронной, так и + в [Depra.Assets](https://github.com/Depra-Inc/Assets), и предоставляет возможность выполнения как синхронной, так и асинхронной загрузки ассетов, а также проверки состояния загрузки. Вы можете создать свои реализации этих интерфейсов или использовать уже готовые, представленные в таблице: @@ -160,7 +160,7 @@ preloadedAsset.Unload(); ## 🖇️ Зависимости -- [Depra.Assets](https://github.com/Depra-Inc/Asset) - базовая библиотека для работы с ассетами ( +- [Depra.Assets](https://github.com/Depra-Inc/Assets) - базовая библиотека для работы с ассетами ( поставляется вместе с этим **UPM** пакетом). ## 🤝 Сотрудничество diff --git a/Docs/README.md b/Docs/README.md index 11c5597..289c57a 100644 --- a/Docs/README.md +++ b/Docs/README.md @@ -92,7 +92,7 @@ Add the following line to `Packages/manifest.json` in the `dependencies` section - `IAssetFile`: Defines the fundamental methods and properties required for loading and unloading assets. It extends the functionality of the `IAssetFile` interface presented - in [Depra.Asset](https://github.com/Depra-Inc/Asset) and offers the ability to perform both synchronous and + in [Depra.Assets](https://github.com/Depra-Inc/Assets) and offers the ability to perform both synchronous and asynchronous asset loading, as well as checking the loading state. You can create your own implementations of these interfaces or use ready-made ones presented in the table: @@ -160,7 +160,7 @@ preloadedAsset.Unload(); ## 🖇 Dependencies -- [Depra.Asset](https://github.com/Depra-Inc/Assets.git) - the base library for working with assets (provided +- [Depra.Assets](https://github.com/Depra-Inc/Assets.git) - the base library for working with assets (provided with this **UPM** package). ## 🤝 Collaboration