Texture support is now compatible with glTF texture maps

src/ifcopenshell-python/test/api/geometry/test_remove_representation.py

@@ -62,12 +62,14 @@ class TestRemoveRepresentation(test.bootstrap.IFC4):
         assert self.file.by_type("IfcShapeRepresentation")[0].RepresentationType != "MappedRepresentation"
         assert len(self.file.by_type("IfcRepresentationMap")) == 1
 
-    def test_purging_styled_items(self):
+    def test_purging_styled_items_assignments_but_keeping_the_surface_style(self):
         item = self.file.createIfcExtrudedAreaSolid()
         representation = self.file.createIfcShapeRepresentation(Items=[item])
-        styled_item = self.file.createIfcStyledItem(Item=item)
+        surface_style = self.file.createIfcSurfaceStyle()
+        styled_item = self.file.createIfcStyledItem(Item=item, Styles=[surface_style])
         ifcopenshell.api.run("geometry.remove_representation", self.file, representation=representation)
         assert len(self.file.by_type("IfcStyledItem")) == 0
+        assert len(self.file.by_type("IfcSurfaceStyle")) == 1
 
     def test_not_purging_styled_items_if_used_elsewhere(self):
         item = self.file.createIfcExtrudedAreaSolid()
@@ -97,3 +99,28 @@ class TestRemoveRepresentation(test.bootstrap.IFC4):
         representation = self.file.createIfcShapeRepresentation(ContextOfItems=context)
         ifcopenshell.api.run("geometry.remove_representation", self.file, representation=representation)
         assert len(self.file.by_type("IfcGeometricRepresentationContext")) == 1
+
+    def test_purging_texture_coordinates(self):
+        item = self.file.createIfcTriangulatedFaceSet()
+        representation = self.file.createIfcShapeRepresentation(Items=[item])
+        image = self.file.createIfcImageTexture()
+        texture = self.file.createIfcIndexedTriangleTextureMap(
+            TexCoords=self.file.createIfcTextureVertexList(), MappedTo=item, Maps=[image]
+        )
+        ifcopenshell.api.run("geometry.remove_representation", self.file, representation=representation)
+        assert len(self.file.by_type("IfcIndexedTriangleTextureMap")) == 0
+        assert len(self.file.by_type("IfcTextureVertexList")) == 0
+        assert len(self.file.by_type("IfcImageTexture")) == 0
+
+    def test_purging_texture_coordinates_but_not_images_used_in_other_styles(self):
+        item = self.file.createIfcTriangulatedFaceSet()
+        representation = self.file.createIfcShapeRepresentation(Items=[item])
+        image = self.file.createIfcImageTexture()
+        texture = self.file.createIfcIndexedTriangleTextureMap(
+            TexCoords=self.file.createIfcTextureVertexList(), MappedTo=item, Maps=[image]
+        )
+        texture2 = self.file.createIfcIndexedTriangleTextureMap(Maps=[image])
+        ifcopenshell.api.run("geometry.remove_representation", self.file, representation=representation)
+        assert len(self.file.by_type("IfcIndexedTriangleTextureMap")) == 1
+        assert len(self.file.by_type("IfcTextureVertexList")) == 0
+        assert len(self.file.by_type("IfcImageTexture")) == 1

src/ifcopenshell-python/test/api/style/test_remove_style.py

@@ -0,0 +1,36 @@
+# IfcOpenShell - IFC toolkit and geometry engine
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of IfcOpenShell.
+#
+# IfcOpenShell is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# IfcOpenShell is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
+
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+
+class TestRemoveStyle(test.bootstrap.IFC4):
+    def test_removing_a_style(self):
+        shading = self.file.createIfcSurfaceStyleShading()
+        style = self.file.createIfcSurfaceStyle(Styles=[shading])
+        ifcopenshell.api.run("style.remove_style", self.file, style=style)
+        assert len(list(self.file)) == 0
+
+    def test_removing_any_styled_items_referencing_the_style(self):
+        shading = self.file.createIfcSurfaceStyleShading()
+        style = self.file.createIfcSurfaceStyle(Styles=[shading])
+        styled_item = self.file.createIfcStyledItem(Styles=[style])
+        ifcopenshell.api.run("style.remove_style", self.file, style=style)
+        assert len(list(self.file)) == 0

src/ifcopenshell-python/test/api/style/test_remove_surface_style.py

@@ -0,0 +1,41 @@
+# IfcOpenShell - IFC toolkit and geometry engine
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of IfcOpenShell.
+#
+# IfcOpenShell is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# IfcOpenShell is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
+
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+
+
+class TestRemoveSurfaceStyle(test.bootstrap.IFC4):
+    def test_removing_a_shading_style(self):
+        style = self.file.createIfcSurfaceStyleShading(SurfaceColour=self.file.createIfcColourRgb())
+        ifcopenshell.api.run("style.remove_surface_style", self.file, style=style)
+        assert len(list(self.file)) == 0
+
+    def test_removing_a_texture_style(self):
+        texture = self.file.createIfcImageTexture()
+        style = self.file.createIfcSurfaceStyleWithTextures(Textures=[texture])
+        ifcopenshell.api.run("style.remove_surface_style", self.file, style=style)
+        assert len(list(self.file)) == 0
+
+    def test_removing_a_texture_style_with_all_of_its_coordinates(self):
+        texture = self.file.createIfcImageTexture()
+        coordinates = self.file.createIfcTextureCoordinateGenerator(Maps=[texture])
+        style = self.file.createIfcSurfaceStyleWithTextures(Textures=[texture])
+        ifcopenshell.api.run("style.remove_surface_style", self.file, style=style)
+        assert len(list(self.file)) == 0

src/ifcopenshell-python/test/util/test_element.py

@@ -432,7 +432,7 @@ class TestRemoveDeep2IFC4(test.bootstrap.IFC4):
         assert self.file.by_id(1)
         assert self.file.by_guid("id2")
 
-    def test_removing_an_element_still_referenced_somewhere(self):
+    def test_not_removing_an_element_still_referenced_somewhere(self):
         owner = self.file.createIfcOwnerHistory()
         element = self.file.createIfcWall(GlobalId="id1", OwnerHistory=owner)
         subject.remove_deep2(self.file, owner)