take edge vertices from trim so they're in order

Author: chenkasirer

src/compas_rhino/geometry/brep/edge.py

@@ -38,16 +38,18 @@ def __init__(self, rhino_edge=None):
         super(RhinoBrepEdge, self).__init__()
         self._edge = None
         self._curve = None
-        self._start_vertex = None
-        self._end_vertex = None
+        self.start_vertex = None
+        self.end_vertex = None
         if rhino_edge:
             self._set_edge(rhino_edge)
 
     def _set_edge(self, native_edge):
+        print("creating Edge object. nativ:{}".format(native_edge))
         self._edge = native_edge
         self._curve = self._edge.EdgeCurve
-        self._start_vertex = RhinoBrepVertex(self._edge.StartVertex)
-        self._end_vertex = RhinoBrepVertex(self._edge.EndVertex)
+        # print("creating Edge object. StartVertex:{} EndVertex:{}".format(self._edge.StartVertex.Location, self._edge.EndVertex.Location))
+        # self._curve_start = RhinoBrepVertex(self._edge.StartVertex)
+        # self._curve_end = RhinoBrepVertex(self._edge.EndVertex)
 
     # ==============================================================================
     # Data
@@ -70,7 +72,7 @@ def data(self):
         return {
             "type": type_,
             "value": curve.data,
-            "points": [self._start_vertex.point.data, self._end_vertex.point.data],
+            "points": [self.start_vertex.point.data, self.end_vertex.point.data],
         }
 
     @data.setter
@@ -89,9 +91,9 @@ def data(self, value):
         else:
             self._curve = RhinoNurbsCurve.from_data(value["value"]).rhino_curve
 
-        self._start_vertex, self._end_vertex = RhinoBrepVertex(), RhinoBrepVertex()
-        self._start_vertex._point = Point.from_data(value["points"][0])
-        self._end_vertex._point = Point.from_data(value["points"][1])
+        self.start_vertex, self.end_vertex = RhinoBrepVertex(), RhinoBrepVertex()
+        self.start_vertex._point = Point.from_data(value["points"][0])
+        self.end_vertex._point = Point.from_data(value["points"][1])
 
     # ==============================================================================
     # Properties
@@ -101,17 +103,17 @@ def data(self, value):
     def curve(self):
         return self._curve
 
-    @property
-    def start_vertex(self):
-        return self._start_vertex
-
-    @property
-    def end_vertex(self):
-        return self._end_vertex
+    # @property
+    # def start_vertex(self):
+    #     return self._start_vertex
+    #
+    # @property
+    # def end_vertex(self):
+    #     return self._end_vertex
 
     @property
     def vertices(self):
-        return [self._start_vertex, self._end_vertex]
+        return [self.start_vertex, self.end_vertex]
 
     @property
     def is_circle(self):

src/compas_rhino/geometry/brep/face.py

@@ -103,18 +103,18 @@ def is_plane(self):
 
     @staticmethod
     def _get_surface_geometry(surface):
-        # success, cast_surface = surface.TryGetPlane()
-        # if success:
-        #     return "plane", plane_to_compas(cast_surface)
-        # success, cast_surface = surface.TryGetSphere()
-        # if success:
-        #     return "sphere", sphere_to_compas(cast_surface)
-        # success, cast_surface = surface.TryGetCylinder()
-        # if success:
-        #     return "cylinder", cylinder_to_compas(cast_surface)
-        # success, cast_surface = surface.TryGetTorus()
-        # if success:
-        #     raise NotImplementedError("Support for torus surface is not yet implemented!")
+        success, cast_surface = surface.TryGetPlane()
+        if success:
+            return "plane", plane_to_compas(cast_surface)
+        success, cast_surface = surface.TryGetSphere()
+        if success:
+            return "sphere", sphere_to_compas(cast_surface)
+        success, cast_surface = surface.TryGetCylinder()
+        if success:
+            return "cylinder", cylinder_to_compas(cast_surface)
+        success, cast_surface = surface.TryGetTorus()
+        if success:
+            raise NotImplementedError("Support for torus surface is not yet implemented!")
         return "nurbs", RhinoNurbsSurface.from_rhino(surface.ToNurbsSurface())
 
     # @staticmethod
@@ -130,9 +130,10 @@ def _get_surface_geometry(surface):
     @staticmethod
     def _make_surface_from_plane_loop(plane, loop):
         # TODO: replace guesswork here with an actual calculation..
-        c0 = loop.edges[0].start_point
-        c1 = loop.edges[1].start_point
-        c2 = loop.edges[2].start_point
-        c3 = loop.edges[3].start_point
-        surface = RhinoNurbsSurface.from_corners([c3, c2, c1, c0])
+        c0 = loop.edges[0].start_vertex._point
+        c1 = loop.edges[1].start_vertex._point
+        c2 = loop.edges[2].start_vertex._point
+        c3 = loop.edges[3].start_vertex._point
+        # flipped order flips the normal of the resulting surface!
+        surface = RhinoNurbsSurface.from_corners([c0, c1, c2, c3])
         return surface

src/compas_rhino/geometry/brep/loop.py

@@ -1,8 +1,10 @@
 from compas.geometry import BrepLoop
+from compas_rhino.conversions import point_to_compas
 
 import Rhino
 
 from .edge import RhinoBrepEdge
+from .vertex import RhinoBrepVertex
 
 
 class LoopType(object):
@@ -54,7 +56,12 @@ def __init__(self, rhino_loop=None):
     def _set_loop(self, native_loop):
         self._loop = native_loop
         self._type = int(self._loop.LoopType)
-        self._edges = [RhinoBrepEdge(t.Edge) for t in self._loop.Trims]
+        self._edges = []
+        for trim in self._loop.Trims:
+            edge = RhinoBrepEdge(trim.Edge)
+            edge.start_vertex = RhinoBrepVertex(trim.StartVertex)
+            edge.end_vertex = RhinoBrepVertex(trim.EndVertex)
+            self._edges.append(edge)
 
     # ==============================================================================
     # Data