update examples

Author: tomvanmele

docs/examples/brep_from_booleans.py

@@ -1,10 +1,10 @@
 from compas.geometry import Point, Vector, Plane
-from compas.geometry import Box
-from compas.geometry import Cylinder
+from compas.geometry import Polyline
+from compas.geometry import Box, Cylinder
 from compas_occ.brep import BRep
-
 from compas_view2.app import App
 
+
 R = 1.4
 P = Point(0, 0, 0)
 X = Vector(1, 0, 0)
@@ -25,6 +25,15 @@
 B3 = BRep.from_cylinder(cz)
 C = BRep.from_boolean_difference(A, BRep.from_boolean_union(BRep.from_boolean_union(B1, B2), B3))
 
+# ==============================================================================
+# Visualisation
+# ==============================================================================
+
+# Currently, the viewer does not suppport BRep shapes.
+# Therefore we have to convert the components of the BRep to something the viewer does understand.
+
+mesh = C.to_tesselation()
+
 lines = []
 circles = []
 ellipses = []
@@ -33,27 +42,26 @@
     if edge.is_line:
         lines.append(edge.to_line())
     elif edge.is_circle:
-        circles.append(edge.to_circle())
+        circles.append(Polyline(edge.curve.locus()))
     elif edge.is_ellipse:
-        ellipses.append(edge.to_ellipse())
+        ellipses.append(Polyline(edge.curve.locus()))
     else:
         raise NotImplementedError
 
-# ==============================================================================
-# Visualisation
-# ==============================================================================
-
-viewer = App()
+viewer = App(viewmode='ghosted', width=1600, height=900)
+viewer.view.camera.rz = -30
+viewer.view.camera.rx = -75
+viewer.view.camera.distance = 7
 
-viewer.add(C.to_tesselation(), show_edges=False)
+viewer.add(mesh, show_edges=False)
 
 for line in lines:
     viewer.add(line, linewidth=2)
 
 for circle in circles:
-    viewer.add(circle, linewidth=2, u=64)
+    viewer.add(circle, linewidth=2)
 
 for ellipse in ellipses:
-    viewer.add(ellipse, linewidth=2, u=64)
+    viewer.add(ellipse, linewidth=2)
 
 viewer.run()

docs/examples/brep_from_corners.py

@@ -2,6 +2,7 @@
 from compas_occ.brep import BRep
 from compas_view2.app import App
 
+
 brep3 = BRep.from_corners(Point(0, 0, 0), Point(1, 1, 1), Point(0, 1, 0))
 brep4 = BRep.from_corners(Point(0, 2, 0), Point(1, 2, 0), Point(1, 3, 1), Point(0, 3, 0))
 

docs/examples/brep_from_mesh.py

@@ -1,9 +1,11 @@
 import compas
 from compas.geometry import Vector, Translation, Scale
+from compas.geometry import Polyline
 from compas.datastructures import Mesh
 from compas_occ.brep import BRep
 from compas_view2.app import App
 
+
 mesh = Mesh.from_obj(compas.get('tubemesh.obj'))
 
 centroid = mesh.centroid()
@@ -18,8 +20,20 @@
 mesh.transform(S * T)
 
 brep = BRep.from_mesh(mesh)
-tess = brep.to_tesselation()
 
-viewer = App()
-viewer.add(tess)
+lines = []
+curves = []
+
+for edge in brep.edges:
+    if edge.is_line:
+        lines.append(edge.to_line())
+    elif edge.is_bspline:
+        curves.append(Polyline(edge.curve.locus()))
+
+viewer = App(viewmode='ghosted')
+viewer.add(brep.to_tesselation(), show_edges=False)
+
+for curve in curves:
+    viewer.add(curve, linewidth=2)
+
 viewer.run()

docs/examples/curve_closest_parameters_curve.py

@@ -1,8 +1,9 @@
-from compas.geometry import Point, Polyline
-from compas.geometry import NurbsCurve
-
+from compas.geometry import Point
+from compas.geometry import Polyline
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 
+
 points0 = [Point(0, 0, 0), Point(3, 6, 0), Point(6, -3, 3), Point(10, 0, 0)]
 curve0 = NurbsCurve.from_points(points0)
 
