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

fix bases for non-full-level rendering or ramps

Browse source
This commit is contained in:
Laura Klünder 2017-11-19 00:30:08 +01:00
parent dcb0edcbd8
commit 25794fb613
2 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,8 @@ class AltitudeAreaGeometries:
self.altitude2 = None
self.point1 = None
self.point2 = None
self.base = None
self.bottom = None
self.colors = colors
self.obstacles = obstacles
@ -139,14 +141,26 @@ class AltitudeAreaGeometries:
for area in areas.values():
area.remove_faces(faces)
def create_polyhedrons(self, create_polyhedron, altitudes, crops):
def create_polyhedrons(self, create_polyhedron, altitudes, min_altitude, crops):
if self.altitude2 is None:
altitudes = self.altitude
self.base = HybridGeometry(self.geometry.geom, self.geometry.faces)
self.bottom = HybridGeometry(self.geometry.geom, self.geometry.faces)
self.geometry.build_polyhedron(create_polyhedron,
lower=altitudes - int(0.7 * 1000),
upper=altitudes,
crops=crops)
self.base.build_polyhedron(create_polyhedron,
lower=min_altitude - int(0.7 * 1000),
upper=altitudes - int(0.7 * 1000),
crops=crops,
top=False, bottom=False)
self.bottom.build_polyhedron(create_polyhedron,
lower=0, upper=1,
crops=crops,
top=False)
for geometry in chain(*(areas.values() for areas in self.colors.values())):
geometry.build_polyhedron(create_polyhedron,
lower=altitudes,
@ -792,6 +806,7 @@ class LevelGeometries:
self._build_vertex_values([area],
area_func=operator.attrgetter('geometry'),
value_func=self._get_altitudearea_vertex_values),
min_altitude=self.min_altitude,
crops=crops)
for key, geometry in self.restricted_spaces_indoors.items():

17
src/c3nav/mapdata/render/renderer.py
View file

@ -88,10 +88,14 @@ class MapRenderer:
not_full_levels = not self.full_levels and engine.is_3d
full_levels = self.full_levels and engine.is_3d
for geoms in levels:
for i, geoms in reversed(tuple(enumerate(reversed(levels)))):
if not bbox.intersects(geoms.affected_area):
continue
if i == 0:
not_full_levels = True
full_levels = False
engine.add_group('level_%s' % geoms.short_label)
# hide indoor and outdoor rooms if their access restriction was not unlocked
@ -108,11 +112,12 @@ class MapRenderer:
offset=min_altitude-int(0.7*1000)),
fill=FillAttribs('#aaaaaa'), category='walls')
for i, altitudearea in enumerate(geoms.altitudeareas):
scale = (altitudearea.altitude - min_altitude) / int(0.7 * 1000)
offset = (min_altitude - int(0.7*1000)) - (altitudearea.altitude - int(0.7*1000)) * scale
geometry = altitudearea.geometry.difference(crop_areas)
engine.add_geometry(geometry.fit(scale=scale, offset=offset).filter(top=False),
fill=FillAttribs('#eeeeee'), category='ground', item=i)
base = altitudearea.base.difference(crop_areas)
bottom = altitudearea.bottom.difference(crop_areas)
engine.add_geometry(base, fill=FillAttribs('#eeeeee'), category='ground', item=i)
engine.add_geometry(bottom.fit(scale=geoms.min_altitude - min_altitude,
offset=min_altitude - int(0.7 * 1000)),
fill=FillAttribs('#aaaaaa'), category='walls')
# render altitude areas in default ground color and add ground colors to each one afterwards
# shadows are directly calculated and added by the engine