Merge pull request #1211 from uki-dev/fix-gltf-coordinate-system

fix incorrect coordinate system of glTF exports

Author: jmwright

cadquery/occ_impl/assembly.py

@@ -83,6 +83,10 @@ class AssemblyProtocol(Protocol):
     def loc(self) -> Location:
         ...
 
+    @loc.setter
+    def loc(self, value: Location) -> None:
+        ...
+
     @property
     def name(self) -> str:
         ...

cadquery/occ_impl/exporters/assembly.py

@@ -24,6 +24,7 @@
 from OCP.Interface import Interface_Static
 
 from ..assembly import AssemblyProtocol, toCAF, toVTK
+from ..geom import Location
 
 
 def exportAssembly(assy: AssemblyProtocol, path: str, **kwargs) -> bool:
@@ -161,6 +162,11 @@ def exportGLTF(
     Export an assembly to a gltf file.
     """
 
+    # map from CadQuery's right-handed +Z up coordinate system to glTF's right-handed +Y up coordinate system
+    # https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#coordinate-system-and-units
+    orig_loc = assy.loc
+    assy.loc *= Location((0, 0, 0), (1, 0, 0), -90)
+
     # mesh all the shapes
     for _, el in assy.traverse():
         for s in el.shapes:
@@ -169,6 +175,11 @@ def exportGLTF(
     _, doc = toCAF(assy, True)
 
     writer = RWGltf_CafWriter(TCollection_AsciiString(path), binary)
-    return writer.Perform(
+    result = writer.Perform(
         doc, TColStd_IndexedDataMapOfStringString(), Message_ProgressRange()
     )
+
+    # restore coordinate system after exporting
+    assy.loc = orig_loc
+
+    return result