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

renderer: lowest levels should always be extend downwards

Browse source
This commit is contained in:
Laura Klünder 2017-11-25 15:16:15 +01:00
parent c9f160e8fb
commit 94a093d4dc
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mapdata/render/engines/svg.py
View file

@ -229,7 +229,7 @@ class SVGEngine(RenderEngine):
attribs = ' fill="none"' attribs = ' fill="none"'
if altitude is not None and stroke is None: if altitude is not None and stroke is None:
stroke = StrokeAttribs('rgba(0, 0, 0, 0.15)', 0.05, min_px=0.2) stroke = StrokeAttribs('rgba(255, 0, 0, 1)', 0.05, min_px=0.2)
if stroke: if stroke:
width = stroke.width*self.scale width = stroke.width*self.scale

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

@ -51,9 +51,9 @@ class MapRenderer:
min_altitude = min(chain(*(tuple(area.altitude for area in geoms.altitudeareas) min_altitude = min(chain(*(tuple(area.altitude for area in geoms.altitudeareas)
for geoms in levels))) for geoms in levels)))
not_full_levels = not self.full_levels and engine.is_3d not_full_levels = engine.is_3d # always do non-full-levels until after the first primary level
full_levels = self.full_levels and engine.is_3d full_levels = self.full_levels and engine.is_3d
for i, geoms in reversed(tuple(enumerate(reversed(levels)))): for geoms in levels:
if not bbox.intersects(geoms.affected_area): if not bbox.intersects(geoms.affected_area):
continue continue
@ -89,15 +89,15 @@ class MapRenderer:
engine.add_geometry(geometry, altitude=altitudearea.altitude, fill=FillAttribs('#eeeeee'), engine.add_geometry(geometry, altitude=altitudearea.altitude, fill=FillAttribs('#eeeeee'),
category='ground', item=i) category='ground', item=i)
i = 0 j = 0
for color, areas in altitudearea.colors.items(): for color, areas in altitudearea.colors.items():
# only select ground colors if their access restriction is unlocked # only select ground colors if their access restriction is unlocked
areas = tuple(area for access_restriction, area in areas.items() areas = tuple(area for access_restriction, area in areas.items()
if access_restriction in access_permissions) if access_restriction in access_permissions)
if areas: if areas:
i += 1 j += 1
engine.add_geometry(hybrid_union(areas), fill=FillAttribs(color), engine.add_geometry(hybrid_union(areas), fill=FillAttribs(color),
category='groundcolor%s' % i, item=i) category='groundcolor%s' % j, item=j)
for height, obstacle in altitudearea.obstacles.items(): for height, obstacle in altitudearea.obstacles.items():
engine.add_geometry(obstacle, fill=FillAttribs('#cccccc'), category='obstacles') engine.add_geometry(obstacle, fill=FillAttribs('#cccccc'), category='obstacles')
@ -133,4 +133,7 @@ class MapRenderer:
if walls is not None: if walls is not None:
engine.add_geometry(walls, stroke=StrokeAttribs('#666666', 0.05, min_px=0.2), category='walls') engine.add_geometry(walls, stroke=StrokeAttribs('#666666', 0.05, min_px=0.2), category='walls')
if geoms.on_top_of_id is None:
not_full_levels = not self.full_levels and engine.is_3d
return engine return engine