small updates and fixes for the mcneel workshop

Author: tomvanmele

CHANGELOG.md

@@ -9,8 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `compas_rhino.geometry.RhinoCurve.offset`.
+* Added `compas.geometry.Surface.from_plane`.
+* Added `compas.geometry.surfaces.surface.new_surface_from_plane` pluggable.
+* Added `compas_rhino.geometry.surfaces.new_surface_from_plane` plugin.
+* Added `compas_rhino.geometry.RhinoSurface.intersections_with_curve`.
+
 ### Changed
 
+* Fixed bug in `compas_rhino.geometry.RhinoCurve.frame_at`.
+* Changed implementation of `compas.datastructures.mesh_planarize_faces` to include edge midpoints.
+
 ### Removed
 
 

src/compas/datastructures/halfedge/halfedge.py

@@ -712,7 +712,7 @@ def vertices_where_predicate(self, predicate, data=False):
         ----------
         predicate : callable
             The condition you want to evaluate.
-            The callable takes 2 parameters: the vertex identifier and the vertex attributs,
+            The callable takes 2 parameters: the vertex identifier and the vertex attributes,
             and should return True or False.
         data : bool, optional
             If True, yield the vertex attributes in addition to the vertex identifiers.

src/compas/datastructures/mesh/planarisation.py

@@ -4,11 +4,13 @@
 
 from compas.geometry import project_points_plane
 from compas.geometry import centroid_points
+from compas.geometry import midpoint_point_point
 from compas.geometry import distance_point_point
 from compas.geometry import distance_line_line
 from compas.geometry import bestfit_plane
 
 from compas.utilities import window