@@ -11,13 +12,8 @@
 
 parameters, distance = curve0.closest_parameters_curve(curve1, return_distance=True)
 
-print(parameters)
-print(distance)
-
 points = curve0.closest_points_curve(curve1, return_distance=False)
 
-print(points)
-
 # ==============================================================================
 # Visualisation
 # ==============================================================================

docs/examples/curve_closest_point.py

@@ -1,8 +1,9 @@
-from compas.geometry import Point, Polyline
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas.geometry import Point
+from compas.geometry import Polyline
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 
+
 points = [Point(0, 0, 0), Point(3, 0, 2), Point(6, 0, -3), Point(8, 0, 0)]
 curve = NurbsCurve.from_interpolation(points)
 

docs/examples/curve_comparison1.py

@@ -1,9 +1,9 @@
-from compas.geometry import Point, Polyline
-from compas.geometry import Bezier
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas.geometry import Point
+from compas.geometry import Polyline, Bezier
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 
+
 points = [Point(0, 0, 0), Point(1, 3, 0), Point(2, 0, 0)]
 bezier = Bezier(points)
 

docs/examples/curve_comparison2.py

@@ -1,9 +1,9 @@
-from compas.geometry import Point, Polyline
-from compas.geometry import Bezier
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas.geometry import Point
+from compas.geometry import Polyline, Bezier
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 
+
 points = [Point(0, 0, 0), Point(1, 2, 0), Point(2, -2, 0), Point(3, 0, 0)]
 bezier = Bezier(points)
 

docs/examples/curve_from_circle.py

@@ -1,13 +1,13 @@
-from compas.geometry import Vector, Point, Polyline, Circle, Plane
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas.geometry import Vector, Point, Plane
+from compas.geometry import Polyline
+from compas.geometry import Circle
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 
+
 circle = Circle(Plane(Point(0, 0, 0), Vector(0, 0, 1)), 1.0)
 curve = NurbsCurve.from_circle(circle)
 
-print(curve)
-
 # ==============================================================================
 # Visualisation
 # ==============================================================================

docs/examples/curve_from_ellipse.py

@@ -1,15 +1,15 @@
-from compas.geometry import Vector, Point, Line, Polyline, Ellipse, Plane
+from compas.geometry import Vector, Point, Plane
+from compas.geometry import Line, Polyline
+from compas.geometry import Ellipse
 from compas.utilities import pairwise
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 from compas_view2.objects import Collection
 
+
 ellipse = Ellipse(Plane(Point(0, 0, 0), Vector(0, 0, 1)), 2.0, 1.0)
 curve = NurbsCurve.from_ellipse(ellipse)
 
-print(curve)
-
 # ==============================================================================
 # Visualisation
 # ==============================================================================

docs/examples/curve_from_interpolation.py

@@ -1,17 +1,16 @@
-from compas.geometry import Point, Polyline, Bezier
-from compas_occ.geometry import OCCNurbsCurve as NurbsCurve
-
+from compas.geometry import Point
+from compas.geometry import Polyline, Bezier
+from compas_occ.geometry import NurbsCurve
 from compas_view2.app import App
 from compas_view2.objects import Collection
 
+
 points = [Point(0, 0, 0), Point(3, 6, 0), Point(6, -3, 3), Point(10, 0, 0)]
 bezier = Bezier(points)
 points = bezier.locus(10)
 
 curve = NurbsCurve.from_interpolation(points)
 
-print(curve)
-
 # ==============================================================================
 # Visualisation
 # ==============================================================================
@@ -21,6 +20,4 @@
 view.add(Polyline(curve.locus()), linewidth=3)
 view.add(Collection(points))
 
-# view.add(Polyline(curve.points), show_points=True, pointsize=20, pointcolor=(1, 0, 0), linewidth=1, linecolor=(0.3, 0.3, 0.3))
-
 view.run()