FIX simplification of elements and examples.

Author: petrasvestartas

data/frame.json

@@ -1 +1 @@
-{"Model::Line::Segments": [{"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, -3000.0, 0.0], "end": [-3000.0, -3000.0, 3800.0]}, "guid": "2fc7fca3-cf83-44a8-9338-31917268590b"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, 3000.0, 0.0], "end": [-3000.0, 3000.0, 3800.0]}, "guid": "aa520fb7-ff92-43da-b8c1-6a77754650f1"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, 3000.0, 0.0], "end": [3000.0, 3000.0, 3800.0]}, "guid": "29a4ef5b-edf0-4bd6-95f5-20b864c49908"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, -3000.0, 0.0], "end": [3000.0, -3000.0, 3800.0]}, "guid": "2263ec71-b010-499c-9614-3424307e6602"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, -3000.0, 3800.0], "end": [-3000.0, 3000.0, 3800.0]}, "guid": "0ecd6ac6-1853-485b-8b50-3f07c7ec207d"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, 3000.0, 3800.0], "end": [3000.0, -3000.0, 3800.0]}, "guid": "008c3470-f42b-4184-a2d3-6c0c5416f901"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, 3000.0, 3800.0], "end": [3000.0, 3000.0, 3800.0]}, "guid": "94af457f-3386-4fb7-9f8f-24d05eed86d2"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, -3000.0, 3800.0], "end": [-3000.0, -3000.0, 3800.0]}, "guid": "7c7014f7-d93c-4b17-a2d8-f8ff41f95a80"}], "Model::Mesh::Floor": [{"dtype": "compas.datastructures/Mesh", "data": {"attributes": {}, "default_vertex_attributes": {"x": 0.0, "y": 0.0, "z": 0.0}, "default_edge_attributes": {}, "default_face_attributes": {}, "vertex": {"0": {"x": -3000.0, "y": -3000.0, "z": 3800.0}, "1": {"x": -3000.0, "y": 3000.0, "z": 3800.0}, "2": {"x": 3000.0, "y": 3000.0, "z": 3800.0}, "3": {"x": 3000.0, "y": -3000.0, "z": 3800.0}}, "face": {"0": [0, 1, 2, 3]}, "facedata": {"0": {}}, "edgedata": {}, "max_vertex": 3, "max_face": 0}, "guid": "82f752d5-cf71-41e6-9aa0-742e41eddc14"}]}
+{"Model::Line::Segments": [{"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, -3000.0, 0.0], "end": [-3000.0, -3000.0, 3800.0]}, "guid": "5554c158-460a-45ed-9eef-217ecd7a5708"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, 3000.0, 0.0], "end": [-3000.0, 3000.0, 3800.0]}, "guid": "f457ba83-864d-4e64-9282-a24b3f5251b5"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, 3000.0, 0.0], "end": [3000.0, 3000.0, 3800.0]}, "guid": "aa9195e3-5738-43d1-a12d-561c7632c0bf"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, -3000.0, 0.0], "end": [3000.0, -3000.0, 3800.0]}, "guid": "a3154c66-a35d-4fb6-870c-9bc3377364be"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, -3000.0, 3800.0], "end": [-3000.0, 3000.0, 3800.0]}, "guid": "6581d8db-73d0-434f-a58d-a4a48e904768"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, 3000.0, 3800.0], "end": [3000.0, -3000.0, 3800.0]}, "guid": "08445beb-b6e9-478d-b481-10062a72f3fd"}, {"dtype": "compas.geometry/Line", "data": {"start": [-3000.0, 3000.0, 3800.0], "end": [3000.0, 3000.0, 3800.0]}, "guid": "95e3539f-d5fe-4df4-8a3b-e1a9a57c7aea"}, {"dtype": "compas.geometry/Line", "data": {"start": [3000.0, -3000.0, 3800.0], "end": [-3000.0, -3000.0, 3800.0]}, "guid": "f556a3d0-2b8d-44a8-8951-040443228075"}], "Model::Mesh::Floor": [{"dtype": "compas.datastructures/Mesh", "data": {"attributes": {}, "default_vertex_attributes": {"x": 0.0, "y": 0.0, "z": 0.0}, "default_edge_attributes": {}, "default_face_attributes": {}, "vertex": {"0": {"x": -3000.0, "y": -3000.0, "z": 3800.0}, "1": {"x": -3000.0, "y": 3000.0, "z": 3800.0}, "2": {"x": 3000.0, "y": 3000.0, "z": 3800.0}, "3": {"x": 3000.0, "y": -3000.0, "z": 3800.0}}, "face": {"0": [0, 1, 2, 3]}, "facedata": {"0": {}}, "edgedata": {}, "max_vertex": 3, "max_face": 0}, "guid": "787458c5-682f-4688-adfe-8478f99142c4"}]}

docs/examples/elements/beam.py

@@ -6,18 +6,17 @@
 from compas_viewer import Viewer
 
 # Create an element.
-beam: BeamElement = BeamElement(0.2, 0.3, 3)
-beam.copy()
+beam = BeamElement(0.2, 0.3, 3)
 
 # Element transformation can be set or modified as an attribute.
-beam.transformation = Rotation.from_axis_and_angle([0, 1, 0], 3.14/2, beam.axis.midpoint)
-beam.transformation = Translation.from_vector([0, 0, 1.5])* beam.transformation # Rotate then translate
+beam.transformation = Rotation.from_axis_and_angle([0, 1, 0], 3.14 / 2, beam.center_line.midpoint)
+beam.transformation = Translation.from_vector([0, 0, 1.5]) * beam.transformation  # Rotate then translate
 
 # But the transformation is applied when beam.modelgeometry is computed.
 model = Model()
 model.add_element(beam)
-mesh_in_element_space : Mesh = beam.elementgeometry
-mesh_in_model_space : Mesh = beam.modelgeometry
+mesh_in_element_space: Mesh = beam.elementgeometry
+mesh_in_model_space: Mesh = beam.modelgeometry
 
 # Vizualize.
 viewer = Viewer()

docs/examples/elements/column.py

@@ -4,10 +4,10 @@
 from compas_viewer import Viewer
 
 # Create an element.
-column: ColumnElement = ColumnElement(0.2, 0.2, 3)
+column = ColumnElement(0.2, 0.2, 3)
 
 # Element transformation can be set or modified as an attribute.
-vectors : list[list[float]] = [
+vectors: list[list[float]] = [
     [-3, -3, 0],
     [-3, 3, 0],
     [3, 3, 0],

docs/examples/elements/plate.py

@@ -3,16 +3,14 @@
 from compas_viewer import Viewer
 
 # Create an element.
-points : list[list[float]] = [
+points: list[list[float]] = [
     [-3, -3, 0],
     [-3, 3, 0],
     [3, 3, 0],
     [3, -3, 0],
-
 ]
-polygon : Polygon = Polygon(points)
-plate: PlateElement = PlateElement(polygon=polygon, thickness=0.2)
-plate.copy()
+polygon: Polygon = Polygon(points)
+plate = PlateElement(polygon=polygon, thickness=0.2)
 
 # Vizualize.
 viewer = Viewer()

docs/examples/interactions/000_boolean_modifier.py

@@ -7,12 +7,13 @@
 
 # Create an element.
 beam0: BeamElement = BeamElement(0.2, 0.3, 3, name="beam0")
-beam1 : BeamElement = beam0.copy()
+beam1: BeamElement = beam0.copy()
 beam1.name = "beam1"
 
 # Element transformation can be set or modified as an attribute.
-beam0.transformation = Rotation.from_axis_and_angle([0, 1, 0], 3.14/2, beam0.axis.midpoint)
-beam0.transformation = Translation.from_vector([0, 0, 1.5])* beam0.transformation # Rotate then translate
+R = Rotation.from_axis_and_angle([0, 1, 0], 3.14 / 2, beam0.center_line.midpoint)
+T = Translation.from_vector([0, 0, 1.5])
+beam0.transformation = T * R  # Rotate then translate
 
 # But the transformation is applied when beam.modelgeometry is computed.
 model = Model()

docs/examples/interactions/001_slicer_modifier.py

@@ -7,12 +7,13 @@
 
 # Create an element.
 beam0: BeamElement = BeamElement(0.2, 0.3, 3, name="beam0")
-beam1 : BeamElement = beam0.copy()
+beam1: BeamElement = beam0.copy()
 beam1.name = "beam1"
 
 # Element transformation can be set or modified as an attribute.
-beam0.transformation = Rotation.from_axis_and_angle([0, 1, 0], 3.14/2, beam0.axis.midpoint)
-beam0.transformation = Translation.from_vector([0, 0, 1.5])* beam0.transformation # Rotate then translate
+R = Rotation.from_axis_and_angle([0, 1, 0], 3.14 / 2, beam0.center_line.midpoint)
+T = Translation.from_vector([0, 0, 1.5])
+beam0.transformation = T * R  # Rotate then translate
 
 # But the transformation is applied when beam.modelgeometry is computed.
 model = Model()

docs/examples/interactions/002_frame.py

@@ -6,9 +6,9 @@
 from compas.geometry import Frame
 from compas.geometry import Line
 from compas.geometry import Point
+from compas.geometry import Transformation
 from compas.geometry import Translation
 from compas.geometry import Vector
-from compas.geometry.transformation import Transformation
 from compas.tolerance import TOL
 from compas_model.elements import BeamElement
 from compas_model.elements import ColumnElement
@@ -70,13 +70,13 @@
 beams = []
 for i in range(4, len(lines)):
     beam = BeamElement(width=300, depth=700, length=lines[i].length)
-    target_frame = Frame(
-        lines[i].start, Vector.Zaxis().cross(lines[i].vector), Vector.Zaxis()
-    )
-    beam.transformation = (
-        Transformation.from_frame_to_frame(Frame.worldXY(), target_frame)
-        * Translation.from_vector([0, beam.depth * -0.5, 0])
-    )
+    point = lines[i].start
+    xaxis = Vector.Zaxis().cross(lines[i].vector)
+    yaxis = Vector.Zaxis()
+    target_frame = Frame(point, xaxis, yaxis)
+    X = Transformation.from_frame_to_frame(Frame.worldXY(), target_frame)
+    T = Translation.from_vector([0, beam.depth * -0.5, 0])
+    beam.transformation = X * T
     beam.extend(150)
     model.add_element(beam)
     beams.append(beam)
@@ -90,8 +90,6 @@
 # =============================================================================
 # Visualize Final Model
 # =============================================================================
-TOL.lineardeflection = 100
-
 config = Config()
 config.camera.target = [0, 0, 100]
 config.camera.position = [10000, -10000, 10000]

src/compas_model/elements/beam.py

@@ -1,4 +1,5 @@
 from typing import Optional
+from typing import Type
 
 from compas.datastructures import Mesh
 from compas.geometry import Box
@@ -9,11 +10,8 @@
 from compas.geometry import Polygon
 from compas.geometry import Transformation
 from compas.geometry import Translation
-from compas.geometry import bounding_box
-from compas.geometry import identity_matrix
 from compas.geometry import intersection_line_plane
 from compas.geometry import is_point_in_polygon_xy
-from compas.geometry import oriented_bounding_box
 from compas_model.elements.element import Element
 from compas_model.elements.element import Feature
 from compas_model.interactions import BooleanModifier
@@ -51,26 +49,8 @@ class BeamElement(Element):
         The depth of the beam.
     length : float
         The length of the beam.
-    is_support : bool
-        Flag indicating if the beam is a support.
-    frame_bottom : :class:`compas.geometry.Frame`
-        Main frame of the beam.
-    frame_top : :class:`compas.geometry.Frame`
-        Second frame of the beam.
-    axis : :class:`compas.geometry.Line`
+    center_line : :class:`compas.geometry.Line`
         Line axis of the beam.
-    section : :class:`compas.geometry.Polygon`
-        Section polygon of the beam.
-    polygon_bottom : :class:`compas.geometry.Polygon`
-        The bottom polygon of the beam.
-    polygon_top : :class:`compas.geometry.Polygon`
-        The top polygon of the beam.
-    transformation : :class:`compas.geometry.Transformation`
-        Transformation applied to the beam.
-    features : list[:class:`compas_model.features.BeamFeature`]
-        Features of the beam.
-    name : str
-        The name of the beam.
     """
 
     @property
@@ -79,7 +59,6 @@ def __data__(self) -> dict:
             "width": self.width,
             "depth": self.depth,
             "length": self.length,
-            "is_support": self.is_support,
             "transformation": self.transformation,
             "features": self._features,
             "name": self.name,
@@ -90,26 +69,16 @@ def __init__(
         width: float = 0.1,
         depth: float = 0.2,
         length: float = 3.0,
-        is_support: bool = False,
         transformation: Optional[Transformation] = None,
         features: Optional[list[BeamFeature]] = None,
         name: Optional[str] = None,
     ) -> "BeamElement":
-        super().__init__(frame=Frame.worldXY(), transformation=transformation, features=features, name=name)
-
-        self.is_support: bool = is_support
+        super().__init__(transformation=transformation, features=features, name=name)
 
         self.width: float = width
         self.depth: float = depth
         self._length: float = length
 
-        self.points: list[list[float]] = [[-width * 0.5, -depth * 0.5, 0], [-width * 0.5, depth * 0.5, 0], [width * 0.5, depth * 0.5, 0], [width * 0.5, -depth * 0.5, 0]]
-
-        self.section: Polygon = Polygon(self.points)
-        self.axis: Line = Line([0, 0, 0], [0, 0, length])
-        self.frame_top: Frame = Frame(self.frame.point + self.axis.vector, self.frame.xaxis, self.frame.yaxis)
-        self.polygon_bottom, self.polygon_top = self.compute_top_and_bottom_polygons()
-
     def compute_elementgeometry(self) -> Mesh:
         """Compute the shape of the beam from the given polygons .
         This shape is relative to the frame of the element.
@@ -119,13 +88,7 @@ def compute_elementgeometry(self) -> Mesh:
         :class:`compas.datastructures.Mesh`
         """
         box: Box = Box.from_width_height_depth(self.width, self.length, self.depth)
-        box.translate(
-            [
-                0,
-                0,
-                self.length * 0.5,
-            ]
-        )
+        box.translate([0, 0, self.length * 0.5])
         return box.to_mesh()
 
     @property
@@ -135,12 +98,11 @@ def length(self) -> float:
     @length.setter
     def length(self, length: float):
         self._length = length
+        self.compute_elementgeometry()
 
-        self.section = Polygon(list(self.points))
-
-        self.axis = Line([0, 0, 0], [0, 0, length])
-        self.frame_top = Frame(self.frame.point + self.axis.vector, self.frame.xaxis, self.frame.yaxis)
-        self.polygon_bottom, self.polygon_top = self.compute_top_and_bottom_polygons()
+    @property
+    def center_line(self) -> Line:
+        return Line([0, 0, 0], [0, 0, self.length])
 
     def extend(self, distance: float) -> None:
         """Extend the beam.
@@ -167,11 +129,12 @@ def compute_aabb(self, inflate: float = 0.0) -> Box:
         :class:`compas.geometry.Box`
             The axis-aligned bounding box.
         """
-        points: list[list[float]] = self.geometry.vertices_attributes("xyz")  # type: ignore
-        box: Box = Box.from_bounding_box(bounding_box(points))
-        box.xsize += inflate
-        box.ysize += inflate
-        box.zsize += inflate
+        box = self.modelgeometry.aabb
+        if self.inflate_aabb and self.inflate_aabb != 1.0:
+            box.xsize += self.inflate_aabb
+            box.ysize += self.inflate_aabb
+            box.zsize += self.inflate_aabb
+        self._aabb = box
         return box
 
     def compute_obb(self, inflate: float = 0.0) -> Box:
@@ -187,11 +150,12 @@ def compute_obb(self, inflate: float = 0.0) -> Box:
         :class:`compas.geometry.Box`
             The oriented bounding box.
         """
-        points: list[list[float]] = self.geometry.vertices_attributes("xyz")  # type: ignore
-        box: Box = Box.from_bounding_box(oriented_bounding_box(points))
-        box.xsize += inflate
-        box.ysize += inflate
-        box.zsize += inflate
+        box = self.modelgeometry.obb
+        if self.inflate_aabb and self.inflate_aabb != 1.0:
+            box.xsize += self.inflate_obb
+            box.ysize += self.inflate_obb
+            box.zsize += self.inflate_obb
+        self._obb = box
         return box
 
     def compute_collision_mesh(self) -> Mesh:
@@ -202,25 +166,12 @@ def compute_collision_mesh(self) -> Mesh:
         :class:`compas.datastructures.Mesh`
             The collision mesh.
         """
-        from compas.geometry import convex_hull_numpy
-
-        points: list[list[float]] = self.geometry.vertices_attributes("xyz")  # type: ignore
-        vertices, faces = convex_hull_numpy(points)
-        vertices = [points[index] for index in vertices]  # type: ignore
-        return Mesh.from_vertices_and_faces(vertices, faces)
+        mesh = self.modelgeometry.convex_hull
+        self._collision_mesh = mesh
+        return mesh
 
     def compute_point(self) -> Point:
-        """Computes a reference point for the element geometry (e.g. the centroid).
-
-        Returns
-        -------
-        :class:`compas.geometry.Point`
-            The reference point.
-
-        """
-
-        xform: Transformation = identity_matrix if self.modeltransformation is None else self.modeltransformation
-        return self.frame.point.transformed(xform)
+        return Point(*self.modelgeometry.centroid())
 
     def compute_top_and_bottom_polygons(self) -> tuple[Polygon, Polygon]:
         """Compute the top and bottom polygons of the beam.
@@ -244,31 +195,31 @@ def compute_top_and_bottom_polygons(self) -> tuple[Polygon, Polygon]:
             points1.append(result1)
         return Polygon(points0), Polygon(points1)
 
-    def _add_modifier_with_beam(self, target_element: "BeamElement", modifier_type: type[Modifier] = None, **kwargs) -> Modifier:
+    def _add_modifier_with_beam(self, target_element: "BeamElement", modifier_type: Type[Modifier] = None, **kwargs) -> Modifier:
         if not modifier_type:
             raise ValueError("Modifier type is not defined, please define a modifier type e.g. SlicerModfier.")
 
-        if isinstance(modifier_type, type) and issubclass(modifier_type, BooleanModifier):
+        if issubclass(modifier_type, BooleanModifier):
             return BooleanModifier(self.elementgeometry.transformed(self.modeltransformation))
 
-        if isinstance(modifier_type, type) and issubclass(modifier_type, SlicerModifier):
+        if issubclass(modifier_type, SlicerModifier):
             return self._create_slicer_modifier(target_element)
 
         raise ValueError(f"Unknown modifier type: {modifier_type}")
 
     def _create_slicer_modifier(self, target_element: "BeamElement") -> Modifier:
         mesh = self.elementgeometry.transformed(self.modeltransformation)
-        axis = target_element.axis.transformed(target_element.modeltransformation)
+        center_line = target_element.center_line.transformed(target_element.modeltransformation)
 
-        p0 = axis.start
-        p1 = axis.end
+        p0 = center_line.start
+        p1 = center_line.end
 
         closest_distance_to_end_point = float("inf")
         closest_face = 0
         for face in self.elementgeometry.faces():
             polygon = mesh.face_polygon(face)
             frame = polygon.frame
-            result = intersection_line_plane(axis, Plane.from_frame(frame))
+            result = intersection_line_plane(center_line, Plane.from_frame(frame))
             if result:
                 point = Point(*result)
                 xform = Transformation.from_frame_to_frame(frame, Frame.worldXY())