+from compas.utilities import pairwise
 
 
 __all__ = [
@@ -98,7 +100,10 @@ def mesh_planarize_faces(mesh, fixed=None, kmax=100, callback=None, callback_arg
         for fkey in mesh.faces():
             vertices = mesh.face_vertices(fkey)
             points = [mesh.vertex_coordinates(key) for key in vertices]
-            plane = bestfit_plane(points)
+            midpoints = []
+            for a, b in pairwise(points + points[:1]):
+                midpoints.append(midpoint_point_point(a, b))
+            plane = bestfit_plane(points + midpoints)
             projections = project_points_plane(points, plane)
 
             for index, key in enumerate(vertices):

src/compas/geometry/surfaces/surface.py

@@ -14,6 +14,11 @@ def new_surface(cls, *args, **kwargs):
     raise NotImplementedError
 
 
+@pluggable(category="factories")
+def new_surface_from_plane(cls, *args, **kwargs):
+    raise NotImplementedError
+
+
 class Surface(Geometry):
     """Class representing a general surface object.
 
@@ -107,6 +112,22 @@ def from_obj(cls, filepath):
         """
         raise NotImplementedError
 
+    @classmethod
+    def from_plane(cls, plane, *args, **kwargs):
+        """Construct a surface from a plane.
+
+        Parameters
+        ----------
+        plane : :class:`compas.geometry.Plane`
+            The plane.
+
+        Returns
+        -------
+        :class:`~compas.geometry.Surface`
+
+        """
+        return new_surface_from_plane(cls, plane, *args, **kwargs)
+
     # ==============================================================================
     # Conversions
     # ==============================================================================
@@ -393,3 +414,17 @@ def intersections_with_line(self, line):
 
         """
         raise NotImplementedError
+
+    def intersections_with_curve(self, curve):
+        """Compute the intersections with a curve.
+
+        Parameters
+        ----------
+        line : :class:`~compas.geometry.Curve`
+
+        Returns
+        -------
+        list[:class:`~compas.geometry.Point`]
+
+        """
+        raise NotImplementedError

src/compas_rhino/geometry/curves/curve.py

@@ -3,12 +3,14 @@
 from __future__ import division
 
 from compas.geometry import Curve
+from compas.geometry import Plane
 
 from compas_rhino.conversions import point_to_rhino
 from compas_rhino.conversions import point_to_compas
 from compas_rhino.conversions import vector_to_compas
 from compas_rhino.conversions import xform_to_rhino
 from compas_rhino.conversions import plane_to_compas_frame
+from compas_rhino.conversions import plane_to_rhino
 from compas_rhino.conversions import box_to_compas
 
 
@@ -227,7 +229,7 @@ def frame_at(self, t):
             The corresponding local frame.
 
         """
-        plane = self.rhino_curve.FrameAt(t)
+        t, plane = self.rhino_curve.FrameAt(t)
         return plane_to_compas_frame(plane)
 
     def torsion_at(self, t):
@@ -346,3 +348,36 @@ def length(self, precision=1e-8):
 
         """
         return self.rhino_curve.GetLength(precision)
+
+    def fair(self, tol=1e-3):
+        raise NotImplementedError
+
+    def offset(self, distance, direction, tolerance=1e-3):
+        """Compute the length of the curve.
+
+        Parameters
+        ----------
+        distance : float
+            The offset distance.
+        direction : :class:`compas.geometry.Vector`
+            The normal direction of the offset plane.
+        tolerance : float, optional
+
+        Returns
+        -------
+        None
+
+        """
+        point = self.point_at(self.domain[0])
+        plane = Plane(point, direction)
+        plane = plane_to_rhino(plane)
+        self.rhino_curve = self.rhino_curve.Offset(plane, distance, tolerance, 0)[0]
+
+    def smooth(self):
+        raise NotImplementedError
+
+    def split(self):
+        raise NotImplementedError
+
+    def trim(self):
+        raise NotImplementedError

src/compas_rhino/geometry/surfaces/__init__.py

@@ -11,6 +11,11 @@ def new_surface(cls, *args, **kwargs):
     return super(Surface, cls).__new__(cls)
 
 
+@plugin(category="factories", requires=["Rhino"])
+def new_surface_from_plane(cls, *args, **kwargs):
+    return RhinoSurface.from_plane(*args, **kwargs)
+
+
 @plugin(category="factories", requires=["Rhino"])
 def new_nurbssurface(cls, *args, **kwargs):
     return super(NurbsSurface, cls).__new__(cls)

src/compas_rhino/geometry/surfaces/surface.py

@@ -8,6 +8,7 @@
 from compas_rhino.conversions import point_to_compas
 from compas_rhino.conversions import vector_to_compas
 from compas_rhino.conversions import plane_to_compas_frame
+from compas_rhino.conversions import plane_to_rhino
 from compas_rhino.conversions import box_to_compas
 from compas_rhino.conversions import xform_to_rhino
 from compas_rhino.conversions import sphere_to_rhino
@@ -167,6 +168,25 @@ def from_rhino(cls, rhino_surface):
         curve.rhino_surface = rhino_surface
         return curve
 
+    @classmethod
+    def from_plane(cls, plane, box):
+        """Construct a surface from a plane.
+
+        Parameters
+        ----------
+        plane : :class:`compas.geometry.Plane`
+            The plane.
+
+        Returns
+        -------
+        :class:`~compas_rhino.geometry.RhinoSurface`
+
+        """
+        plane = plane_to_rhino(plane)
+        box = Rhino.Geometry.BoundingBox(box.xmin, box.ymin, box.zmin, box.xmax, box.ymax, box.zmax)
+        rhino_surface = Rhino.Geometry.PlaneSurface.CreateThroughBox(plane, box)
+        return cls.from_rhino(rhino_surface)
+
     # ==============================================================================
     # Conversions
     # ==============================================================================
@@ -337,3 +357,25 @@ def aabb(self, precision=0.0, optimal=False):
         """
         box = self.rhino_surface.GetBoundingBox(optimal)
         return box_to_compas(Rhino.Geometry.Box(box))
+
+    def intersections_with_curve(self, curve, tolerance=1e-3, overlap=1e-3):
+        """Compute the intersections with a curve.
+
+        Parameters
+        ----------
+        line : :class:`~compas.geometry.Curve`
+
+        Returns
+        -------
+        list[:class:`~compas.geometry.Point`]
+
+        """
+        intersections = Rhino.Geometry.Intersect.Intersection.CurveSurface(
+            curve.rhino_curve, self.rhino_surface, tolerance, overlap
+        )
+        points = []
+        for event in intersections:
+            if event.IsPoint:
+                point = point_to_compas(event.PointA)
+                points.append(point)
+        return points