From e474b997afd5151122cf7b6398154334bfd87ded Mon Sep 17 00:00:00 2001 From: fgnm Date: Sun, 6 Mar 2022 19:31:18 +0100 Subject: [PATCH] [editor only] Fix 9 patches with new atlas format --- assets/plugins/plugin-9patch-0.1.0.jar | Bin 22811 -> 23189 bytes assets/plugins/plugin-performance-0.1.0.jar | Bin 5900 -> 5900 bytes assets/plugins/plugin-skin-composer-0.1.0.jar | Bin 9944 -> 9944 bytes assets/plugins/plugin-tiled-0.1.0.jar | Bin 102995 -> 102991 bytes .../plugin/ninepatch/MainPanelMediator.java | 42 +++++++++++++----- .../editor/utils/asset/impl/ImageAsset.java | 2 +- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/assets/plugins/plugin-9patch-0.1.0.jar b/assets/plugins/plugin-9patch-0.1.0.jar index 2b463da61d2f99a37c8dff080d88ab4e657b16da..75c022e5800bc030ce51baa91979ed623f672446 100644 GIT binary patch delta 5499 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 delta 5132 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 diff --git a/assets/plugins/plugin-performance-0.1.0.jar b/assets/plugins/plugin-performance-0.1.0.jar index 42dea7c6aaca2c8b55fe50d01e897fddde33b038..d636e02708b4a6f7595d78a932d0020df0be7eff 100644 GIT binary patch delta 392 zcmeCt>(S#4@MdP=VqoClU@)7NHj!72Nn-azQ*UMvr&$?Ht<(imH%&m)WC2ENFzv_a z4x%@=33xMeBN?$-j60VVEHi_#n3I>0NrV}0{N#JWCP4Eii-hY9&rFtMl$!isga@pPPgIiSuOl<#WO+t~ z$=;$o7@DX@t` wCdsm;@gd9P^P)DBE5)P~Ku+%NOk1zO$-ppQn1R6o*_g&aE}%k}$v?zI0I$(hqyPW_ delta 390 zcmeCt>(S#4@MdP=VqoClU^uzcW+JZ|)5)C^O}&{xoMvS(wNe*M-82DFlLZ*9!L%Qv zJBZ#K$5qV9jby~;cPzQAV3`?=-pss=Od`y1<0sz}HUXMHSwzG^7N|Fb0SK5t1Q4)6 zC?F}o@OE;ch&b4mZV^ewx09EOD9WR&7e`j_cxJL3qtxX8B0OMSe4>&pZylK#C(AP` zO!gM#!O*OQqSrVGYoCj>v{IRtf+Wx=#KfCISGMLSC8x diff --git a/assets/plugins/plugin-skin-composer-0.1.0.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar index a62166e26d5302cb3997608a02bb63ee0c2559e1..32cdc89ed2b35e334829bc6964e4d2fee6d4723b 100644 GIT binary patch delta 512 zcmccNd&8GEz?+$ci-CcIgTZW8+C*M8CW+k>O}&{xoMvS(wNe*M-82DFlLZ*9!L%Qv z2Z-Lhkgbm&%$Ui@$_i#!DKs*1BN@8+i2~y9-xKJlP4+*PgYP< z-&`e@&%(>dB*F}L#^e)9CO~&g{-@*sw#!jj()6!m83O}DdSY&Bv3`Izit-Sk1OpR@ z00IFB1!n!7+^?)C53(5~2vZ@BtitgO)E(@TUn=t`psSTbQOnFY*-=bE6QA|k$QmZc zsn~!$z^f|BvZb*Hq}_7zOEx}!G$SU@RRJlG6$C2Ko%~!y8SIeDcQ*Cu16^$g3^IGT qxeN?j8db$6H>x?K1=>fjB^xEcme@#RTG9Yk@Ld+Dz;*H=H8B7NEpSr+ delta 486 zcmccNd&8GEz?+$ci-CcIgW=>(n~A(?Oec3vH1%c%ahjFE)Jk12b<+eyO%`CZ2Gf3w z9w2(NmLMxDm@$*Fj~~onk=xF~jb!NNeG<;Bfi*zp|n{$YzirOoceI3db{GcjPm&PkyP)qkyhf4n-|9<77uM1xo=brhuu1Y^C};pH&{Y5`aGZQdO$-2$aC$`m diff --git a/assets/plugins/plugin-tiled-0.1.0.jar b/assets/plugins/plugin-tiled-0.1.0.jar index 631de4377f3481adc930c9ed241e41c74898e25b..16b98bae1150805c92c72c0d89c612491ed32c09 100644 GIT binary patch delta 3666 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 diff --git a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java index 365dd72f..121c56b8 100644 --- a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java +++ b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanelMediator.java @@ -100,12 +100,21 @@ public class MainPanelMediator extends Mediator { private void addSplitsToImageInAtlas(String textureRegionName, int[] splits) { FileHandle packAtlas = Gdx.files.internal(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); String content = packAtlas.readString(); - int regionIndex = content.indexOf(textureRegionName); - int splitEnd = content.indexOf("orig: ", regionIndex); - String splitStr = "split: "+splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; - String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd, content.length()); - File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); - writeFile(newContent, test); + if (plugin.getAPI().getCurrentProjectVO().texturePackerVO.legacy) { + int regionIndex = content.indexOf(textureRegionName); + int splitEnd = content.indexOf("orig: ", regionIndex); + String splitStr = "split: "+splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; + String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } else { + int regionIndex = content.indexOf(textureRegionName); + String splitStr = "split: " + splits[0] + ", " + splits[1] + ", " + splits[2] + ", " + splits[3] + "\n\t"; + int splitEnd = content.indexOf("bounds: ", regionIndex); + String newContent = content.substring(0, splitEnd) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } } private void applyNewSplits(String textureRegionName, int[] splits) { @@ -120,11 +129,22 @@ public class MainPanelMediator extends Mediator { String content = packAtlas.readString(); int regionIndex = content.indexOf(textureRegionName); int splitStart = content.indexOf("split: ", regionIndex) + "split: ".length(); - int splitEnd = content.indexOf("orig: ", splitStart); - String splitStr = splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; - String newContent = content.substring(0, splitStart) + splitStr + content.substring(splitEnd, content.length()); - File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); - writeFile(newContent, test); + + if (plugin.getAPI().getCurrentProjectVO().texturePackerVO.legacy) { + int splitEnd = content.indexOf("orig: ", splitStart); + String splitStr = splits[0]+", "+splits[1]+", "+splits[2]+", "+splits[3]+"\n "; + String newContent = content.substring(0, splitStart) + splitStr + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } else { + String splitStr = splits[0] + ", " + splits[1] + ", " + splits[2] + ", " + splits[3]; + int splitEnd = content.indexOf("\n", splitStart); + String newContent = content.substring(0, splitStart) + splitStr; + if (splitEnd != -1) + newContent = newContent + content.substring(splitEnd); + File test = new File(plugin.getAPI().getProjectPath() + "/assets/orig/pack/pack.atlas"); + writeFile(newContent, test); + } // reload plugin.getAPI().reLoadProject(); diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java index a0dfbfe7..c2f6bd88 100644 --- a/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java +++ b/src/main/java/games/rednblack/editor/utils/asset/impl/ImageAsset.java @@ -84,7 +84,7 @@ public class ImageAsset extends Asset { } for (FileHandle handle : new Array.ArrayIterator<>(files)) { - projectManager.getCurrentProjectInfoVO().imagesPacks.get("main").regions.add(handle.nameWithoutExtension()); + projectManager.getCurrentProjectInfoVO().imagesPacks.get("main").regions.add(handle.nameWithoutExtension().replace(".9", "")); } }