Testing curve surface usage case

main.py

@@ -3,10 +3,13 @@ import networks.Curve as curve
 import networks.CurveSurface as CurveSurface
 import networks.Segment as segment
 import numpy as np
+import random
 
 editor = Editor(buffering=True)
 
-y = 20
+y = 25
+block_list = ["blue_concrete", "red_concrete", "green_concrete",
+              "yellow_concrete", "purple_concrete", "pink_concrete"]
 
 # Over the hill
 # coordinates = [(-854, 87+y, -210), (-770, 99+y, -207), (-736, 85+y, -184)]
@@ -16,8 +19,12 @@ y = 20
 #                (-926, 65, -29), (-906, 98, 42), (-902, 137, 2), (-909, 115, -62), (-924, 76, -6), (-985, 76, 37), (-1043, 76, 28), (-1102, 66, 63)]
 
 # Though the loop
-coordinates = [(-1005, 113, -19), (-896, 113, 7),
-               (-807, 76, 54), (-738, 76, -10), (-678, 76, -86)]
+# coordinates = [(-1005, 113+y, -19), (-896, 113+y, 7),
+#                (-807, 76+y, 54), (-738, 76+y, -10), (-678, 76+y, -86)]
+
+# Second zone
+coordinates = [(-805, 78, 128), (-881, 91, 104), (-950, 119, 69), (-1005, 114, 58), (-1052, 86, 30),
+               (-1075, 83, 40), (-1104, 77, 63), (-1161, 69, 157), (-1144, 62, 226), (-1189, 76, 265), (-1210, 79, 329)]
 
 resolution, distance = curve.resolution_distance(coordinates, 6)
 
@@ -29,10 +36,41 @@ curvature = []
 for i in range(len(curve_surface.curvature)):
     curvature.append((0, 1, 0))
 
-curve_surface.compute_surface(10, curvature)
 
-for coordinate in curve_surface.surface:
-    editor.placeBlock(coordinate, Block("black_concrete"))
+# Perpendicular
+curve_surface.compute_surface_perpendicular(10, curvature)
+for i in range(len(curve_surface.surface)):
+    for j in range(len(curve_surface.surface[i])):
+        # block = random.choice(block_list)
+        for k in range(len(curve_surface.surface[i][j])):
+            if k-16 < len(block_list) and k-16 >= 0:
+                editor.placeBlock(
+                    curve_surface.surface[i][j][k], Block(block_list[k-16]))
+            else:
+                editor.placeBlock(
+                    curve_surface.surface[i][j][k], Block("stone"))
 
-for coordinate in curve_surface.curve:
-    editor.placeBlock(coordinate, Block("red_concrete"))
+offset = curve.offset(curve_surface.curve, -9, curvature)
+for i in range(len(offset)-1):
+    line = segment.discrete_segment(offset[i], offset[i+1])
+    for coordinate in line:
+        editor.placeBlock(coordinate, Block("white_concrete"))
+
+offset = curve.offset(curve_surface.curve, 9, curvature)
+for i in range(len(offset)-1):
+    line = segment.discrete_segment(offset[i], offset[i+1])
+    for coordinate in line:
+        editor.placeBlock(coordinate, Block("white_concrete"))
+
+# for coordinate in curve_surface.surface:
+#     editor.placeBlock(coordinate, Block("black_concrete"))
+
+# for coordinate in curve_surface.curve:
+#     editor.placeBlock(coordinate, Block("red_concrete"))
+
+# # Parallel
+# curve_surface.compute_surface_parallel(0, 10, 8, curvature)
+
+# for current_range in range(len(curve_surface.left_side)):
+#     for coordinate in curve_surface.left_side[current_range]:
+#         editor.placeBlock(coordinate, Block("yellow_concrete"))

networks/CurveSurface.py

@@ -16,7 +16,7 @@ class CurveSurface:
     def compute_curvature(self):
         self.curvature = curve.curvature(self.curve)
 
-    def compute_surface(self, width, normals):
+    def compute_surface_perpendicular(self, width, normals):
         self.offset_left = curve.offset(self.curve, width, normals)
         self.offset_right = curve.offset(self.curve, -width, normals)
         self.perpendicular_segment = []
@@ -28,6 +28,7 @@ class CurveSurface:
         self.surface = []
 
         for i in range(len(self.perpendicular_segment)-1):
+            self.surface.append([])
             for j in range(len(self.perpendicular_segment[i])):
                 # Hypothesis
                 max_length_index = i
@@ -42,6 +43,16 @@ class CurveSurface:
                     proportion = len(
                         self.perpendicular_segment[min_length_index])/len(self.perpendicular_segment[max_length_index])
 
-                for k in range(len(self.perpendicular_segment[max_length_index])):
-                    self.surface.extend(segment.discrete_segment(
-                        self.perpendicular_segment[max_length_index][k], self.perpendicular_segment[min_length_index][round(k * proportion)-1], pixel_perfect=False))
+                self.surface[i].append([])
+                for k in range(len(self.perpendicular_segment[max_length_index])-1):
+                    self.surface[i][j].append(segment.discrete_segment(
+                        self.perpendicular_segment[max_length_index][k], self.perpendicular_segment[min_length_index][round(k * proportion)], pixel_perfect=False))
+
+    def compute_surface_parallel(self, inner_range, outer_range, resolution, normals):
+        self.left_side = []
+        self.right_side = []
+        for current_range in range(inner_range * resolution, outer_range * resolution):
+            self.left_side.append(curve.offset(
+                self.curve, current_range/resolution, normals))
+            self.right_side.append(curve.offset(
+                self.curve, -current_range/resolution, normals))

networks/Segment.py

@@ -54,8 +54,7 @@ def orthogonal(origin, point, distance, normal=np.array([0, 1, 0])):
         print(origin, point, distance)
         raise ValueError("The input vectors are not linearly independent.")
 
-    orthogonal = np.round(
-        np.add(np.multiply(orthogonal, distance), origin)).astype(int)
+    orthogonal = np.add(np.multiply(orthogonal, distance), origin).astype(int)
     return orthogonal