diff --git a/converter.sh b/converter.sh index 6775ce6..7382d67 100755 --- a/converter.sh +++ b/converter.sh @@ -88,6 +88,7 @@ then ulimit -s unlimited status_message info "Changed ulimit settings for script:" ulimit -a + getconf ARG_MAX fi # warn user about limitations of the script @@ -634,7 +635,7 @@ do generate_atlas () { # find the union of all texture files listed in this atlas and all texture files in our resource pack local texture_list=( $(jq -s --arg index "${1}" -r '(.[1][($index | tonumber)] - .[0] | length > 0) as $fallback_needed | ((.[1][($index | tonumber)] - (.[1][($index | tonumber)] - .[0])) + (if $fallback_needed then ["./assets/minecraft/textures/0.png"] else [] end)) | .[]' scratch_files/all_textures.temp scratch_files/union_atlas.temp) ) - status_message process "Generating sprite sheet ${1} of ${total_union_atlas}" + status_message process "Generating sprite sheet ${1} of ${total_union_atlas} [arg_max=$(getconf ARG_MAX)]" spritesheet-js -f json --name scratch_files/spritesheet/${1} --fullpath ${texture_list[@]} 1> /dev/null echo ${1} >> scratch_files/atlases.csv }