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

some more blender engine

Browse source
This commit is contained in:
Laura Klünder 2018-12-04 20:05:12 +01:00
parent ffc37cc636
commit a88e208dc2
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/c3nav/mapdata/render/engines/blender.py
View file

@ -46,6 +46,7 @@ class BlenderEngine(Base3DEngine):
) )
triangulate_object(obj) triangulate_object(obj)
bpy.ops.mesh.select_all(action='SELECT') bpy.ops.mesh.select_all(action='SELECT')
bpy.ops.mesh.normals_make_consistent()
bpy.ops.object.mode_set(mode='OBJECT') bpy.ops.object.mode_set(mode='OBJECT')
def subtract_object(obj, other_obj, delete_after=False): def subtract_object(obj, other_obj, delete_after=False):
@ -55,9 +56,11 @@ class BlenderEngine(Base3DEngine):
mod[0].name = 'Difference' mod[0].name = 'Difference'
mod[0].operation = 'DIFFERENCE' mod[0].operation = 'DIFFERENCE'
mod[0].object = other_obj mod[0].object = other_obj
mod[0].solver = 'CARVE'
bpy.ops.object.modifier_apply(apply_as='DATA', modifier=mod[0].name) bpy.ops.object.modifier_apply(apply_as='DATA', modifier=mod[0].name)
bpy.ops.object.mode_set(mode='EDIT') bpy.ops.object.mode_set(mode='EDIT')
bpy.ops.mesh.normals_make_consistent() bpy.ops.mesh.normals_make_consistent()
bpy.ops.mesh.dissolve_limited()
triangulate_object(obj) triangulate_object(obj)
bpy.ops.object.mode_set(mode='OBJECT') bpy.ops.object.mode_set(mode='OBJECT')
if delete_after: if delete_after:
@ -70,11 +73,13 @@ class BlenderEngine(Base3DEngine):
select_object(obj) select_object(obj)
bpy.ops.object.modifier_add(type='BOOLEAN') bpy.ops.object.modifier_add(type='BOOLEAN')
mod = obj.modifiers mod = obj.modifiers
mod[0].name = 'UNion' mod[0].name = 'Union'
mod[0].operation = 'UNION' mod[0].operation = 'UNION'
mod[0].object = other_obj mod[0].object = other_obj
mod[0].solver = 'CARVE'
bpy.ops.object.modifier_apply(apply_as='DATA', modifier=mod[0].name) bpy.ops.object.modifier_apply(apply_as='DATA', modifier=mod[0].name)
delete_object(other_obj) delete_object(other_obj)
return obj
def delete_object(obj): def delete_object(obj):
select_object(obj) select_object(obj)
@ -85,9 +90,13 @@ class BlenderEngine(Base3DEngine):
bpy.ops.object.mode_set(mode='OBJECT') bpy.ops.object.mode_set(mode='OBJECT')
deselect_all() deselect_all()
exterior = add_ring(name, exterior, minz, maxz) exterior = add_ring(name, exterior, minz, maxz)
all_interiors = []
for i, interior_coords in enumerate(interiors): for i, interior_coords in enumerate(interiors):
interior = add_ring('%s interior %d' % (name, i), interior_coords, minz-1, maxz+1) interior = add_ring('%s interior %d' % (name, i), interior_coords, minz-1, maxz+1)
subtract_object(exterior, interior, delete_after=True) all_interiors.append(interior)
if all_interiors:
joined_interiors = join_objects(all_interiors)
subtract_object(exterior, joined_interiors, delete_after=True)
return exterior return exterior
def add_ring(name, coords, minz, maxz): def add_ring(name, coords, minz, maxz):
@ -185,8 +194,10 @@ class BlenderEngine(Base3DEngine):
self._add_slope(bounds, altitudearea.altitude, altitudearea.altitude2, self._add_slope(bounds, altitudearea.altitude, altitudearea.altitude2,
altitudearea.point1, altitudearea.point2) altitudearea.point1, altitudearea.point2)
self._subtract_slope() self._subtract_slope()
# replace this by limiting the slope instead self._collect_last_polygon_for_join()
self._add_polygon(name, altitudearea.geometry.geom, min_altitude-700, min_slope_altitude) self._add_polygon(name, altitudearea.geometry.geom, min_altitude-700, min_slope_altitude)
self._collect_last_polygon_for_join()
self._join_polygons()
else: else:
self._add_polygon(name, altitudearea.geometry.geom, min_altitude-700, altitudearea.altitude) self._add_polygon(name, altitudearea.geometry.geom, min_altitude-700, altitudearea.altitude)