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

improve shadow rendering

Browse source
This commit is contained in:
Laura Klünder 2017-05-13 19:19:28 +02:00
parent 860d80a88b
commit 1f897ccec9
2 changed files with 24 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,8 +73,9 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
# draw space background # draw space background
door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all())) door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all()))
section_geometry = cascaded_union((space_geometries[''], building_geometries, door_geometries)) section_geometry = cascaded_union((space_geometries[''], building_geometries, door_geometries))
section_svg = svg.add_geometry(section_geometry, defid='section') section_geometry = section_geometry.difference(hole_geometries)
svg.use_geometry(section_svg, fill_color='#d1d1d1', mask=hole_mask) section_clip = svg.add_geometry(section_geometry, defid='section', as_clip_path=True)
svg.use_geometry(fill_color='#d1d1d1', clip_path=section_clip)
# color in spaces # color in spaces
spaces_by_color = {} spaces_by_color = {}
@ -89,12 +90,11 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
# calculate walls # calculate walls
wall_geometry = building_geometries.difference(space_geometries['']).difference(door_geometries) wall_geometry = building_geometries.difference(space_geometries['']).difference(door_geometries)
wall_svg = svg.add_geometry(wall_geometry, 'walls') wall_svg = svg.add_geometry(wall_geometry, 'walls')
accessible_mask = svg.add_mask(section_svg, wall_svg, hole_svg, subtract=True, defid='accessible')
# draw wall shadow # draw wall shadow
wall_dilated_geometry = wall_geometry.buffer(0.7, join_style=JOIN_STYLE.mitre) wall_dilated_geometry = wall_geometry.buffer(0.7, join_style=JOIN_STYLE.mitre)
wall_dilated_svg = svg.add_geometry(wall_dilated_geometry, 'wall-shadows') 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_dilated_svg, fill_color='#000000', opacity=0.1, filter='wallblur', clip_path=section_clip)
# draw walls # draw walls
svg.use_geometry(wall_svg, fill_color='#929292') svg.use_geometry(wall_svg, fill_color='#929292')

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

@ -40,11 +40,10 @@ class SVGImage(SVGGroup):
# blur_filter.append(ET.Element('feBlend', {'in': 'SourceGraphic', 'in2': 'inner', 'mode': 'multiply'})) # blur_filter.append(ET.Element('feBlend', {'in': 'SourceGraphic', 'in2': 'inner', 'mode': 'multiply'}))
blur_filter = ET.Element('filter', {'id': 'wallblur'}) blur_filter = ET.Element('filter', {'id': 'wallblur'})
blur_filter.append(ET.Element('feGaussianBlur', {'stdDeviation': str(0.7 * self.scale)})) blur_filter.append(ET.Element('feGaussianBlur',
{'in': 'SourceGraphic',
'stdDeviation': str(int(0.7 * self.scale))}))
self.defs.append(blur_filter) 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)
def get_element(self): def get_element(self):
root = ET.Element('svg', { root = ET.Element('svg', {
@ -63,7 +62,7 @@ class SVGImage(SVGGroup):
self.def_i += 1 self.def_i += 1
return defid return defid
def add_geometry(self, geometry, defid=None, comment=None): def add_geometry(self, geometry, defid=None, as_clip_path=False, comment=None):
if defid is None: if defid is None:
defid = self.new_defid() defid = self.new_defid()
@ -74,6 +73,8 @@ class SVGImage(SVGGroup):
new_element = ET.Element('g') new_element = ET.Element('g')
new_element.append(element) new_element.append(element)
element = new_element element = new_element
if as_clip_path:
element.tag = 'clipPath'
paths = element.findall('polyline') paths = element.findall('polyline')
if len(paths) == 0: if len(paths) == 0:
@ -108,50 +109,21 @@ class SVGImage(SVGGroup):
self.defs.append(mask) self.defs.append(mask)
return defid return defid
def add_union(self, *geometries, wall_shadow=False, defid=None): def add_clip_path(self, *geometries, inverted=False, subtract=False, defid=None):
if defid is None: if defid is None:
defid = self.new_defid() defid = self.new_defid()
element = ET.Element('g', {'id': defid}) clippath = ET.Element('clipPath', {'id': defid})
for geometry in geometries: clippath.append(ET.Element('use', {'xlink:href': '#' + geometries[0]}))
newelem = ET.Element('use', {'xlink:href': '#'+geometry}) self.defs.append(clippath)
if wall_shadow:
newelem.set('filter', 'url(#wallshadow)')
element.append(newelem)
self.defs.append(element)
return defid return defid
def add_intersection(self, geometry1, geometry2, defid=None): def use_geometry(self, geometry=None, fill_color=None, fill_opacity=None, opacity=None, mask=None, filter=None,
if defid is None: stroke_width=0.0, stroke_color=None, stroke_opacity=None, stroke_linejoin=None, clip_path=None):
defid = self.new_defid() if geometry:
element = ET.Element('use', {'xlink:href': '#'+geometry})
mask = ET.Element('mask', {'id': defid+'-mask'}) else:
mask.append(ET.Element('rect', {'width': '100%', 'height': '100%', 'fill': 'black'})) element = ET.Element('rect', {'width': '100%', 'height': '100%'})
mask.append(ET.Element('use', {'xlink:href': '#'+geometry2, 'fill': 'white'}))
self.defs.append(mask)
element = ET.Element('g', {'id': defid, 'mask': 'url(#'+defid+'-mask)'})
element.append(ET.Element('use', {'xlink:href': '#'+geometry1}))
self.defs.append(element)
return defid
def add_difference(self, geometry1, geometry2, defid=None):
if defid is None:
defid = self.new_defid()
mask = ET.Element('mask', {'id': defid+'-mask'})
mask.append(ET.Element('rect', {'width': '100%', 'height': '100%', 'fill': 'white'}))
mask.append(ET.Element('use', {'xlink:href': '#'+geometry2, 'fill': 'black'}))
self.defs.append(mask)
element = ET.Element('g', {'id': defid, 'mask': 'url(#'+defid+'-mask)'})
element.append(ET.Element('use', {'xlink:href': '#' + geometry1}))
self.defs.append(element)
return defid
def use_geometry(self, geometry, fill_color=None, fill_opacity=None, opacity=None, mask=None, filter=None,
stroke_width=0.0, stroke_color=None, stroke_opacity=None, stroke_linejoin=None):
element = ET.Element('use', {'xlink:href': '#'+geometry})
element.set('fill', fill_color or 'none') element.set('fill', fill_color or 'none')
if fill_opacity: if fill_opacity:
element.set('fill-opacity', str(fill_opacity)) element.set('fill-opacity', str(fill_opacity))
@ -165,10 +137,12 @@ class SVGImage(SVGGroup):
element.set('stroke-linejoin', str(stroke_linejoin)) element.set('stroke-linejoin', str(stroke_linejoin))
if opacity: if opacity:
element.set('opacity', str(opacity)) element.set('opacity', str(opacity))
if mask:
element.set('mask', 'url(#'+mask+')')
if filter: if filter:
element.set('filter', 'url(#'+filter+')') element.set('filter', 'url(#'+filter+')')
if mask:
element.set('mask', 'url(#'+mask+')')
if clip_path:
element.set('clip-path', 'url(#'+clip_path+')')
self.g.append(element) self.g.append(element)
return element return element