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

improve scad rendering

Browse source
This commit is contained in:
Laura Klünder 2017-08-07 21:20:50 +02:00
parent 3c9013220e
commit 5a2bb0fe3d
2 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/c3nav/mapdata/models/level.py
View file

@ -13,7 +13,7 @@ from shapely.ops import cascaded_union
from c3nav.mapdata.models.locations import SpecificLocation
from c3nav.mapdata.utils.geometry import assert_multipolygon
from c3nav.mapdata.utils.scad import polygon_scad
from c3nav.mapdata.utils.scad import add_indent, polygon_scad
from c3nav.mapdata.utils.svg import SVGImage
@ -203,19 +203,19 @@ class Level(SpecificLocation, models.Model):
geometry = geometry.difference(intersection)
low_height = max(altitude - low_altitude, 0)
total_heght = low_height+height
if total_heght:
total_height = low_height+height
if total_height:
f.write(' ')
f.write('translate([0, 0, %.2f]) ' % (altitude - low_height))
f.write('linear_extrude(height=%.2f, center=false, convexity=20) ' % total_heght)
f.write(polygon_scad(intersection) + ';\n')
f.write(add_indent(polygon_scad(intersection, total_height))[4:])
if not geometry.is_empty:
f.write(' ')
f.write('translate([0, 0, %.2f]) ' % (altitude - Decimal('0.5')))
f.write('linear_extrude(height=%.2f, center=false, convexity=20) ' % (height+Decimal('0.5')))
f.write(polygon_scad(geometry) + ';\n')
f.write(add_indent(polygon_scad(geometry, height+Decimal('0.5')))[4:])
def _render_scad(self, f, low_clip=(), spaces=None, request=None):
f.write(' // '+self.title+'\n')
if spaces is None:
from c3nav.mapdata.models import Area, Space
spaces = self.spaces.filter(Space.q_for_request(request, allow_none=True)).prefetch_related(
@ -224,6 +224,8 @@ class Level(SpecificLocation, models.Model):
'stairs', 'obstacles', 'lineobstacles'
)
f.write('')
for area in self.altitudeareas.all():
area.geometry = area.geometry.buffer(0)
self._render_scad_polygon(f, area.geometry, area.altitude, low_clip=low_clip)