WIP

pablode · Jul 13, 2024 · d8776d9 · d8776d9
1 parent 464ee74
commit d8776d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/libguc/src/cgltf_util.cpp b/src/libguc/src/cgltf_util.cpp
@@ -68,11 +68,14 @@ namespace detail
   {
     TF_DEBUG(GUC).Msg("reading file %s\n", path);
 
+    ArResolver& resolver = ArGetResolver();
+    std::string identifier = resolver.CreateIdentifier(path);
+//if (strlen(path)>1 && path[0]=='.' && path[1]=='/') path += 2;
     // ArResolver fails to resolve paths with prefix "./" - we remove it.
-    fs::path relativePath = fs::relative(path);
+    //fs::path parentPath = fs::path(path).parent_path();
+    //fs::path relativePath = fs::relative(path, path);
 
-    ArResolver& resolver = ArGetResolver();
-    ArResolvedPath resolvedPath = resolver.Resolve(relativePath.string());
+    ArResolvedPath resolvedPath = resolver.Resolve(identifier);
     if (!resolvedPath)
     {
       TF_RUNTIME_ERROR("unable to resolve %s", path);

diff --git a/src/libguc/src/image.cpp b/src/libguc/src/image.cpp
@@ -115,11 +115,14 @@ namespace detail
   {
     TF_DEBUG(GUC).Msg("reading image %s\n", path);
 
+//if (strlen(path)>1 && path[0]=='.' && path[1]=='/') path += 2;
     // ArResolver fails to resolve paths with prefix "./" - we remove it.
-    fs::path relativePath = fs::relative(path);
-
+    //fs::path parentPath = fs::path(path).parent_path();
+    //fs::path relativePath = fs::path(path);//fs::relative(path, path);
     ArResolver& resolver = ArGetResolver();
-    ArResolvedPath resolvedPath = resolver.Resolve(relativePath.string());
+    std::string identifier = resolver.CreateIdentifier(path);
+
+    ArResolvedPath resolvedPath = resolver.Resolve(identifier);
     if (!resolvedPath)
     {
       TF_RUNTIME_ERROR("unable to resolve %s", path);