create_shadertext.py (pymol-open-source-2.2.0) | : | create_shadertext.py (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 73 | skipping to change at line 73 | |||
outputfile = openw(outputfile) | outputfile = openw(outputfile) | |||
include_deps = defaultdict(set) | include_deps = defaultdict(set) | |||
ifdef_deps = defaultdict(set) | ifdef_deps = defaultdict(set) | |||
# get all *.gs *.vs *.fs *.shared from the two input directories | # get all *.gs *.vs *.fs *.shared from the two input directories | |||
shaderfiles = set() | shaderfiles = set() | |||
for sdir in [shaderdir, shaderdir2]: | for sdir in [shaderdir, shaderdir2]: | |||
for ext in ['gs', 'vs', 'fs', 'shared']: | for ext in ['gs', 'vs', 'fs', 'shared']: | |||
shaderfiles.update(map(os.path.basename, | shaderfiles.update(map(os.path.basename, | |||
glob.glob(os.path.join(sdir, '*.' + ext)))) | sorted(glob.glob(os.path.join(sdir, '*.' + ext))))) | |||
varname = '_shader_cache_raw' | varname = '_shader_cache_raw' | |||
outputheader.write('extern const char * %s[];\n' % varname) | outputheader.write('extern const char * %s[];\n' % varname) | |||
outputfile.write('const char * %s[] = {\n' % varname) | outputfile.write('const char * %s[] = {\n' % varname) | |||
for filename in shaderfiles: | for filename in shaderfiles: | |||
shaderfile = os.path.join(shaderdir, filename) | shaderfile = os.path.join(shaderdir, filename) | |||
if not os.path.exists(shaderfile): | if not os.path.exists(shaderfile): | |||
shaderfile = os.path.join(shaderdir2, filename) | shaderfile = os.path.join(shaderdir2, filename) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |