BlockResearchGroup · tomvanmele · Jan 17, 2025 · Jan 7, 2025 · Jan 8, 2025 · Jan 8, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,39 +9,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* Added a base `BlockModel`.
 * Added reference to model `Element.model` to `Element`.
 * Added `Element.modelgeometry` as the cached geometry of an element in model coordinates, taking into account the modifying effect of interactions with other elements.
 * Added `Element.modeltransformation` as the cached transformation from element to model coordinates.
 * Added `Element.compute_elementgeometry()`.
 * Added `Element.compute_modelgeometry()` to replace `Element.compute_geometry()`.
 * Added `Element.compute_modeltransformation()` to replace `Element.compute_worldtransformation()`.
-* Added `compas_model.elements.ColumnHeadElement`.
-* Added `compas_model.elements.ColumnHeadCrossElement`.
-* Added `compas_model.elements.BeamFeature`.
-* Added `compas_model.elements.BeamElement`.
-* Added `compas_model.elements.BeamIProfileElement`.
-* Added `compas_model.elements.BeamSquareElement`.
-* Added `compas_model.elements.ColumnFeature`.
-* Added `compas_model.elements.ColumnElement`.
-* Added `compas_model.elements.ColumnRoundElement`.
-* Added `compas_model.elements.ColumnSquareElement`.
-* Added `compas_model.elements.FastenersFeature`.
-* Added `compas_model.elements.FastenersElement`.
-* Added `compas_model.elements.ScrewElement`.
 * Added `Element.is_dirty`.
+* Added `compas_model.geometry.minkowski_sum_xy` to compute the Minkowski sum A + B of two convex polygons in the XY plane.
+* Added `compas_model.geometry.minkowski_difference_xy` as a convenience method to compute A + -B.
+* Added `compas_model.geometry.is_collision_poly_poly_xy` to check for collisions between convex polygons in the XY plane.
+* Added `compas_model.geometry.intersection_ray_triangle`.
+* Added `compas_model.geometry.intersections_line_aabb`.
+* Added `compas_model.geometry.intersections_line_box`.
+* Added `compas_model.geometry.intersections_ray_aabb`.
+* Added `compas_model.geometry.intersections_ray_box`.
+* Added `compas_model.geometry.is_intersection_box_box`.
+* Added `compas_model.geometry.is_intersection_line_aabb`.
+* Added `compas_model.geometry.is_intersection_line_box`.
+* Added `compas_model.geometry.is_intersection_ray_aabb`.
+* Added `compas_model.geometry.is_intersection_ray_box`.
+* Added `compas_model.geometry.is_intersection_segment_aabb`.
+* Added `compas_model.geometry.is_intersection_segment_box`.
+* Added `compas_model.geometry.pca_box` for fast OBB calculation.
+* Added `compas_model.algorithms.mesh_mesh_contacts`.
+* Added `compas_model.datastructures.BVH` extending the base compas tree data structure into a bounding volume hierarchy.
+* Added `compas_model.datastructures.AABBNode` representing a node of the BVH using an axis-aligned bounding box.
+* Added `compas_model.datastructures.OBBNode` representing a node of the BVH using an oriented bounding box.
+* Added `compas_model.datastructures.KDTree` for nearest neighbour search among elements.
+* Added `compas_model.models.bvh.ElementBVH`.
+* Added `compas_model.models.bvh.ElementAABBNode`.
+* Added `compas_model.models.bvh.ElementOBBNode`.
 
 ### Changed
 
 * Changed `Element.graph_node` to `Element.graphnode`.
 * Changed `Element.tree_node` to `Element.treenode`.
-* Changed `blockmodel_interfaces` to use the bestfit frame shared by two aligned interfaces instead of the frame of first face of the pair.
-* Changed notebook.scene `__all__` is moved to notebook folder for building documentation.
 
 ### Removed
 
 * Removed model reference `ElementTree.model` from `ElementTree`.
 * Removed `InterfaceElement` from elements.
+* Removed `BlockModel`.
+* Removed `BlockElement`.
+* Removed `model_interfaces`.
+* Removed `model_overlaps`.
 
 
 ## [0.4.5] 2024-12-11
