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

outsource this duplicate code

Browse source
This commit is contained in:
Laura Klünder 2017-11-19 20:04:58 +01:00
parent 4594c44539
commit 3b6a55dda7
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,27 +153,27 @@ class AltitudeAreaGeometries:
for color, areas in self.colors.items(): for color, areas in self.colors.items():
for key in tuple(areas.keys()): for key in tuple(areas.keys()):
geom = areas[key] faces_offset, vertices_offset = self._call_create_full(areas, key, faces, vertices,
new_geom, new_vertices, new_faces = HybridGeometry.create_full(geom, vertices_offset, faces_offset) faces_offset, vertices_offset)
areas[key] = new_geom
vertices_offset += new_vertices.shape[0]
faces_offset += new_faces.shape[0]
vertices.append(new_vertices)
faces.append(new_faces)
for key in tuple(self.obstacles.keys()): for key in tuple(self.obstacles.keys()):
geom = self.obstacles[key] faces_offset, vertices_offset = self._call_create_full(self.obstacles, key, faces, vertices,
new_geom, new_vertices, new_faces = HybridGeometry.create_full(geom, vertices_offset, faces_offset) faces_offset, vertices_offset)
self.obstacles[key] = new_geom
vertices_offset += new_vertices.shape[0]
faces_offset += new_faces.shape[0]
vertices.append(new_vertices)
faces.append(new_faces)
if not vertices: if not vertices:
return np.empty((0, 2), dtype=np.int32), np.empty((0, 3), dtype=np.uint32) return np.empty((0, 2), dtype=np.int32), np.empty((0, 3), dtype=np.uint32)
return np.vstack(vertices), np.vstack(faces) return np.vstack(vertices), np.vstack(faces)
def _call_create_full(self, mapping, key, faces, vertices, faces_offset, vertices_offset):
geom = mapping[key]
new_geom, new_vertices, new_faces = HybridGeometry.create_full(geom, vertices_offset, faces_offset)
mapping[key] = new_geom
vertices_offset += new_vertices.shape[0]
faces_offset += new_faces.shape[0]
vertices.append(new_vertices)
faces.append(new_faces)
return faces_offset, vertices_offset
def remove_faces(self, faces): def remove_faces(self, faces):
self.geometry.remove_faces(faces) self.geometry.remove_faces(faces)
for areas in self.colors.values(): for areas in self.colors.values():