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

render wall shadows in the wall border color

Browse source
This commit is contained in:
Gwendolyn 2024-09-17 22:25:12 +02:00
parent e70bf8aac5
commit 2f8dc3ee32
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/render/engines/base.py
View file

@ -68,7 +68,7 @@ class RenderEngine(ABC):
pass pass
def add_geometry(self, geometry, fill: Optional[FillAttribs] = None, stroke: Optional[StrokeAttribs] = None, def add_geometry(self, geometry, fill: Optional[FillAttribs] = None, stroke: Optional[StrokeAttribs] = None,
altitude=None, height=None, shape_cache_key=None, category=None, item=None): altitude=None, height=None, shadow_color=None, shape_cache_key=None, category=None, item=None):
# draw a shapely geometry with a given style # draw a shapely geometry with a given style
# altitude is the absolute altitude of the upper bound of the element # altitude is the absolute altitude of the upper bound of the element
# height is the height of the element # height is the height of the element
@ -78,12 +78,12 @@ class RenderEngine(ABC):
if geometry.is_empty: if geometry.is_empty:
return return
self._add_geometry(geometry=geometry, fill=fill, stroke=stroke, altitude=altitude, height=height, self._add_geometry(geometry=geometry, fill=fill, stroke=stroke, altitude=altitude, height=height, shadow_color=shadow_color,
shape_cache_key=shape_cache_key, category=category, item=item) shape_cache_key=shape_cache_key, category=category, item=item)
@abstractmethod @abstractmethod
def _add_geometry(self, geometry, fill: Optional[FillAttribs], stroke: Optional[StrokeAttribs], def _add_geometry(self, geometry, fill: Optional[FillAttribs], stroke: Optional[StrokeAttribs],
altitude=None, height=None, shape_cache_key=None, category=None, item=None): altitude=None, height=None, shadow_color=None, shape_cache_key=None, category=None, item=None):
pass pass
def set_mesh_lookup_data(self, data): def set_mesh_lookup_data(self, data):

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

@ -196,7 +196,7 @@ class SVGEngine(RenderEngine):
self.clip_path_i += 1 self.clip_path_i += 1
return defid return defid
def add_shadow(self, geometry, elevation, clip_path=None): def add_shadow(self, geometry, elevation, color, clip_path=None):
# add a shadow for the given geometry with the given elevation and, optionally, a clip path # add a shadow for the given geometry with the given elevation and, optionally, a clip path
elevation = float(min(elevation, 2)) elevation = float(min(elevation, 2))
blur_radius = elevation / 3 * 0.25 blur_radius = elevation / 3 * 0.25
@ -215,7 +215,7 @@ class SVGEngine(RenderEngine):
'</filter>') '</filter>')
self.blurs.add(elevation) self.blurs.add(elevation)
attribs = ' filter="url(#'+blur_id+')" fill="#000" fill-opacity="0.2"' attribs = ' filter="url(#'+blur_id+')" fill="'+(color or '#000')+'" fill-opacity="0.2"'
if clip_path: if clip_path:
attribs += ' clip-path="url(#'+self.register_clip_path(clip_path)+')"' attribs += ' clip-path="url(#'+self.register_clip_path(clip_path)+')"'
shadow = self._create_geometry(shadow_geom, attribs) shadow = self._create_geometry(shadow_geom, attribs)
@ -237,7 +237,7 @@ class SVGEngine(RenderEngine):
self.add_geometry(geometry=area, fill=FillAttribs('#000000', 0.1), category='darken') self.add_geometry(geometry=area, fill=FillAttribs('#000000', 0.1), category='darken')
def _add_geometry(self, geometry, fill: Optional[FillAttribs], stroke: Optional[StrokeAttribs], def _add_geometry(self, geometry, fill: Optional[FillAttribs], stroke: Optional[StrokeAttribs],
altitude=None, height=None, shape_cache_key=None, **kwargs): altitude=None, height=None, shadow_color=None, shape_cache_key=None, **kwargs):
geometry = self.buffered_bbox.intersection(unwrap_hybrid_geom(geometry)) geometry = self.buffered_bbox.intersection(unwrap_hybrid_geom(geometry))
if geometry.is_empty: if geometry.is_empty:
@ -268,15 +268,15 @@ class SVGEngine(RenderEngine):
if altitude is not None or height is not None: if altitude is not None or height is not None:
if height is not None: if height is not None:
if height: if height:
self.add_shadow(geometry, height) self.add_shadow(geometry, height, '#000')
else: else:
for other_altitude, other_geom in self.altitudes.items(): for other_altitude, other_geom in self.altitudes.items():
self.add_shadow(geometry, altitude-other_altitude, clip_path=other_geom) self.add_shadow(geometry, altitude-other_altitude, clip_path=other_geom)
self.clip_altitudes(geometry, altitude) self.clip_altitudes(geometry, altitude, '#000')
else: else:
if height is not None: if height is not None:
self.add_shadow(geometry, height) self.add_shadow(geometry, height, shadow_color)
element = self._create_geometry(geometry, attribs, cache_key=shape_cache_key) element = self._create_geometry(geometry, attribs, cache_key=shape_cache_key)

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

@ -141,7 +141,7 @@ class MapRenderer:
engine.add_geometry( engine.add_geometry(
walls.filter(bottom=not not_full_levels, walls.filter(bottom=not not_full_levels,
top=not walls_extended), top=not walls_extended),
height=geoms.default_height, fill=FillAttribs(color_manager.wall_fill), category='walls' height=geoms.default_height, shadow_color=color_manager.wall_border, fill=FillAttribs(color_manager.wall_fill), category='walls'
) )
for short_wall in geoms.short_walls: for short_wall in geoms.short_walls: