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

Fix middle lane not showing up

Browse Source
This commit is contained in:
Xeon0X
2024-06-24 01:21:25 +02:00
parent fb1c6a35da
commit 6256a0e879
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@@ -15,7 +15,7 @@ from networks.geometry.Point3D import Point3D
def main(): def main():
y = 100 y = 105
Road([Point3D(3903, 137+y, -142), Point3D(3948, 111+y, -148), Road([Point3D(3903, 137+y, -142), Point3D(3948, 111+y, -148),
Point3D(3967, 112+y, -116), Point3D(4011, 112+y, -99)], 25) Point3D(3967, 112+y, -116), Point3D(4011, 112+y, -99)], 25)
# rectangle_house_mountain, rectangle_building, skeleton_highway, skeleton_mountain, road_grid = world_maker() # rectangle_house_mountain, rectangle_building, skeleton_highway, skeleton_mountain, road_grid = world_maker()

24
networks/roads_2/Road.py
View File

@@ -93,7 +93,7 @@ class Road:
(Point3D.insert_3d([self.polyline.segments[i].gaps[k][m]], 'y', [self.polyline_total_line_output[nearest[0]].y])[0].coordinates, Block("black_concrete"))) (Point3D.insert_3d([self.polyline.segments[i].gaps[k][m]], 'y', [self.polyline_total_line_output[nearest[0]].y])[0].coordinates, Block("black_concrete")))
# Circle # Circle
if i != 0 and i != len(self.polyline.segments)-1: if i != len(self.polyline.segments)-1:
circle, gaps = Circle(self.polyline.centers[i]).circle_thick_by_line(int( circle, gaps = Circle(self.polyline.centers[i]).circle_thick_by_line(int(
(self.polyline.radii[i]-self.width/2))+1, int((self.polyline.radii[i]+self.width/2))+1) (self.polyline.radii[i]-self.width/2))+1, int((self.polyline.radii[i]+self.width/2))+1)
@@ -125,22 +125,22 @@ class Road:
self.polyline_total_line_output[nearest[0]].y])[0] self.polyline_total_line_output[nearest[0]].y])[0]
for j in range(len(circle_list)): for j in range(len(circle_list)):
circle_list[j] = circle_list[j][0].optimized_path( if j != middle_lane_index:
circle_list[j]) circle_list[j] = circle_list[j][0].optimized_path(
factor = (middle_line_length-1)/(len(circle_list[j])-1) circle_list[j])
factor = (middle_line_length-1)/(len(circle_list[j])-1)
for k in range(len(circle_list[j])): for k in range(len(circle_list[j])):
circle_list[j][k] = Point3D.insert_3d([circle_list[j][k]], 'y', [ circle_list[j][k] = Point3D.insert_3d([circle_list[j][k]], 'y', [
circle_list[middle_lane_index][round(factor * k)].y])[0] circle_list[middle_lane_index][round(factor * k)].y])[0]
# Complete with gaps
if j < len(gaps): if j < len(gaps):
for k in range(len(gaps[j])): for k in range(len(gaps[j])):
if gaps[j][k].is_in_triangle(double_point_a, self.polyline.centers[i], double_point_b): if gaps[j][k].is_in_triangle(double_point_a, self.polyline.centers[i], double_point_b):
print("yes")
circle_list[j].append( circle_list[j].append(
Point3D.insert_3d([gaps[j][k]], 'y', [ Point3D.insert_3d([gaps[j][k]], 'y', [
circle_list[j][gaps[j][k].nearest(Point3D.to_2d(circle_list[j], 'y'), True)[0]].y])[0]) circle_list[j][gaps[j][k].nearest(Point3D.to_2d(circle_list[j], 'y'), True)[0]].y])[0])
print(circle_list[j][-1])
kk = j % 7 kk = j % 7
match kk: match kk:
@@ -187,12 +187,9 @@ class Road:
self.index_factor = len(y_smooth)/len(self.polyline.total_line_output) self.index_factor = len(y_smooth)/len(self.polyline.total_line_output)
editor = Editor(buffering=True)
for i in range(len(self.polyline.total_line_output)): for i in range(len(self.polyline.total_line_output)):
self.polyline_total_line_output[i] = Point3D( self.polyline_total_line_output[i] = Point3D(
self.polyline.total_line_output[i].x, y[round(i*self.index_factor)], self.polyline.total_line_output[i].y) self.polyline.total_line_output[i].x, y[round(i*self.index_factor)], self.polyline.total_line_output[i].y)
editor.placeBlock(
self.polyline_total_line_output[i].coordinates, Block("white_concrete"))
self._surface() self._surface()
self.place() self.place()
@@ -213,12 +210,9 @@ class Road:
self.index_factor = len( self.index_factor = len(
self.polyline_height.total_line_output)/len(self.polyline.total_line_output) self.polyline_height.total_line_output)/len(self.polyline.total_line_output)
editor = Editor(buffering=True)
for i in range(len(self.polyline.total_line_output)): for i in range(len(self.polyline.total_line_output)):
self.polyline_total_line_output[i] = Point3D( self.polyline_total_line_output[i] = Point3D(
self.polyline.total_line_output[i].x, self.polyline_height.total_line_output[round(i*self.index_factor)].y+70, self.polyline.total_line_output[i].y) self.polyline.total_line_output[i].x, self.polyline_height.total_line_output[round(i*self.index_factor)].y+70, self.polyline.total_line_output[i].y)
editor.placeBlock(
self.polyline_total_line_output[i].coordinates, Block("white_concrete"))
self._surface() self._surface()
self.place() self.place()