Add: sync methods to IResourceProvider

nuskey8 · nuskey8 · commit 2163ef812d03 · 2024-08-27T21:43:24.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/Content/AddressablesResourceProvider.cs b/src/NavStack/Assets/NavStack/Runtime/Content/AddressablesResourceProvider.cs
@@ -7,6 +7,17 @@ namespace NavStack.Content
 {
     internal sealed class AddressablesResourceProvider : IResourceProvider
     {
+        public T Load<T>(string key) where T : UnityEngine.Object
+        {
+            var result = Addressables.LoadAssetAsync<T>(key).WaitForCompletion();
+            return result;
+        }
+
+        public void Unload<T>(T obj) where T : UnityEngine.Object
+        {
+            Addressables.Release(obj);
+        }
+
         public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default)
             where T : UnityEngine.Object
         {
diff --git a/src/NavStack/Assets/NavStack/Runtime/Content/IResourceProvider.cs b/src/NavStack/Assets/NavStack/Runtime/Content/IResourceProvider.cs
@@ -5,6 +5,8 @@ namespace NavStack.Content
 {
     public interface IResourceProvider
     {
+        T Load<T>(string key) where T : UnityEngine.Object;
+        void Unload<T>(T obj) where T : UnityEngine.Object;
         UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default) where T : UnityEngine.Object;
         UniTask UnloadAsync<T>(T obj, CancellationToken cancellationToken = default) where T : UnityEngine.Object;
     }
diff --git a/src/NavStack/Assets/NavStack/Runtime/Content/ResourcesResourceProvider.cs b/src/NavStack/Assets/NavStack/Runtime/Content/ResourcesResourceProvider.cs
@@ -7,6 +7,13 @@ namespace NavStack.Content
 {
     internal sealed class ResourcesResourceProvider : IResourceProvider
     {
+        public T Load<T>(string key) where T : UnityEngine.Object
+        {
+            var resource = Resources.Load(key);
+            if (resource is not T result) throw new Exception(); // TODO:
+            return result;
+        }
+
         public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default)
             where T : UnityEngine.Object
         {
@@ -16,6 +23,11 @@ public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationT
             return result;
         }
 
+        public void Unload<T>(T obj) where T : UnityEngine.Object
+        {
+            // not supported
+        }
+
         public UniTask UnloadAsync<T>(T obj, CancellationToken cancellationToken = default)
             where T : UnityEngine.Object
         {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,17 @@ namespace NavStack.Content`
`7`	`7`	`{`
`8`	`8`	`internal sealed class AddressablesResourceProvider : IResourceProvider`
`9`	`9`	`{`
	`10`	`+ public T Load<T>(string key) where T : UnityEngine.Object`
	`11`	`+ {`
	`12`	`+ var result = Addressables.LoadAssetAsync<T>(key).WaitForCompletion();`
	`13`	`+ return result;`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ public void Unload<T>(T obj) where T : UnityEngine.Object`
	`17`	`+ {`
	`18`	`+ Addressables.Release(obj);`
	`19`	`+ }`
	`20`	`+`
`10`	`21`	`public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default)`
`11`	`22`	`where T : UnityEngine.Object`
`12`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ namespace NavStack.Content`
`5`	`5`	`{`
`6`	`6`	`public interface IResourceProvider`
`7`	`7`	`{`
	`8`	`+ T Load<T>(string key) where T : UnityEngine.Object;`
	`9`	`+ void Unload<T>(T obj) where T : UnityEngine.Object;`
`8`	`10`	`UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default) where T : UnityEngine.Object;`
`9`	`11`	`UniTask UnloadAsync<T>(T obj, CancellationToken cancellationToken = default) where T : UnityEngine.Object;`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,13 @@ namespace NavStack.Content`
`7`	`7`	`{`
`8`	`8`	`internal sealed class ResourcesResourceProvider : IResourceProvider`
`9`	`9`	`{`
	`10`	`+ public T Load<T>(string key) where T : UnityEngine.Object`
	`11`	`+ {`
	`12`	`+ var resource = Resources.Load(key);`
	`13`	`+ if (resource is not T result) throw new Exception(); // TODO:`
	`14`	`+ return result;`
	`15`	`+ }`
	`16`	`+`
`10`	`17`	`public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationToken = default)`
`11`	`18`	`where T : UnityEngine.Object`
`12`	`19`	`{`
`@@ -16,6 +23,11 @@ public async UniTask<T> LoadAsync<T>(string key, CancellationToken cancellationT`
`16`	`23`	`return result;`
`17`	`24`	`}`
`18`	`25`
	`26`	`+ public void Unload<T>(T obj) where T : UnityEngine.Object`
	`27`	`+ {`
	`28`	`+ // not supported`
	`29`	`+ }`
	`30`	`+`
`19`	`31`	`public UniTask UnloadAsync<T>(T obj, CancellationToken cancellationToken = default)`
`20`	`32`	`where T : UnityEngine.Object`
`21`	`33`	`{`