From f149bf36aa73f18ec885bbfc1512be7823db6da4 Mon Sep 17 00:00:00 2001 From: fgnm Date: Thu, 15 Oct 2020 10:44:09 +0200 Subject: [PATCH] Use Transform command to rotate tiles --- assets/plugins/plugin-tiled-0.0.2.jar | Bin 52938 -> 53099 bytes .../h2d/common}/TransformCommandBuilder.java | 9 +++---- .../plugin/tiled/tools/DrawTileTool.java | 25 ++++++++---------- .../commands/ChangeOriginPointPosition.java | 5 ++-- .../view/stage/tools/TransformTool.java | 4 +-- .../AbstractTransformStrategy.java | 5 +--- .../transformStrategy/BasicStrategy.java | 6 +---- .../ColorPrimitiveStrategy.java | 2 +- .../transformStrategy/CompositeStrategy.java | 2 +- .../transformStrategy/ITransformStrategy.java | 2 +- .../transformStrategy/LabelStrategy.java | 2 +- .../transformStrategy/NinePatchStrategy.java | 2 +- 12 files changed, 27 insertions(+), 37 deletions(-) rename {src/main/java/games/rednblack/editor/utils => hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common}/TransformCommandBuilder.java (90%) diff --git a/assets/plugins/plugin-tiled-0.0.2.jar b/assets/plugins/plugin-tiled-0.0.2.jar index 3828bad8c9803ded0513de0a70651b625b06740f..d00300d8fa82e94d05efacf64926ea66a78fdb90 100644 GIT binary patch delta 4422 zcmZWtXIK;6)(xR39U?sxk)njo3rJ{cC{hDRFQEpJUZkspCWNA(0fI)PNoXQqqzOt3 zAT0uhB1NRBh$0|e#EZlCeD`^un;*0GURi6;IcMh2n!Y^RmB+NK=Ek&iOd!z7lc4uj zX7^aH)Bc47F#yVC0eG+c7jPUj8UP|`F0mc;79{oR0X;epXod+lbQgxZ&>=vYqcNic zG-fCj+%*QyzcuM5!#WL61f66C14Rsz-7)i?nVuHV&#@T*|H!aM00fB$$)N|B3w)hG zfuk2T1PBY^+7p0>Uh*#WU&7+q-frcF~!$(A7)Im?FTD$ndj-xS0oP8pe>WV(VcC$GWYK z%6Yw471SDzuBnl+dUyHCx}B0&W)8lx+n7LA5&Q%+i2`HIMMl>uU08i{-1cu2r(lV{WMwOoe&@L9E*x4DN5+wFzi*Pw&pB7|_VXdV zAD=|taCjohZplXs8eq~!wOcS7G`RCiOy8Aq`m93a3HUL*Y4E639oem%g;88gHiU6l zo`EGyO;N4hwa-#A6;Ca(C}E&f+m)QFtO^4=s>$iOt;UR(?_ha0q}LypsefeWCw^@h zSDrXY3W`sBuY@EEGW-!AbjvO8N{II8P_~}&u`FJURGEItQYNW0x(lQF@h`RJWwG_AI$XG@tiPZ?Qqjf)( z>hH8NjWuc_1>c+@yyG9|vz}j1dRUyM231)s2CFFf%z2zsxXrm@V4F0;(xN(|pP{_= zQ6{VQWK7b6L6zH|4bTMQU5mXhl&=*!BkN^hT4CvO{s50&RV=zSE*13 zoc(p97mY~b*>=*-Suo+34(55!$1Y_NCPwQ!|E?1K6loS1qJ^PvvqnjawWUeRBM+CV zH+q-7`mgCT%dXmB5JtHNPBVVFoEZ5fl%L}pc_-p>j?c)A5!E5_9F?G!g7mFjx`Zd& zm4%6V&z*lHCi<#x40W4Rg|9i^YVWhIl)J{xK#=fr%~k1$xEIuVpY1SE zlsT3;sE|%ipBKTxELqG|>d;~5Yv+Hj`})_&E1RQ2YV@@i{1=!))Ej) z_ocg?ctxy4zgpna>&Y`7(qBw3+0|x+7n{D<57zca#H7A+_yfC~9-^NtT4>v?cX}JX zCFW{AaBgFT8-vr8s#1?f`{%H{Ng{9Uco|%gv@h|?wMjG*jGaBLF z)gD7#qA-j*iZTSc)`oKrg=?rL(X+Qtpf$0{=hku{qOGQN+)Ll5XNeA>E&GsH3xW>V z%WGwcJ!nlzv+FQ6jQS}%NR8cWs6b`HK2~ctHL(=U;x4aaIJpbr3`-PY-jMNVypa<{ zYu~&o_YGGoqND1eEIFUUxngcIvhl?4Z~$^g6Qil4{DIH!!_aeN2Z=>ma_*V6gURSZ z7E5rCnqhc2rbxUwKaY)`eT2jUWcuxAbFhcCN8tYr(nj> zgT)K!YH4`~%4oUSJw_dZ=UW)>F*s+hnexweG@Q*e>j4*&ILlS$FB*Cc%hdKEpq!S= znD4`gU`*n}p_3>!xPLCg1wwE@6(RP7zkanHjXZ+37CVwZnGSqh9v}VmwrX`>p`ReaSE}m!@}(T-%9X+J5@{G^ zhe1d_g=J<%^dDyHPkZtU@@bEc(uF@UBdN+q80e(pn#ygF#%->{$ zb!hhGC2z~ubvxek5#eCEM5IdH{4&B)v_MLf!SU%@sZWvLa@hkdjF5w(a85Lnj@TK1XM z|CJ_pxrsP@If`4UD24BAK3zoivk}fD-cx304%4#dW*=vf_4BpLc+I-MdtfMXtdL5+ zTQx$y%;nH=Ims}}qk*gT>KE99ei&>E6J}0bgFZ1240MU7eD^PkP-XPWM&BPgBW#iy zadF(*@<3Aej`7nRh}y4L*{AmgxvwuP5NMMwwA~IlVAK})!(Y&3voDn>(;dpnIg7{s zP;yx4cKPzNdXuXA6TXQuZ)V3l9c$nn5w6`1+=SCNZNdpPX1dy+KK|HLo^if|`IsNe zw~i{iH>aQ}Wg_xh;SiU!flYzYh)&5{adbIFP1NJ8@4!?UL;VwmPH%?4z$t#uxGQ}L2FQ9?E= zW`)kLO7>$LPpx2%bUj8EGWiM1Ii7QsUmow4fiSo`TrW$js^fSf2VOG}7p76;zxfRk zH{X}RXm!^AxuQox`b9X@fWmN}6z3I5n(P28i%nZ9dk{a*B3W%iM2+)DOzUu#a4bs`JcG~(3#PNZ_j{d{^^ zJ3cd!36Whhy;2pE@jSa$%HFOrOxc$e?IEk0&7EP3#(T*t*>o7`-4p5|mYm+-{c|`J zG0ND*x>M9a!Ld#C5|V>r*sd&ycX%h`na(>IHly^KB2_T3U{i+6R&Wg)_-eVkr`1Pz zhm^9Vp^-^MmKyA*Q+{65$dXs_$SkCE-H*eB&T4G(p|2sCfpa$Pknj*q(E*yIeuvlTt5cM5^+ZENwj7d`L_ znjwDWe|D?U_vFrEk#@CabtwMaH`LbN(q2MiYv>M#Fy)e0RLnBIfBM%t8e%AL0rjc2 zXLX?T z1Lj@_Oz9!1Z1CUn<`pixYaoKCnm_9^&wsoZi%|8XkkoR*_DiggnHc+bzN@5j^N{a# zxp^0hH7A3$34>n@&M2iSz1r1*ebHo$f^Q~U>`^!`5tcL82`@4TuM>(JpS#i73hP## z9!S9G+7+j~t1BJDFUKTP{Yyug5=07HqOt^c_!PSrLeWv+tw;!KWNNwzr1@K^jf%M7 zi$v;!+qc;&>4a?Q^XS;spF##)v(Gdxve#hkO4e?Hs0mB;oZ*h`fUi%T)(8?D+lN^}GDS zx8!5s2M5q!do!VigQW{+f?^+S$Z%7xTXnsC=lz*pX;JU%O?ghCR+Dc(Q*~ZGAuYtl z^w9i{%-ax8HV>UEbLwEKZSoUtlEDht^j5sNlb73H(W@owp1bEn8xHxIs@*?C@yTW1 zWB+sFUonr=4fg|b8c9X_9t#kndW{kwK&moB=>tSAivL*h!foj|Z~e`51^x8ww4i?v zTk=j~0IUH)#(=dY=*@A6OAd8B4slCS>TEznYsmAa(`NvI%-BJo3qV9G=;tQ+VQqj3 zq^`SfkDd7YI>*i#Jn|ecT&^t~z|uBF0H@lH(`)jes77WSx^BkSgfEzZY>1>bOE01>A)H#rbU?#R2@pv8UtSq!KsbmJz`gASUJ2ZXBfo(=Krg#-vzr^!fVpV@|5E|( z?|20toFY~lcc<^z@u&|9jyk49eAxcSLDLTfgM*J83OHo{u>*BPng69UaCQA$z_JI9 zC}=AVdM;KrMHs_~koEv_$IrIP7oP7r1MGp!B zLdCS2=Cz||!gF-oYX3R~Y21-e8rMGv1#YrD2n7e{9-V+1PMe|t7A?aCQO<)OmE+1O LP=>a)zt;Z%k&g1L delta 4282 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 XH>!v{W2)fq)x@)72xigFgS7txKI?ZV diff --git a/src/main/java/games/rednblack/editor/utils/TransformCommandBuilder.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/TransformCommandBuilder.java similarity index 90% rename from src/main/java/games/rednblack/editor/utils/TransformCommandBuilder.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/TransformCommandBuilder.java index 0c12545f..05000f09 100644 --- a/src/main/java/games/rednblack/editor/utils/TransformCommandBuilder.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/TransformCommandBuilder.java @@ -1,13 +1,12 @@ -package games.rednblack.editor.utils; +package games.rednblack.h2d.common; import com.badlogic.ashley.core.Entity; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; -import games.rednblack.h2d.common.MsgAPI; -import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; +import org.puremvc.java.interfaces.IFacade; /** * Created by Osman on 01.08.2015. @@ -74,12 +73,12 @@ public class TransformCommandBuilder { setOrigin(2, x, y); } - public void execute() { + public void execute(IFacade facade) { // check if payload is worth sending Object[] newData = (Object[]) payload.get(2); for(Object o : newData) { if (o != null) { - HyperLap2DFacade.getInstance().sendNotification(MsgAPI.ACTION_ITEM_TRANSFORM_TO, payload); + facade.sendNotification(MsgAPI.ACTION_ITEM_TRANSFORM_TO, payload); return; } } diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java index eb4c4dbd..2cdf5494 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java @@ -11,6 +11,7 @@ import games.rednblack.editor.renderer.components.TextureRegionComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.data.ProjectInfoVO; import games.rednblack.editor.renderer.utils.ComponentRetriever; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.h2d.common.view.tools.Tool; import org.puremvc.java.interfaces.INotification; @@ -94,23 +95,19 @@ public class DrawTileTool implements Tool { // there is already other tile under this one if (textureRegionComponent.regionName.equals(tiledPlugin.getSelectedTileName())) { //rotate + TransformCommandBuilder commandBuilder = new TransformCommandBuilder(); + commandBuilder.begin(entity); TransformComponent transformComponent = ComponentRetriever.get(entity, TransformComponent.class); if (transformComponent.scaleX > 0 && transformComponent.scaleY > 0) { - transformComponent.scaleX *= -1f; - return; - } - if (transformComponent.scaleX < 0 && transformComponent.scaleY > 0) { - transformComponent.scaleY *= -1f; - return; - } - if (transformComponent.scaleX < 0 && transformComponent.scaleY < 0) { - transformComponent.scaleX *= -1f; - return; - } - if (transformComponent.scaleX > 0 && transformComponent.scaleY < 0) { - transformComponent.scaleY *= -1f; - return; + commandBuilder.setScale(transformComponent.scaleX * -1f, transformComponent.scaleY); + } else if (transformComponent.scaleX < 0 && transformComponent.scaleY > 0) { + commandBuilder.setScale(transformComponent.scaleX, transformComponent.scaleY * -1f); + } else if (transformComponent.scaleX < 0 && transformComponent.scaleY < 0) { + commandBuilder.setScale(transformComponent.scaleX * -1f, transformComponent.scaleY); + } else if (transformComponent.scaleX > 0 && transformComponent.scaleY < 0) { + commandBuilder.setScale(transformComponent.scaleX, transformComponent.scaleY * -1f); } + commandBuilder.execute(tiledPlugin.facade); } } } diff --git a/src/main/java/games/rednblack/editor/controller/commands/ChangeOriginPointPosition.java b/src/main/java/games/rednblack/editor/controller/commands/ChangeOriginPointPosition.java index 6583ab2a..26805f33 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/ChangeOriginPointPosition.java +++ b/src/main/java/games/rednblack/editor/controller/commands/ChangeOriginPointPosition.java @@ -1,10 +1,11 @@ package games.rednblack.editor.controller.commands; import com.badlogic.ashley.core.Entity; +import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.controller.SandboxCommand; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.view.ui.validator.FloatInputValidator; import games.rednblack.h2d.common.view.ui.dialog.MultipleInputDialog; import games.rednblack.h2d.common.view.ui.listener.MultipleInputDialogListener; @@ -25,7 +26,7 @@ public class ChangeOriginPointPosition extends SandboxCommand { TransformCommandBuilder commandBuilder = new TransformCommandBuilder(); commandBuilder.begin(entity); commandBuilder.setOrigin(Float.parseFloat(input[0]), Float.parseFloat(input[1])); - commandBuilder.execute(); + commandBuilder.execute(HyperLap2DFacade.getInstance()); } @Override diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java index cb3bfaf6..eb67ff6a 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java @@ -29,7 +29,7 @@ import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.editor.view.ui.FollowersUIMediator; @@ -201,7 +201,7 @@ public class TransformTool extends SelectionTool implements FollowerTransformati return; } - commandBuilder.execute(); + commandBuilder.execute(HyperLap2DFacade.getInstance()); if (transformStrategy == compositeStrategy) { compositeStrategy.swapItemFinalAndInitialStates(follower.getEntity()); } diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java index 5c9bef57..85e04e07 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java @@ -1,13 +1,10 @@ package games.rednblack.editor.view.stage.tools.transformStrategy; -import com.badlogic.ashley.core.Entity; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Pool; import games.rednblack.editor.renderer.components.TransformComponent; -import games.rednblack.editor.utils.TransformCommandBuilder; -import games.rednblack.editor.view.stage.Sandbox; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; /** diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/BasicStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/BasicStrategy.java index e3a03856..befc86be 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/BasicStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/BasicStrategy.java @@ -5,14 +5,10 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.math.Vector2; import games.rednblack.editor.renderer.components.DimensionsComponent; -import games.rednblack.editor.renderer.components.PolygonComponent; -import games.rednblack.editor.renderer.components.TextureRegionComponent; import games.rednblack.editor.renderer.components.TransformComponent; -import games.rednblack.editor.renderer.components.light.LightBodyComponent; -import games.rednblack.editor.renderer.components.physics.PhysicsBodyComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; import games.rednblack.editor.utils.RoundUtils; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ColorPrimitiveStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ColorPrimitiveStrategy.java index 943675ab..3d9f6c77 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ColorPrimitiveStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ColorPrimitiveStrategy.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.math.Vector2; import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; public class ColorPrimitiveStrategy extends AbstractTransformStrategy { diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/CompositeStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/CompositeStrategy.java index bbd0aab5..9ff49a64 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/CompositeStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/CompositeStrategy.java @@ -14,7 +14,7 @@ import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.NodeComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ITransformStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ITransformStrategy.java index 610d07c2..f202b097 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ITransformStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/ITransformStrategy.java @@ -2,7 +2,7 @@ package games.rednblack.editor.view.stage.tools.transformStrategy; import com.badlogic.ashley.core.Entity; import com.badlogic.gdx.math.Vector2; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; /** * Created by Sasun Poghosyan on 4/13/2016. diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/LabelStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/LabelStrategy.java index b0370646..8ab1a768 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/LabelStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/LabelStrategy.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.math.Vector2; import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; public class LabelStrategy extends AbstractTransformStrategy { diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/NinePatchStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/NinePatchStrategy.java index 5e78640e..a0abf584 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/NinePatchStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/NinePatchStrategy.java @@ -6,7 +6,7 @@ import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.NinePatchComponent; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.TransformCommandBuilder; +import games.rednblack.h2d.common.TransformCommandBuilder; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; /**