Merge pull request #7 from Brian-Jiang/v1.0.1

v1.0.1
Brian-Jiang · May 10, 2024 · f763b38 · f763b38
2 parents 7d98dff + f555775
commit f763b38
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/Runtime/Loaders/ResourcesLoader.cs b/Runtime/Loaders/ResourcesLoader.cs
@@ -5,12 +5,25 @@
 namespace SmartReference.Runtime {
     public class ResourcesLoader: ISmartReferenceLoader {
         public Object Load(string path, Type type) {
-            return Resources.Load(path, type);
+            var resourcesPath = GetResourcesPath(path);
+            return Resources.Load(resourcesPath, type);
         }
 
         public void LoadAsync(string path, Type type, Action<Object> callback) {
-            var request = Resources.LoadAsync(path, type);
+            var resourcesPath = GetResourcesPath(path);
+            var request = Resources.LoadAsync(resourcesPath, type);
             request.completed += _ => callback?.Invoke(request.asset);
         }
+
+        private string GetResourcesPath(string path) {
+            var index = path.LastIndexOf("Resources/", StringComparison.Ordinal);
+            if (index == -1) {
+                Debug.LogError($"[SmartReference] ResourcesLoader: Path {path} is not in Resources folder");
+                return path;
+            }
+
+            var extensionIndex = path.LastIndexOf(".", StringComparison.Ordinal);
+            return path[(index + "Resources/".Length)..extensionIndex];
+        }
     }
 }