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

Shader defines fix

Browse source
This commit is contained in:
Lubos Lenco 2017-11-08 16:49:13 +01:00
parent 8e040051db
commit be8de9cb98
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
blender/arm/make.py
View file

@ -31,8 +31,8 @@ exporter = ArmoryExporter()
scripts_mtime = 0 # Monitor source changes
code_parsed = False
def compile_shader(raw_shaders_path, shader_name, defs):
os.chdir(raw_shaders_path + './' + shader_name)
def compile_shader_pass(raw_shaders_path, shader_name, defs):
os.chdir(raw_shaders_path + '/' + shader_name)
# Open json file
json_name = shader_name + '.json'
@ -146,18 +146,22 @@ def export_data(fp, sdk_path, is_play=False, is_publish=False, in_viewport=False
defs = make_utils.def_strings_to_array(wrd.world_defs)
print('Shader flags: ' + str(defs))
# Write referenced shader variants
# Write referenced shader passes
for ref in assets.shader_datas:
# Data does not exist yet
if not os.path.isfile(fp + '/' + ref):
if not os.path.isfile(fp + '/' + ref) or state.last_world_defs != wrd.world_defs:
shader_name = ref.split('/')[3] # Extract from 'build/compiled/...'
# Shader pass exists
if not os.path.exists(raw_shaders_path + '/' + shader_name):
continue
if shader_name.startswith('compositor_pass'):
cdefs = make_utils.def_strings_to_array(wrd.compo_defs)
compile_shader(raw_shaders_path, shader_name, defs + cdefs)
compile_shader_pass(raw_shaders_path, shader_name, defs + cdefs)
elif shader_name.startswith('grease_pencil'):
compile_shader(raw_shaders_path, shader_name, [])
compile_shader_pass(raw_shaders_path, shader_name, [])
else:
compile_shader(raw_shaders_path, shader_name, defs)
compile_shader_pass(raw_shaders_path, shader_name, defs)
state.last_world_defs = wrd.world_defs
# Reset path
os.chdir(fp)

1
blender/arm/make_state.py
View file

@ -9,6 +9,7 @@ last_resy = 0
last_clip_start = 0
last_clip_end = 0
last_scene = ''
last_world_defs = ''
playproc = None
compileproc = None
playproc_finished = False