@@ -124,7 +136,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas_model.materials.Material`.
 * Added `compas_model.materials.Concrete`.
 * Added `compas_model.materials.Timber` (stub imlementation).
-* Added `compas_model.interactions.ContactInterface` based on `compas_assembly.datastructures.Interface`.
+* Added `compas_model.interactions.ContactInteraction` based on `compas_assembly.datastructures.Interface`.
 * Added `compas_model.algorithms.blockmodel_interfaces` for interface detection of "block models".
 * Added `compas_model.elements.block.BlockGeometry` based on `compas_assembly.datastructures.Block`.
 * Added `compas_model.analysis.cra_penalty_solve` as wrapper for `compas_cra.equilibrium.cra_penalty_solve`.

diff --git a/docs/_images/bvh_aabb_intersections.png b/docs/_images/bvh_aabb_intersections.png
diff --git a/docs/_images/bvh_obb_intersections.png b/docs/_images/bvh_obb_intersections.png
diff --git a/docs/api.rst b/docs/api.rst
@@ -7,7 +7,9 @@ API Reference
     :maxdepth: 1
     :titlesonly:
 
+    api/compas_model.algorithms
     api/compas_model.elements
+    api/compas_model.geometry
     api/compas_model.interactions
     api/compas_model.materials
     api/compas_model.models

diff --git a/docs/api/compas_model.algorithms.rst b/docs/api/compas_model.algorithms.rst
@@ -0,0 +1,14 @@
+********************************************************************************
+compas_model.algorithms
+********************************************************************************
+
+.. currentmodule:: compas_model.algorithms
+
+Functions
+=========
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    mesh_mesh_contacts
diff --git a/docs/api/compas_model.datastructures.rst b/docs/api/compas_model.datastructures.rst
@@ -0,0 +1,17 @@
+********************************************************************************
+compas_model.datastructures
+********************************************************************************
+
+.. currentmodule:: compas_model.datastructures
+
+Classes
+=======
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    AABBNode
+    BVH
+    KDTree
+    OBBNode
diff --git a/docs/api/compas_model.elements.rst b/docs/api/compas_model.elements.rst
@@ -11,8 +11,5 @@ Classes
     :toctree: generated/
     :nosignatures:
 
-    BlockElement
-    BlockFeature
-    BlockGeometry
     Element
     Feature
diff --git a/docs/api/compas_model.geometry.rst b/docs/api/compas_model.geometry.rst
@@ -0,0 +1,24 @@
+********************************************************************************
+compas_model.geometry
+********************************************************************************
+
+.. currentmodule:: compas_model.geometry
+
+Functions
+=========
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    is_collision_poly_poly_xy
+    is_intersection_box_box
+    is_intersection_line_aabb
+    is_intersection_line_box
+    is_intersection_ray_aabb
+    is_intersection_ray_box
+    is_intersection_segment_aabb
+    is_intersection_segment_box
+    minkowski_difference_xy
+    minkowski_sum_xy
+    pca_box
diff --git a/docs/api/compas_model.interactions.rst b/docs/api/compas_model.interactions.rst
@@ -4,23 +4,12 @@ compas_model.interactions
 
 .. currentmodule:: compas_model.interactions
 
-This module provides classes for defining the type of interaction that exists between two elements.
-The interaction type could determine, for example, how forces are transferred from one element to the other.
-The interaction type could also determine whether an interaction is permanent or temporary;
-for example, for designing construction sequences.
-The different types of interactions will have to be interpreted by the context in which the model is used.
-
-Interactions do not define the geometry of a joint or interface, but rather how the elements are connected.
-In the case of a wood joint, for example, an interaction could define whether the joinery is dry, glued, or mechanical,
-and what the properties of this connection are.
-
-
 Classes
 =======
 
 .. autosummary::
     :toctree: generated/
     :nosignatures:
 
-    Interaction
-    ContactInterface
+    Contact
+    Modifier
diff --git a/docs/api/compas_model.materials.rst b/docs/api/compas_model.materials.rst
@@ -13,4 +13,5 @@ Classes
 
     Material
     Concrete
+    Steel
     Timber
diff --git a/docs/api/compas_model.models.rst b/docs/api/compas_model.models.rst
@@ -15,4 +15,3 @@ Classes
     ElementTree
     InteractionGraph
     Model
-    BlockModel
diff --git a/docs/api/compas_model.notebook.rst b/docs/api/compas_model.notebook.rst
@@ -11,5 +11,4 @@ Classes
     :toctree: generated/
     :nosignatures:
 
-    ThreeBlockObject
     ThreeModelObject
diff --git a/docs/api/compas_model.scene.rst b/docs/api/compas_model.scene.rst
@@ -12,5 +12,4 @@ Classes
     :nosignatures:
 
     ElementObject
-    BlockObject
     ModelObject
diff --git a/docs/conf.py b/docs/conf.py
@@ -148,7 +148,7 @@ def setup(app):
     "doc_path": "docs",
 }
 
-html_static_path = sphinx_compas2_theme.get_html_static_path() + ["_static"]
+html_static_path = sphinx_compas2_theme.get_html_static_path()
 html_css_files = []
 html_extra_path = []
 html_last_updated_fmt = ""

diff --git a/docs/examples.rst b/docs/examples.rst
@@ -2,21 +2,8 @@
 Examples
 ********************************************************************************
 
-Discrete Element Models
-=======================
-
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 3
    :titlesonly:
-   :glob:
-
-   examples/dem/*
-
 
-Timber Assemblies
-=================
-
-.. toctree::
-   :maxdepth: 1
-   :titlesonly:
-   :glob:
+   examples/algos/index
diff --git a/docs/examples/__temp/element.py b/docs/examples/__temp/element.py
diff --git a/docs/examples/__temp/elements_beam.py b/docs/examples/__temp/elements_beam.py
diff --git a/docs/examples/__temp/elements_beam.rst b/docs/examples/__temp/elements_beam.rst
diff --git a/docs/examples/__temp/elements_block.py b/docs/examples/__temp/elements_block.py
diff --git a/docs/examples/__temp/elements_block.rst b/docs/examples/__temp/elements_block.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,5 @@ Classes @@
         Material
         Concrete
+        Steel
         Timber