ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for png->jpg converter.

Browse Source 
It's possible that there are multiple file names in single parameter, for example:
<sky-box texture="0006.png 0001.png 0004.png 0002.png 0003.png 0005.png" ... />
now it should work.

Also use is_opaque rather than has_alpha that gives better results.
This commit is contained in:
Deve 2017-08-15 22:42:53 +02:00
parent 01be800253
commit 196fe378b4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
android/generate_assets.sh
View File

@ -292,10 +292,10 @@ convert_model()
continue continue
fi fi
#IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"` IS_OPAQUE=`identify -format '%[opaque]' "$TEXTURE_PATH"`
HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"` #HAS_ALPHA=`identify -format '%A' "$TEXTURE_PATH"`
if [ "$HAS_ALPHA" = "True" ] || [ "$HAS_ALPHA" = "true" ]; then if [ "$IS_OPAQUE" = "False" ] || [ "$IS_OPAQUE" = "false" ]; then
#echo " File has alpha channel. Ignore..." #echo " File has alpha channel. Ignore..."
continue continue
fi fi
@ -312,13 +312,22 @@ convert_model()
rm -f "$TEXTURE_PATH" rm -f "$TEXTURE_PATH"
if [ -s "$DIRNAME/materials.xml" ]; then if [ -s "$DIRNAME/materials.xml" ]; then
sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \ sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
"$DIRNAME/materials.xml" "$DIRNAME/materials.xml"
sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" \
"$DIRNAME/materials.xml"
sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" \
"$DIRNAME/materials.xml"
sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" \
"$DIRNAME/materials.xml"
fi fi
if [ -s "$DIRNAME/scene.xml" ]; then if [ -s "$DIRNAME/scene.xml" ]; then
sed -i "s/name=\"$TEXTURE_NAME\"/name=\"$NEW_TEXTURE_NAME\"/g" \ sed -i "s/\"$TEXTURE_NAME\"/\"$NEW_TEXTURE_NAME\"/g" \
"$DIRNAME/scene.xml" "$DIRNAME/scene.xml"
sed -i "s/\"$TEXTURE_NAME /\"$NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
sed -i "s/ $TEXTURE_NAME\"/ $NEW_TEXTURE_NAME\"/g" "$DIRNAME/scene.xml"
sed -i "s/ $TEXTURE_NAME / $NEW_TEXTURE_NAME /g" "$DIRNAME/scene.xml"
fi fi
echo "$TEXTURE_PATH" >> "./converted_textures" echo "$TEXTURE_PATH" >> "./converted_textures"