Persson-dev/GDMC-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename files

Browse Source
This commit is contained in:
Xeon0X
2024-05-27 22:18:44 +02:00
parent db3a8b24c1
commit ba78bb4537
7 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
networks/geometry/CurveSurface.py → networks/geometry/Strip.py
View File

@@ -1,28 +1,28 @@
import networks.geometry.curve as curve
import networks.geometry.segment as segment
import networks.geometry.curve_tools as curve_tools
import networks.geometry.segment_tools as segment_tools
import numpy as np
class CurveSurface:
class Strip:
def __init__(self, points, reshape=True, spacing_distance=10):
self.points = np.array(points)
if reshape:
self.resolution, self.length = curve.resolution_distance(
self.resolution, self.length = curve_tools.resolution_distance(
self.points, spacing_distance=spacing_distance)
self.curve = curve.curve(self.points, self.resolution)
self.curve = curve_tools.curve(self.points, self.resolution)
else: # Point can also be given already in curved form
self.curve = self.points
def compute_curvature(self):
self.curvature = curve.curvature(self.curve)
self.curvature = curve_tools.curvature(self.curve)
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.offset_left = curve_tools.offset(self.curve, width, normals)
self.offset_right = curve_tools.offset(self.curve, -width, normals)
self.perpendicular_segment = []
for i in range(len(self.offset_left)):
self.perpendicular_segment.append(segment.discrete_segment(
self.perpendicular_segment.append(segment_tools.discrete_segment(
self.offset_left[i], self.offset_right[i], pixel_perfect=False))
self.surface = []
@@ -45,14 +45,14 @@ class CurveSurface:
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.surface[i][j].append(segment_tools.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.left_side.append(curve_tools.offset(
self.curve, current_range/resolution, normals))
self.right_side.append(curve.offset(
self.right_side.append(curve_tools.offset(
self.curve, -current_range/resolution, normals))

6
networks/geometry/curve.py → networks/geometry/curve_tools.py
View File

@@ -1,5 +1,5 @@
import numpy as np
import networks.geometry.segment as segment
import networks.geometry.segment_tools as segment_tools
from scipy import interpolate
from math import sqrt
@@ -83,14 +83,14 @@ def offset(curve, distance, normals):
'Number of normals and number of points in the curve do not match')
# Offsetting
offset_segments = [segment.parallel(
offset_segments = [segment_tools.parallel(
(curve[i], curve[i+1]), distance, normals[i]) for i in range(len(curve) - 1)]
# Combining segments
combined_curve = []
combined_curve.append(np.round(offset_segments[0][0]).tolist())
for i in range(0, len(offset_segments)-1):
combined_curve.append(segment.middle_point(
combined_curve.append(segment_tools.middle_point(
offset_segments[i][1], offset_segments[i+1][0]))
combined_curve.append(np.round(offset_segments[-1][1]).tolist())

0
networks/geometry/point.py → networks/geometry/point_tools.py
View File

0
networks/geometry/segment.py → networks/geometry/segment_tools.py
View File