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

Local libs fix

Browse source
This commit is contained in:
Lubos Lenco 2017-08-14 22:13:14 +02:00
parent 4be761d289
commit bc460f5129
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
blender/arm/make_renderpath.py
View file

@ -594,7 +594,7 @@ def buildNode(stages, node, node_group):
make_set_target(stage, node_group, node)
stages.append(stage)
# Bind targets
if node.inputs[2].is_linked or node.inputs[3].is_linked or node.inputs[4].is_linked or node.inputs[5].is_linked:
if node.inputs[2].is_linked or node.inputs[3].is_linked or node.inputs[4].is_linked or (len(node.inputs) > 5 and node.inputs[5].is_linked):
stage = {}
stage['params'] = []
buildNode.last_bind_target = stage
@ -604,7 +604,7 @@ def buildNode(stages, node, node_group):
make_bind_target(stage, node_group, node, target_index=3, constant_name='gbufferD')
if node.inputs[4].is_linked:
make_bind_target(stage, node_group, node, target_index=4, constant_name='gbuffer0')
if node.inputs[5].is_linked:
if (len(node.inputs) > 5 and node.inputs[5].is_linked):
make_bind_target(stage, node_group, node, target_index=5, constant_name='histogram')
stages.append(stage)
# Draw quad

24
blender/arm/write_data.py
View file

@ -56,12 +56,12 @@ project.addSources('Sources');
f.write(add_assets("Bundled/**"))
if os.path.exists('Libraries/armory'):
f.write('project.addLibrary("armory")')
f.write('project.addLibrary("armory");\n')
else:
f.write(add_armory_library(sdk_path, 'armory'))
if os.path.exists('Libraries/iron'):
f.write('project.addLibrary("iron")')
f.write('project.addLibrary("iron");\n')
else:
f.write(add_armory_library(sdk_path, 'iron'))
@ -72,7 +72,10 @@ project.addSources('Sources');
if export_physics:
assets.add_khafile_def('arm_physics')
f.write(add_armory_library(sdk_path + '/lib/', 'haxebullet'))
if os.path.exists('Libraries/haxebullet'):
f.write('project.addLibrary("haxebullet");\n')
else:
f.write(add_armory_library(sdk_path + '/lib/', 'haxebullet'))
if state.target == 'krom' or state.target == 'html5' or state.target == 'node':
ammojs_path = sdk_path + '/lib/haxebullet/js/ammo/ammo.js'
ammojs_path = ammojs_path.replace('\\', '/')
@ -80,7 +83,10 @@ project.addSources('Sources');
if export_navigation:
assets.add_khafile_def('arm_navigation')
f.write(add_armory_library(sdk_path + '/lib/', 'haxerecast'))
if os.path.exists('Libraries/haxerecast'):
f.write('project.addLibrary("haxerecast");\n')
else:
f.write(add_armory_library(sdk_path + '/lib/', 'haxerecast'))
if state.target == 'krom' or state.target == 'html5':
recastjs_path = sdk_path + '/lib/haxerecast/js/recast/recast.js'
recastjs_path = recastjs_path.replace('\\', '/')
@ -130,13 +136,19 @@ project.addSources('Sources');
assets.add_khafile_def('arm_profile')
if export_ui:
f.write(add_armory_library(sdk_path, 'lib/zui'))
if os.path.exists('Libraries/zui'):
f.write('project.addLibrary("zui");\n')
else:
f.write(add_armory_library(sdk_path, 'lib/zui'))
p = sdk_path + '/armory/Assets/droid_sans.ttf'
f.write(add_assets(p.replace('\\', '/')))
assets.add_khafile_def('arm_ui')
if wrd.arm_hscript:
f.write(add_armory_library(sdk_path, 'lib/hscript'))
if os.path.exists('Libraries/hscript'):
f.write('project.addLibrary("hscript");\n')
else:
f.write(add_armory_library(sdk_path, 'lib/hscript'))
assets.add_khafile_def('arm_hscript')
if wrd.arm_minimize == False: