2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

don't render altitudearea polyhedrons within columns

Browse source
This commit is contained in:
Laura Klünder 2017-11-14 21:11:22 +01:00
parent b76f35a4a5
commit f2b0fc26b1
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/c3nav/mapdata/render/data.py
View file

@ -80,6 +80,9 @@ class HybridGeometry:
add_faces={crop_id: tuple(mesh.filter(**kwargs) for mesh in faces) add_faces={crop_id: tuple(mesh.filter(**kwargs) for mesh in faces)
for crop_id, faces in self.add_faces.items()}) for crop_id, faces in self.add_faces.items()})
def remove_faces(self, faces):
self.faces = tuple((subfaces-faces) for subfaces in self.faces)
@property @property
def is_empty(self): def is_empty(self):
return not self.faces and not any(self.add_faces.values()) return not self.faces and not any(self.add_faces.values())
@ -114,6 +117,12 @@ class AltitudeAreaGeometries:
self.colors = {color: {key: HybridGeometry.create(geom, face_centers) for key, geom in areas.items()} self.colors = {color: {key: HybridGeometry.create(geom, face_centers) for key, geom in areas.items()}
for color, areas in self.colors.items()} for color, areas in self.colors.items()}
def remove_faces(self, faces):
self.geometry.remove_faces(faces)
for areas in self.colors.values():
for area in areas.values():
area.remove_faces(faces)
def create_polyhedrons(self, create_polyhedron, crops): def create_polyhedrons(self, create_polyhedron, crops):
altitude = self.altitude altitude = self.altitude
self.geometry.build_polyhedron(create_polyhedron, self.geometry.build_polyhedron(create_polyhedron,
@ -593,6 +602,10 @@ class LevelGeometries:
for area, height in self.heightareas) for area, height in self.heightareas)
vertex_wall_heights = vertex_altitudes + vertex_heights vertex_wall_heights = vertex_altitudes + vertex_heights
# remove altitude area faces inside walls
for area in self.altitudeareas:
area.remove_faces(reduce(operator.or_, self.walls.faces, set()))
# create polyhedrons # create polyhedrons
self.walls_base = HybridGeometry(self.walls.geom, self.walls.faces) self.walls_base = HybridGeometry(self.walls.geom, self.walls.faces)
self.walls_bottom = HybridGeometry(self.walls.geom, self.walls.faces) self.walls_bottom = HybridGeometry(self.walls.geom, self.walls.faces)