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

Break random things

Browse Source
This commit is contained in:
Xeon0X
2024-06-06 21:55:41 +02:00
parent 9867909e9f
commit e8d3b8d29a
5 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@@ -244,7 +244,7 @@ block_list = ["blue_concrete", "red_concrete", "green_concrete",
# --- # ---
r = Road.Road(((-1572, 64, 518), (-1608, 65, 513), r = Road.Road(((-1829, 141, 553), (-1830, 110, 621), (-1711, 69, 625), (-1662,
(-1627, 64, 534), (-1643, 71, 580)), "None") 65, 627), (-1667, 65, 761), (-1683, 70, 800), (-1721, 70, 834)), "None")
r.place_roads() r.place_roads()

4
networks/geometry/Strip.py
View File

@@ -17,8 +17,8 @@ class Strip:
self.curvature = curve_tools.curvature(self.curve) self.curvature = curve_tools.curvature(self.curve)
def compute_surface_perpendicular(self, width, normals): def compute_surface_perpendicular(self, width, normals):
self.offset_left = curve_tools.offset(self.curve, width, normals) self.offset_left = curve_tools.offset(self.curve, width/2, normals)
self.offset_right = curve_tools.offset(self.curve, -width, normals) self.offset_right = curve_tools.offset(self.curve, -width/2, normals)
self.perpendicular_segment = [] self.perpendicular_segment = []
for i in range(len(self.offset_left)): for i in range(len(self.offset_left)):

40
networks/roads/Road.py
View File

@@ -18,7 +18,7 @@ class Road:
editor = Editor(buffering=True) editor = Editor(buffering=True)
self.resolution, self.distance = curve_tools.resolution_distance( self.resolution, self.distance = curve_tools.resolution_distance(
self.coordinates, 6) self.coordinates, 12)
self.curve_points = curve_tools.curve( self.curve_points = curve_tools.curve(
self.coordinates, self.resolution) self.coordinates, self.resolution)
@@ -36,13 +36,18 @@ class Road:
# editor.placeBlock(coordinate, Block(block)) # editor.placeBlock(coordinate, Block(block))
with open('networks/roads/lines/lines.json') as lines_materials: with open('networks/roads/lines/lines.json') as lines_materials:
line_type = json.load(lines_materials).get('broken_white') line_type = json.load(lines_materials).get('solid_white')
with open('networks/roads/lines/lines.json') as lines_materials:
middle_line_type = json.load(lines_materials).get('broken_white')
print(line_type, lane_type) print(line_type, lane_type)
# for coordinate, block in surface: # for coordinate, block in surface:
# editor.placeBlock(coordinate, Block(block)) # editor.placeBlock(coordinate, Block(block))
lines_coordinates = []
middle_lines_coordinates = []
# Perpendicular # Perpendicular
self.curve_surface.compute_surface_perpendicular(10, self.curvature) self.curve_surface.compute_surface_perpendicular(10, self.curvature)
for i in range(len(self.curve_surface.surface)): for i in range(len(self.curve_surface.surface)):
@@ -54,14 +59,29 @@ class Road:
list(lane_type.keys()), list(lane_type.keys()),
weights=lane_type.values(), weights=lane_type.values(),
k=1,)[0])) k=1,)[0]))
if k == 0: editor.placeBlock(
block = random.choices( (self.curve_surface.surface[i][j][k][l][0], self.curve_surface.surface[i][j][k][l][1]-1, self.curve_surface.surface[i][j][k][l][2]), Block(random.choices(
list(pattern_materials[pattern_iteration].keys()), list(lane_type.keys()),
weights=pattern_materials[pattern_iteration].values( weights=lane_type.values(),
), k=1,)[0]))
k=1)[0] if k == 0 or k == len(self.curve_surface.surface[i][j])-1:
if block != 'None': lines_coordinates.extend(
self.surface.append((coordinate, block)) self.curve_surface.surface[i][j][k])
if k == round((len(self.curve_surface.surface[i][j])-1)/2):
middle_lines_coordinates.extend(
self.curve_surface.surface[i][j][k])
line = Line.Line(lines_coordinates, line_type)
line.get_blocks()
middle_line = Line.Line(middle_lines_coordinates, middle_line_type)
middle_line.get_blocks()
for i in range(len(line.coordinates_with_blocks)):
editor.placeBlock(
line.coordinates_with_blocks[i][0], Block(line.coordinates_with_blocks[i][1]))
for i in range(len(middle_line.coordinates_with_blocks)):
editor.placeBlock(
middle_line.coordinates_with_blocks[i][0], Block(middle_line.coordinates_with_blocks[i][1]))
# offset = curve.offset(curve_surface.curve, -9, curvature) # offset = curve.offset(curve_surface.curve, -9, curvature)
# for i in range(len(offset)-1): # for i in range(len(offset)-1):
# line = segment.discrete_segment(offset[i], offset[i+1]) # line = segment.discrete_segment(offset[i], offset[i+1])

6
networks/roads/lines/Line.py
View File

@@ -28,8 +28,8 @@ class Line:
if block != 'None': if block != 'None':
self.coordinates_with_blocks.append((coordinate, block)) self.coordinates_with_blocks.append((coordinate, block))
pattern_iteration += 1 pattern_iteration += 1
if pattern_iteration >= pattern_length: if pattern_iteration >= pattern_length:
pattern_iteration = 0 pattern_iteration = 0
return self.coordinates_with_blocks return self.coordinates_with_blocks

5
networks/roads/lines/lines.json
View File

@@ -4,7 +4,8 @@
], ],
"broken_white": [ "broken_white": [
[{"white_concrete": 3, "white_concrete_powder": 1}, 3], [{"red_concrete": 1}, 3],
[{"None": 1}, 1] [{"green_concrete": 1}, 3],
[{"blue_concrete": 1}, 3]
] ]
} }