Merge pull request #321 from AlpenAalAlex/simple_walker

Fix simple_walker's sensor rotation, fix relative paths under Windows
dfki-ric · Sep 21, 2023 · 221b6b3 · 221b6b3
2 parents c7bc799 + 850e75e
commit 221b6b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/models/simple_walker_finished.blend b/models/simple_walker_finished.blend
diff --git a/phobos/io/representation.py b/phobos/io/representation.py
@@ -257,7 +257,7 @@ def __init__(self, name=None, filepath=None, posix_path=None, image=None, **kwar
             self.image = image
             self.input_type = "img"
             if BPY_AVAILABLE and isinstance(image, bpy.types.Image):
-                self.input_file = os.path.normpath(bpy.path.abspath(misc.sys_path(image.filepath)))
+                self.input_file = os.path.normpath(misc.sys_path(bpy.path.abspath(image.filepath)))
                 self.input_type = "img_bpy"
                 if self.unique_name is None:
                     self.unique_name, ext = os.path.splitext(image.name)

diff --git a/phobos/utils/misc.py b/phobos/utils/misc.py
@@ -38,7 +38,10 @@ def sys_path(path):
     if path is None:
         return path
     if platform.system() == "Windows":
-        return path.replace("/", "\\")
+        if path.startswith("//"): # Handles Blender's relative paths
+            return "//" + path[2:].replace("/", "\\")
+        else:
+            return path.replace("/", "\\")
     else:
         return path.replace("\\", "/")