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

always render slopes

Browse source
This commit is contained in:
Laura Klünder 2018-12-07 16:01:54 +01:00
parent 9d855cfa16
commit f53117edef
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/c3nav/mapdata/render/engines/openscad.py
View file

@ -154,8 +154,6 @@ class OpenSCADEngine(Base3DEngine):
geometry_buffered = geometry_buffered.intersection(areas).buffer(0) geometry_buffered = geometry_buffered.intersection(areas).buffer(0)
outside_geometry = outside_geometry.intersection(self.bbox) outside_geometry = outside_geometry.intersection(self.bbox)
slopes = True
if not inside_geometry.is_empty: if not inside_geometry.is_empty:
if altitudearea.altitude2 is not None: if altitudearea.altitude2 is not None:
min_slope_altitude = min(altitudearea.altitude, altitudearea.altitude2) min_slope_altitude = min(altitudearea.altitude, altitudearea.altitude2)
@ -168,10 +166,9 @@ class OpenSCADEngine(Base3DEngine):
slope = self._add_slope(bounds, altitudearea.altitude, altitudearea.altitude2, slope = self._add_slope(bounds, altitudearea.altitude, altitudearea.altitude2,
altitudearea.point1, altitudearea.point2, bottom=True) altitudearea.point1, altitudearea.point2, bottom=True)
if slopes: main_building_block_diff.append(
main_building_block_diff.append( OpenScadBlock('difference()', children=[polygon, slope], comment=name+' inside cut')
OpenScadBlock('difference()', children=[polygon, slope], comment=name+' inside cut') )
)
# actual thingy # actual thingy
if max_slope_altitude > current_upper_bound and inside_geometry.intersects(self.bbox): if max_slope_altitude > current_upper_bound and inside_geometry.intersects(self.bbox):
@ -208,12 +205,11 @@ class OpenSCADEngine(Base3DEngine):
altitudearea.point1, altitudearea.point2, bottom=False) altitudearea.point1, altitudearea.point2, bottom=False)
slope2 = self._add_slope(bounds, altitudearea.altitude-700, altitudearea.altitude2-700, slope2 = self._add_slope(bounds, altitudearea.altitude-700, altitudearea.altitude2-700,
altitudearea.point1, altitudearea.point2, bottom=True) altitudearea.point1, altitudearea.point2, bottom=True)
if slopes: union = OpenScadBlock('union()', children=[slope1, slope2], comment=name+'outside')
union = OpenScadBlock('union()', children=[slope1, slope2], comment=name+'outside') main_building_block.append(
main_building_block.append( OpenScadBlock('difference()',
OpenScadBlock('difference()', children=[polygon, union], comment=name+'outside')
children=[polygon, union], comment=name+'outside') )
)
else: else:
if geoms.on_top_of_id is None: if geoms.on_top_of_id is None:
lower = geoms.lower_bound lower = geoms.lower_bound