CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

solved one bug

Browse Source
This commit is contained in:
pilar 2020-12-01 17:19:21 -05:00
parent 7891e5450e
commit f0d6176bab
2 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
city_model_structure/attributes/polyhedron.py
View File

@ -71,6 +71,7 @@ class Polyhedron:
points_list = surface.points_list points_list = surface.points_list
point_index = 0 point_index = 0
area = surface.area area = surface.area
print('AREA:', area)
while len(triangles) < triangles_count: while len(triangles) < triangles_count:
# select a triangle starting at point index # select a triangle starting at point index
triangle_points = ' '.join(str(e) for e in [*points_list[point_index:point_index + 9]]) triangle_points = ' '.join(str(e) for e in [*points_list[point_index:point_index + 9]])
@ -78,6 +79,8 @@ class Polyhedron:
rest_points = ' '.join(str(e) for e in [*points_list[0:point_index+3], *points_list[point_index+6:]]) rest_points = ' '.join(str(e) for e in [*points_list[0:point_index+3], *points_list[point_index+6:]])
triangular_surface = Surface(triangle_points, remove_last=False) triangular_surface = Surface(triangle_points, remove_last=False)
rest_surface = Surface(rest_points, remove_last=False) rest_surface = Surface(rest_points, remove_last=False)
print('triangular_surface:', triangular_surface.points)
print('triangular_surface_AREA:', triangular_surface.area)
if self._geometry.almost_same_area(area, (triangular_surface.area + rest_surface.area)): if self._geometry.almost_same_area(area, (triangular_surface.area + rest_surface.area)):
area = rest_surface.area area = rest_surface.area
triangles.append(triangular_surface) triangles.append(triangular_surface)

6
city_model_structure/attributes/surface.py
View File

@ -222,7 +222,9 @@ class Surface:
print('NEW METHOD TO CALCULATE AREA') print('NEW METHOD TO CALCULATE AREA')
print('original:') print('original:')
print(self.points) print(self.points)
if len(self.points) < 3:
area = 0
else:
# 1. 3D -> 2D # 1. 3D -> 2D
z_vector = [0, 0, 1] z_vector = [0, 0, 1]
normal_vector = self.normal normal_vector = self.normal
@ -266,7 +268,7 @@ class Surface:
new_point = np.matmul(turning_base_matrix, point) new_point = np.matmul(turning_base_matrix, point)
print('new_point:', new_point) print('new_point:', new_point)
points_2d.append(new_point) points_2d.append(new_point)
# points_2d.append([new_point[0], new_point[1]]) # points_2d.append([new_point[0], new_point[1]])
else: else:
for point in self.points: for point in self.points: