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

improve renderer: add obstacles and doors

Browse source
This commit is contained in:
Laura Klünder 2016-11-26 18:19:55 +01:00
parent b76cfa1985
commit df0598e5ee
2 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,13 +17,13 @@ class LevelRenderer():
def get_dimensions():
aggregate = Package.objects.all().aggregate(Max('right'), Min('left'), Max('top'), Min('bottom'))
return (
(aggregate['right__max'] - aggregate['left__min']) * 10,
(aggregate['top__max'] - aggregate['bottom__min']) * 10
(aggregate['right__max'] - aggregate['left__min']) * 32,
(aggregate['top__max'] - aggregate['bottom__min']) * 32
)
@staticmethod
def polygon_svg(geometry, fill_color=None, stroke_width=0.0, stroke_color=None, filter=None):
element = ET.fromstring(scale(geometry, xfact=10, yfact=10, origin=(0, 0)).svg(0, fill_color or '#FFFFFF'))
element = ET.fromstring(scale(geometry, xfact=32, yfact=32, origin=(0, 0)).svg(0, fill_color or '#FFFFFF'))
if element.tag != 'g':
new_element = ET.Element('g')
new_element.append(element)
@ -57,21 +57,6 @@ class LevelRenderer():
'xmlns': 'http://www.w3.org/2000/svg',
})
svg.append(ET.fromstring("""
<filter id="area-filter" x="-50%" y="-50%" width="200%" height="200%">
<feComponentTransfer in="SourceAlpha">
<feFuncA type="table" tableValues="1 0" />
</feComponentTransfer>
<feGaussianBlur stdDeviation="15" result="offsetblur"/>
<feFlood flood-color="#B9B9B9" result="color"/>
<feComposite in2="offsetblur" operator="in"/>
<feComposite in2="SourceAlpha" operator="in" />
<feMerge>
<feMergeNode in="SourceGraphic" />
<feMergeNode />
</feMerge>
</filter>"""))
contents = ET.Element('g', {
'transform': 'scale(1 -1) translate(0 -%d)' % (height),
})
@ -80,16 +65,26 @@ class LevelRenderer():
contents.append(self.polygon_svg(box(0, 0, width, height), fill_color='#000000'))
contents.append(self.polygon_svg(self.level.geometries.buildings,
fill_color='#D5D5D5'))
contents.append(self.polygon_svg(self.level.geometries.walls_shadow,
fill_color='#CCCCCC'))
contents.append(self.polygon_svg(self.level.geometries.doors,
fill_color='#FFFFFF',
stroke_color='#CCCCCC',
stroke_width=2))
contents.append(self.polygon_svg(self.level.geometries.obstacles,
fill_color='#BDBDBD',
stroke_color='#9E9E9E',
stroke_width=3))
contents.append(self.polygon_svg(self.level.geometries.walls_without_doors,
fill_color='#949494',
stroke_color='#757575',
stroke_width=1.5))
stroke_width=3))
contents.append(self.polygon_svg(self.level.geometries.areas,
fill_color='#D5D5D5',
filter='url(#area-filter)'))
contents.append(self.polygon_svg(self.level.geometries.areas,
stroke_color='#757575',
stroke_width=1.5))
return ET.tostring(svg).decode()
def write_svg(self):