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

improve shadows

Browse source
This commit is contained in:
Laura Klünder 2017-10-18 16:28:38 +02:00
parent 86217c77a8
commit c5e514848d
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/c3nav/mapdata/utils/svg.py
View file

@ -152,8 +152,9 @@ class SVGImage:
self.defs.append(element) self.defs.append(element)
return defid return defid
def get_blur(self, elevation): def get_shadow(self, geometry, elevation):
blur_id = 'blur'+str(elevation*100) elevation = min(elevation, 2)
blur_id = 'blur'+str(int(elevation*100))
if elevation not in self.blurs: if elevation not in self.blurs:
blur_filter = ET.Element('filter', {'id': blur_id, blur_filter = ET.Element('filter', {'id': blur_id,
'width': '200%', 'width': '200%',
@ -161,11 +162,17 @@ class SVGImage:
'x': '-50%', 'x': '-50%',
'y': '-50%'}) 'y': '-50%'})
blur_filter.append(ET.Element('feGaussianBlur', blur_filter.append(ET.Element('feGaussianBlur',
{'in': 'SourceGraphic', {'stdDeviation': str(elevation / 3 * 0.25 * self.scale)}))
'stdDeviation': str(elevation*self.scale)}))
self.defs.append(blur_filter) self.defs.append(blur_filter)
self.blurs.add(elevation) self.blurs.add(elevation)
return blur_id
shadow = self._create_geometry(translate(geometry.buffer(elevation / 3 * 0.25),
xoff=(elevation / 3 * 0.12), yoff=-(elevation / 3 * 0.12)))
shadow.set('filter', 'url(#'+blur_id+')')
shadow.set('fill', 'black')
shadow.set('fill-opacity', '0.20')
return shadow
def add_clip_path(self, *geometries, inverted=False, subtract=False, defid=None): def add_clip_path(self, *geometries, inverted=False, subtract=False, defid=None):
if defid is None: if defid is None:
@ -197,24 +204,17 @@ class SVGImage:
if geometry is not None: if geometry is not None:
if not geometry: if not geometry:
return return
if isinstance(geometry, str):
element = ET.Element('use', {'xlink:href': '#'+geometry})
else:
element = self._create_geometry(geometry)
if altitude is not None or elevation is not None: if altitude is not None or elevation is not None:
blur_radius = float(1 if elevation is None else elevation) elevation = float(1 if elevation is None else elevation)
if blur_radius: if elevation:
buffered_geometry = translate(geometry.buffer(blur_radius/20), shadow = self.get_shadow(geometry, elevation)
xoff=blur_radius/40, yoff=-blur_radius/40) self.g.append(shadow)
shadow_element = self._create_geometry(buffered_geometry)
shadow_element.set('fill', '#000000')
shadow_element.set('fill-opacity', '0.14')
shadow_element.set('filter', 'url(#'+self.get_blur(blur_radius/15)+')')
self.g.append(shadow_element)
self.clip_altitudes(geometry, altitude) self.clip_altitudes(geometry, altitude)
element = self._create_geometry(geometry)
else: else:
element = ET.Element('rect', {'width': '100%', 'height': '100%'}) element = ET.Element('rect', {'width': '100%', 'height': '100%'})
element.set('fill', fill_color or 'none') element.set('fill', fill_color or 'none')