maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1434 from N8n5h/nav-update3

Browse source 
nav update 3
This commit is contained in:
Lubos Lenco 2019-10-14 21:07:23 +02:00 committed by GitHub
parent c70478c11e 5184794a0e
commit c6d74fc4ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
blender/arm/exporter.py
View file

@ -2418,12 +2418,18 @@ class ArmoryExporter:
# face.v.reverse()
# bpy.ops.export_scene.obj(override, use_selection=True, filepath=nav_filepath, check_existing=False, use_normals=False, use_uvs=False, use_materials=False)
# bobject.scale.y *= -1
armature = bobject.find_armature()
apply_modifiers = not armature
bobject_eval = bobject.evaluated_get(self.depsgraph) if apply_modifiers else bobject
exportMesh = bobject_eval.to_mesh()
with open(nav_filepath, 'w') as f:
for v in bobject.data.vertices:
f.write("v %.4f " % (v.co[0] * bobject.scale.x))
f.write("%.4f " % (v.co[2] * bobject.scale.z))
f.write("%.4f\n" % (v.co[1] * bobject.scale.y)) # Flipped
for p in bobject.data.polygons:
for v in exportMesh.vertices:
f.write("v %.4f " % (v.co[0] * bobject_eval.scale.x))
f.write("%.4f " % (v.co[2] * bobject_eval.scale.z))
f.write("%.4f\n" % (v.co[1] * bobject_eval.scale.y)) # Flipped
for p in exportMesh.polygons:
f.write("f")
for i in reversed(p.vertices): # Flipped normals
f.write(" %d" % (i + 1))

37
blender/arm/props_traits.py
View file

@ -308,15 +308,12 @@ class ArmEditBundledScriptButton(bpy.types.Operator):
return{'FINISHED'}
restart_required = False
class ArmoryGenerateNavmeshButton(bpy.types.Operator):
'''Generate navmesh from selected meshes'''
bl_idname = 'arm.generate_navmesh'
bl_label = 'Generate Navmesh'
def execute(self, context):
obj = context.active_object
global restart_required
if obj.type != 'MESH':
return{'CANCELLED'}
@ -327,37 +324,33 @@ class ArmoryGenerateNavmeshButton(bpy.types.Operator):
if not arm.utils.check_sdkpath(self):
return {"CANCELLED"}
depsgraph = bpy.context.evaluated_depsgraph_get()
armature = obj.find_armature()
apply_modifiers = not armature
obj_eval = obj.evaluated_get(depsgraph) if apply_modifiers else obj
exportMesh = obj_eval.to_mesh()
# TODO: build tilecache here
print("Started visualization generation")
# For visualization
nav_full_path = arm.utils.get_fp_build() + '/compiled/Assets/navigation'
if not os.path.exists(nav_full_path):
os.makedirs(nav_full_path)
restart_required = True
bpy.ops.wm.save_mainfile()
if restart_required:
self.report({'ERROR'}, 'Please restart Blender to generate a mesh representation.')
print("Failed visualization generation, please restart Blender")
return {"CANCELLED"}
nav_mesh_name = 'nav_' + obj.data.name
nav_mesh_name = 'nav_' + obj_eval.data.name
mesh_path = nav_full_path + '/' + nav_mesh_name + '.obj'
with open(mesh_path, 'w') as f:
for v in obj.data.vertices:
f.write("v %.4f " % (v.co[0] * obj.scale.x))
f.write("%.4f " % (v.co[2] * obj.scale.z))
f.write("%.4f\n" % (v.co[1] * obj.scale.y)) # Flipped
for p in obj.data.polygons:
for v in exportMesh.vertices:
f.write("v %.4f " % (v.co[0] * obj_eval.scale.x))
f.write("%.4f " % (v.co[2] * obj_eval.scale.z))
f.write("%.4f\n" % (v.co[1] * obj_eval.scale.y)) # Flipped
for p in exportMesh.polygons:
f.write("f")
for i in reversed(p.vertices): # Flipped normals
f.write(" %d" % (i + 1))
f.write("\n")
fp_build_name = arm.utils.get_fp_build().rsplit('/')[-1]
nav_mesh_path = '/' + fp_build_name + '/compiled/Assets/navigation/' + nav_mesh_name
buildnavjs_path = arm.utils.get_sdk_path() + '/lib/haxerecast/buildnavjs'
# append config values
@ -372,8 +365,8 @@ class ArmoryGenerateNavmeshButton(bpy.types.Operator):
nav_config[name] = value
nav_config_json = json.dumps(nav_config)
args = [arm.utils.get_node_path(), buildnavjs_path, nav_mesh_path, nav_config_json]
proc = subprocess.Popen(args)
args = [arm.utils.get_node_path(), buildnavjs_path, nav_mesh_name, nav_config_json]
proc = subprocess.Popen(args, cwd=nav_full_path)
proc.wait()
navmesh = bpy.ops.import_scene.obj(filepath=mesh_path)
@ -390,6 +383,8 @@ class ArmoryGenerateNavmeshButton(bpy.types.Operator):
bpy.ops.mesh.remove_doubles()
bpy.ops.object.editmode_toggle()
obj_eval.to_mesh_clear()
print("Finished visualization generation")
return{'FINISHED'}