change _content.extensions to _content.extensions_used

Author: romanarust

src/compas/files/gltf/gltf_content.py

@@ -59,6 +59,7 @@ def __init__(self):
         self.images = {}
         self.extras = None
         self.extensions = None
+        self.extensions_used = None
 
     @property
     def default_or_first_scene(self):

src/compas/files/gltf/gltf_exporter.py

@@ -89,7 +89,9 @@ def load(self):
         None
 
         """
+        print(self._content.textures)
         self._content.remove_orphans()
+        print(self._content.textures)
         self._content.check_if_forest()
 
         self._set_initial_gltf_dict()
@@ -179,10 +181,10 @@ def _add_extensions_recursively(self, item):
                     self._add_extensions_recursively(getattr(item, a))
         if item.extensions is not None:
             for ek, e in item.extensions.items():
-                if self._content.extensions is None:
-                    self._content.extensions = []
-                if ek not in self._content.extensions:
-                    self._content.extensions.append(ek)
+                if self._content.extensions_used is None:  # attention: self._content.extension exists if we have general extensions.
+                    self._content.extensions_used = []
+                if ek not in self._content.extensions_used:
+                    self._content.extensions_used.append(ek)
                 self._add_extensions_recursively(e)
 
     def _add_images(self):
@@ -209,10 +211,10 @@ def _construct_image_data_uri(self, image_data):
         return "data:" + (image_data.mime_type if image_data.mime_type else "") + ";base64," + base64.b64encode(image_data.data).decode("ascii")
 
     def _add_extensions(self):
-        if not self._content.extensions:
+        if not self._content.extensions_used:
             return
-        self._gltf_dict["extensionsRequired"] = self._content.extensions
-        self._gltf_dict["extensionsUsed"] = self._content.extensions
+        self._gltf_dict["extensionsRequired"] = self._content.extensions_used
+        self._gltf_dict["extensionsUsed"] = self._content.extensions_used
 
     def _add_samplers(self):
         if not self._content.samplers:

tests/compas/files/test_gltf.py

@@ -145,16 +145,15 @@ def test_specglossmetalrough(specglossmetalrough_gltf):
     gltf.read()
     exporter = gltf.exporter
     json.dumps(exporter._gltf_dict)
-    assert exporter._content.extensions == ["KHR_materials_pbrSpecularGlossiness"]
+    assert exporter._content.extensions_used == ["KHR_materials_pbrSpecularGlossiness"]
 
 
 def test_specular(specular_gltf):
     gltf = GLTF(specular_gltf)
     gltf.read()
     exporter = gltf.exporter
     json.dumps(exporter._gltf_dict)
-    assert exporter._content.extensions == ["KHR_materials_specular"]
-    print(exporter._content.extensions)
+    assert exporter._content.extensions_used == ["KHR_materials_specular"]
 
 
 def test_gltf_content():