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

improve svg rendering with wall shadows

Browse source
This commit is contained in:
Laura Klünder 2017-05-13 14:59:59 +02:00
parent 18bb742308
commit 16556c104a
3 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/c3nav/mapdata/models/section.py
View file

@ -2,6 +2,7 @@ from django.conf import settings
from django.db import models
from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from shapely.geometry import JOIN_STYLE
from shapely.ops import cascaded_union
from c3nav.mapdata.models.base import EditorFormMixin
@ -67,27 +68,35 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
hole_geometries = cascaded_union(tuple(h.geometry for h in self.holes.all()))
hole_geometries = hole_geometries.intersection(space_geometries[''])
hole_svg = svg.add_geometry(hole_geometries, 'holes')
hole_svg = svg.add_geometry(hole_geometries, defid='holes')
hole_mask = svg.add_mask(hole_svg, inverted=True, defid='holes-mask')
space_lower_svg = svg.add_geometry(space_geometries['lower'], defid='spaces-lower')
svg.use_geometry(space_lower_svg, fill_color='#d1d1d1')
space_svg = svg.add_geometry(space_geometries[''], defid='spaces')
space_hole_mask = svg.add_mask(space_svg, hole_svg, inverted=True, defid='spaces_mask')
svg.use_geometry(space_svg, fill_color='#d1d1d1', mask=hole_mask)
door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all()))
section_geometry = cascaded_union((space_geometries[''], building_geometries, door_geometries))
section_svg = svg.add_geometry(section_geometry, defid='section')
svg.use_geometry(section_svg, fill_color='#d1d1d1', mask=hole_mask)
building_svg = svg.add_geometry(building_geometries, 'buildings')
svg.use_geometry(building_svg, fill_color='#929292', mask=space_hole_mask)
wall_geometry = building_geometries.difference(space_geometries['']).difference(door_geometries)
wall_svg = svg.add_geometry(wall_geometry, 'walls')
svg.use_geometry(wall_svg, fill_color='#929292')
svg.use_geometry(space_svg, stroke_color='#333333', stroke_width=0.08)
svg.use_geometry(building_svg, stroke_color='#333333', stroke_width=0.10)
accessible_mask = svg.add_mask(section_svg, wall_svg, hole_svg, subtract=True, defid='accessible')
wall_dilated_geometry = wall_geometry.buffer(0.7, join_style=JOIN_STYLE.mitre)
wall_dilated_svg = svg.add_geometry(wall_dilated_geometry, 'wall-shadows')
svg.use_geometry(wall_dilated_svg, fill_color='rgba(0, 0, 0, 0.1)', mask=accessible_mask, filter='wallblur')
svg.use_geometry(wall_svg, stroke_color='#333333', stroke_width=0.07)
door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all()))
door_geometries = door_geometries.difference(space_geometries[''])
door_svg = svg.add_geometry(door_geometries, defid='doors')
svg.use_geometry(door_svg, fill_color='#ffffff')
svg.use_geometry(door_svg, fill_color='#ffffff', stroke_color='#929292', stroke_width=0.07)
space_upper_svg = svg.add_geometry(space_geometries['upper'], defid='spaces-upper')
svg.use_geometry(space_upper_svg, fill_color='#d1d1d1')
return svg.get_xml()

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

@ -8,7 +8,6 @@ from c3nav.mapdata.inclusion import get_maybe_invisible_areas
from c3nav.mapdata.utils.misc import get_dimensions, get_public_private_area, get_render_dimensions, get_render_path
class LevelRenderer():
def __init__(self, level, only_public):
self.level = level

24
src/c3nav/mapdata/render/svg.py
View file

@ -34,6 +34,17 @@ class SVGImage(SVGGroup):
self.defs = ET.Element('defs')
self.def_i = 0
# blur_filter = ET.Element('filter', {'id': 'wallblur-old'})
# blur_filter.append(ET.Element('feFlood', {'flood-color': '#DDDDDD', 'result': 'flooded'}))
# blur_filter.append(ET.Element('feComposite', {'in': 'flooded', 'in2': 'SourceAlpha', 'operator': 'out', 'result': 'outer'}))
# blur_filter.append(ET.Element('feMorphology', {'operator': 'dilate', 'in': 'outer', 'radius': str(0.7*self.scale), 'result': 'dilated'}))
# blur_filter.append(ET.Element('feGaussianBlur', {'in': 'dilated', 'stdDeviation': str(0.7*self.scale), 'result': 'blurred'}))
# blur_filter.append(ET.Element('feComposite', {'in': 'blurred', 'in2': 'SourceAlpha', 'operator': 'in', 'result': 'inner'}))
# blur_filter.append(ET.Element('feBlend', {'in': 'SourceGraphic', 'in2': 'inner', 'mode': 'multiply'}))
blur_filter = ET.Element('filter', {'id': 'wallblur'})
blur_filter.append(ET.Element('feGaussianBlur', {'stdDeviation': str(0.7 * self.scale)}))
self.defs.append(blur_filter)
# blur_filter = ET.Element('filter', {'id': 'wallblur'})
# blur_filter.append(ET.Element('feGaussianBlur', {'in': 'SourceGraphic', 'stdDeviation': str(5*self.scale)}))
# self.defs.append(blur_filter)
@ -82,14 +93,21 @@ class SVGImage(SVGGroup):
self.defs.append(element)
return defid
def add_mask(self, *geometries, inverted=False, defid=None):
def add_mask(self, *geometries, inverted=False, subtract=False, defid=None):
if defid is None:
defid = self.new_defid()
mask = ET.Element('mask', {'id': defid})
mask.append(ET.Element('rect', {'width': '100%', 'height': '100%', 'fill': 'white' if inverted else 'black'}))
mask.append(ET.Element('rect', {'width': '100%', 'height': '100%',
'fill': 'white' if inverted else 'black'}))
if subtract:
mask.append(ET.Element('use', {'xlink:href': '#'+geometries[0],
'fill': 'black' if inverted else 'white'}))
geometries = geometries[1:]
for geometry in geometries:
mask.append(ET.Element('use', {'xlink:href': '#'+geometry, 'fill': 'black' if inverted else 'white'}))
mask.append(ET.Element('use', {'xlink:href': '#'+geometry,
'fill': 'black' if inverted != subtract else 'white'}))
self.defs.append(mask)
return defid