From a7cf85a581ac0163b8da815123cfe95ee8b56557 Mon Sep 17 00:00:00 2001 From: Recrown Date: Thu, 20 Apr 2017 00:24:29 -0500 Subject: [PATCH] changed go to arrow to generic shape, added to skin definition and removed object version --- android/assets/uiskin.atlas | 2 +- android/assets/uiskin.png | Bin 2894 -> 4585 bytes core/src/zero1hd/polyjet/Polyjet.java | 12 +++++-- .../src/zero1hd/polyjet/screens/MainMenu.java | 2 +- .../zero1hd/polyjet/ui/MoreOptionsPage.java | 14 ++++---- core/src/zero1hd/polyjet/ui/OptionsPage.java | 31 +++++++----------- .../polyjet/ui/builders/ArrowButton.java | 15 --------- .../polyjet/ui/builders/MusicSelectable.java | 3 -- 8 files changed, 30 insertions(+), 49 deletions(-) delete mode 100755 core/src/zero1hd/polyjet/ui/builders/ArrowButton.java diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index c04f622..4c94c56 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -244,7 +244,7 @@ left-button-down orig: 12, 20 offset: 0, 0 index: -1 -point-arrow +goto rotate: false xy: 1, 123 size: 101, 132 diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index d9190a8db8125709113188188415bb7958faefe2..168ae31066561901dcb0a7b6dfa5d169c3ab90b3 100755 GIT binary patch delta 3837 zcmcha`8U*!7so%dnKAasnx)B-B|D)|lQmoR9wJMTQDHFl>NCc^uh}J8qOwI%aiG2eA z0Pb_%>O256WpFS(5dZ)KY%Cp&vlJ6xs;a74&8J~TMn+9*XQ1GQP=zA^KmelMMSIr& zzrg>$<$oOi>krufM#}tw$4z| zc=@o&aiwxA4nNcf5ar#{3qAP_8sjahs?{;^Jm&e_gRf5-i67WF4?};KEMIfCILyBF zp?k19;J)eEXPY6!yLnz_c_EIf1P7Y5q?3)g68xWctW73kk+Jg+GwD7Iy5?@EbszqH z`|C(D0>$?E9J(&OBG0XD?kPYYR2jeh z@>17kAAYY^8YqaAHb2E%c$=C&D_fIp4Z*ulyr|w~f2_gRTLyGmq&V5_!>6KIJ2Xu? zxOaRewDmlQH6)GKr6dRL{V<+9dp?B5B0*PsKJZ5Fu89m9V9d-p9#l=I=Knia&e|bx z9cUN7f?=?Uk>txh_zO^{EIR%jTqnyaTnsD4l*DakX+R);6% zJT=Z{$_kAf(IlhAN1@zCX6CU*)qrPF&WkY+3~tgpFGT`wRTZLm+eQ2_W^V)^RI2pN zU-yV0n>6w-e*60odl_XyvI(YE(I++YkyFu{it2~P-Zh}{AAZ&>FE_@1A!=-mORxE{ z5vVKhG#g1AQPgq;nEia094hk}zB%a`pwU~ww2JShqP?L%C5pu|A>uvPaJt7E@F4Z# z*eS0QQYvnpy;k|TQxMySA^6{=`D``4fA6zZk|N7c*46WanUdF3aQ>dLFnN}3bS|qB zx2mpNntCfB;F<(S7|}54&-#IU*r39a_mTxLFLvHd0*2HBtHJIb_dGD4C@0N|CnoB2Qg>o8*m3#Y^d+dJhxObiQ8U_$#_& zd|xUB^+U3`7IZF=)$YP^tc4HpAD47%a1Zpe-B(se@>_frIBFK@<`RR&LICp-o6Ifj z!_)0=#|IEjo+n4m)xXikQOR_SNAczHFsx{57r^B}4wvQ!I5DJmaPVRdAXb6bXhSWs zwB)P+2kf(WCpanG6nSrv<@-a_6mqo$o>;1-YdGN7SS&{PB3FFEbV;k=5g^tmg!=)x z$yaf_WlO@8^wqs+T&4alg|7^!knVF5ILxVVrf%dyS1rw>UqSeq#GeXG z1~MlwR`l$drE`zKtC`Og=a@YU+jg37Yl-)Z0sZ|N!>>6p zHHnsVRIjc{+Z~;@(FBF9)s?-8wY5R9o1C4xxYktS#nSa2?Txs@Jg~AQoJF)2<`vny9gMb5-z3^}+NnhNd#<3EciW+GU+e z29zLwJ-ji?X<1XbOHrBfl!p=I(A5hhPWDMj(e;T! zpc6RX~BrKZw84vlr=BKaU(8tWN?*7-MZIUCDHsfZVXPHLr!8u zWyCaCw)$r<*stApe1?L{%8x+QKecXhM{R%_L@cg)pEO4rA~V1n6CFUrh6{I+-;NUip7|-g{KIv3L#q9Vv{rEhalQ@k-++Cv_j&<7I+zBH znxVJ+J34s0tg+a|%@rLo3WZ# zYzW4w9$3%JzY67^`$>)|7G|5SIS4-5b$3$(wejmYcflvbC7uU?tLpFoJ<{Uk@LKo& zR2sZEzBs^>iDN2+H2{$AN9K!1S7I{klql}FMl!g3=40>@bnOo8=C1rxAV!}R|NVZ8 zPU2_}Y?5;(Wt5_iFWn4q$Ld&iQDE8+77U@cQ(?4*5|iL}%UF7D#mJNs~p#E{59(h_;y4pPe7g%z{PslN%msb^;lhg6v56oMrU z{3xPcp+=c=Up7T4AoVL7gx(h=0iEKCMfElNoIr1NqD4L18@sbR&rtf1KxT(}_pQ_dm zoe}buuYbaPn3-kfIai=Nzzopvn}87NB#;e=xGRJ4Kgb>+Hmb@?q( zwoNjrv5`gFSiEwbGC+)GPP#w8Iq{wfr-dV*M5y@jSOH~z!tzr%^?PnEO?E32C*U+a z#&eU5$5tlL@XcY+ARhgfjOa}hC|#vR@^Q3I5?AW=qyh_3cIuFYDrRNk8NhXFP9e3f zm5YPw5E!?U&TyTjZVps;rh`412mbgsPe{n>@wl)^et!!J|Hr1|V~k8^KUu?>?F$Bm z9=Qgr+Bl7LR!d>l-|vq+yp^REs1P`%ZyljjdR13Ky15ISs=VM*sV6h}rt94eoB<*c zU;8tB>b2#A_bNH9K_`9CU0K#kuNXD$T?@8FeTp?UME%qh^I8DVD0jOYaCP8ybZ)D} z?B+waDhv0GS$!R675nR7!iIXC8-`~k*Ft8Ww!Gf~y64ucrT1h;rY^%`sR+z3^E)fg z>(z`D{cYpGwYS_;xaSG*?YyZW`E|!95N82wc8=S%VKEmkJ?_b&mmc>d1T0)#<+TSd z6)0kZBI=lu9Q_}fT%;SIz;=$9N~upur7|^VZMirg=8qw@O4xxD zTXD;-PsJQeC_zycyC4=`97n?FdP9mRiE=Q6T!=(U3EiMyIGLXx_kJsg1onVisa4Ts%U#Zmqxal&gli>mG+z zpVw7_@~{p4-Op+$P@+#cCd$hY))0E%Et3tjwU@7je#e|WF^Y%mTCG> zCcgLVUae+>@E~&dGbh>jrKVnJBb9qt&o-~jHjk&H*EPeBohmzL5Ij9qQrl6zyVlsKTaEBW2`I%K)MJA+uy7Drg>V4pTL{_$B>7oH zL!e>gfnjiT$ixe|2ka5ZMBl@P@||XAmB9@btk-BJOBLvsFV#YElRM~<-eN+rSYv7i z@EbT@Thu8;n#mJS0s5#rdC=XWcw5EVAmoH*G(egF5C#W9j>>436bikoJ?Vh(#p$_5 zxiHaTzqXHo%ktFwh*)K+VA9YmnA`aU!zkHAA1wxv~T;l*4w*xCCkT1xN|RNN!HsWrS0c zL6G+4QBn+zX46!iD#!9dzKc>=bR`CXYf?sYQAL#~wjq4Fz|4dw1_;t&6>G_g`vFaA zLzxFX&Vbn>h?3jsI2 zO#+vZBta?E0joXGk~fj0r3NP}-2W&;MVL}*z(?dA>TsSHSbCSw?Ip2DZ7ur{vl}?_ z$dJDh$A;^q-NRFZv-6F^V+$hpBgE;+9T^!h>njc4s47wC`pUyBs_wfQkqX+Y7nFq(9rI@Y0 zl9OlDGeHckX)`H9>jTr5{L;-QIL?5y;_{Y0`IaAIjV;#~+hp z-4@!`HI-E1{E)W+fleh0+w6byG{zH_X)3;fam?E-=}`q!$o=Q;R!N;Y|4D z81&07kpi7oA3U*R^#{e0@0H=gwsu}j-BQM39TyB!Or(;$hDNN*6qxoG;QBhMIo#JV zV>pRXK@8<(s}jRhrFBHqQwhQZQZBu<5S2^Ygth_fG36G`{Wmk}~Nf(8257A)5JX#%b|HkJ9-_y~*RzWe4 zWx$-7HGngh1S*3!|U+RQuV-)7*2zW@LL diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index c20ac33..760c6fa 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -18,6 +18,7 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import com.badlogic.gdx.math.MathUtils; +import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox.CheckBoxStyle; import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle; @@ -177,10 +178,15 @@ public class Polyjet extends Game { SliderStyle defaultSlider = new SliderStyle(defaultSkin.getDrawable("default-slider"), defaultSkin.getDrawable("default-slider-knob")); defaultSkin.add("default-horizontal", defaultSlider); - ImageButtonStyle infoButton = new ImageButtonStyle(); + ButtonStyle infoButton = new ButtonStyle(); infoButton.up = defaultSkin.getDrawable("holo-pane"); infoButton.down = defaultSkin.getDrawable("holo-pane-down"); - defaultSkin.add("info-pane", infoButton); + defaultSkin.add("info-button", infoButton); + + ButtonStyle arrowButton = new ButtonStyle(); + arrowButton.down = defaultSkin.getDrawable("goto"); + arrowButton.up = defaultSkin.getDrawable("goto"); + defaultSkin.add("arrow-button", arrowButton); LabelStyle defaultLabel = new LabelStyle(); defaultLabel.font = defaultSkin.getFont("default-font"); @@ -208,6 +214,8 @@ public class Polyjet extends Game { SelectBoxStyle defaultSelectBox = new SelectBoxStyle(defaultSkin.getFont("default-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("default-select"), defaultScrollPane, defaultList); defaultSkin.add("default", defaultSelectBox); + + Gdx.app.debug("Prelaunch Debug Info", "UI Skin has been defined."); } @Override diff --git a/core/src/zero1hd/polyjet/screens/MainMenu.java b/core/src/zero1hd/polyjet/screens/MainMenu.java index 14e5ff2..f84b0a1 100755 --- a/core/src/zero1hd/polyjet/screens/MainMenu.java +++ b/core/src/zero1hd/polyjet/screens/MainMenu.java @@ -84,7 +84,7 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { } }); - Gdx.app.debug("Post Transition", "Beginning screen setup for Mainmenu."); + Gdx.app.debug("Post Transition", "Beginning screen setup for Main menu."); } @Override diff --git a/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java b/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java index 68b46b9..5077b6a 100755 --- a/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java @@ -2,13 +2,13 @@ package zero1hd.polyjet.ui; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Vector3; -import com.badlogic.gdx.scenes.scene2d.InputEvent; +import com.badlogic.gdx.scenes.scene2d.Actor; +import com.badlogic.gdx.scenes.scene2d.ui.Button; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.maps.KeyMap; -import zero1hd.polyjet.ui.builders.ArrowButton; import zero1hd.polyjet.ui.builders.GraphicsTable; import zero1hd.polyjet.ui.builders.SetControls; @@ -32,14 +32,12 @@ public class MoreOptionsPage extends Page { addActor(graphicsSettings); graphicsSettings.setVisible(false); - ArrowButton backArrow = new ArrowButton(core.defaultSkin); - backArrow.setRotation(90f); + Button backArrow = new Button(core.defaultSkin, "arrow-button"); backArrow.setPosition(30, getHeight()-backArrow.getHeight()-10); - backArrow.addListener(new ClickListener() { + backArrow.addListener(new ChangeListener() { @Override - public void clicked(InputEvent event, float x, float y) { + public void changed(ChangeEvent event, Actor actor) { targetLocation.y = 0.5f*Gdx.graphics.getHeight(); - super.clicked(event, x, y); } }); addActor(backArrow); diff --git a/core/src/zero1hd/polyjet/ui/OptionsPage.java b/core/src/zero1hd/polyjet/ui/OptionsPage.java index 9817157..fd9364c 100755 --- a/core/src/zero1hd/polyjet/ui/OptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/OptionsPage.java @@ -8,17 +8,16 @@ import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; +import com.badlogic.gdx.scenes.scene2d.ui.Button; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.ProgressBar; import com.badlogic.gdx.scenes.scene2d.ui.Slider; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.screens.CreativeDebugScreen; -import zero1hd.polyjet.ui.builders.ArrowButton; public class OptionsPage extends Page { Table optionsTable = new Table(); @@ -28,7 +27,7 @@ public class OptionsPage extends Page { private Polyjet core; private byte goToScreen; - private ArrowButton backSymbol; + private Button backSymbol; public OptionsPage(final Polyjet core, final Vector3 targetPosition, final MoreOptionsPage moreOptionsPage) { this.core = core; optionsTable.defaults().padTop(5f).padBottom(5f); @@ -104,15 +103,13 @@ public class OptionsPage extends Page { //Back button - backSymbol = new ArrowButton(core.defaultSkin); - backSymbol.addListener(new ClickListener() { + backSymbol = new Button(core.defaultSkin, "arrow-button"); + backSymbol.addListener(new ChangeListener() { @Override - public void clicked(InputEvent event, float x, float y) { + public void changed(ChangeEvent event, Actor actor) { targetPosition.x = 0.5f*Gdx.graphics.getWidth(); - super.clicked(event, x, y); } }); - backSymbol.setRotation(180); backSymbol.setPosition(10, (getHeight()-backSymbol.getHeight())/2); addActor(backSymbol); @@ -121,14 +118,12 @@ public class OptionsPage extends Page { addActor(optionsTable); - ArrowButton keybindSettings = new ArrowButton(core.defaultSkin); - keybindSettings.setRotation(270f); - keybindSettings.addListener(new ClickListener() { + Button keybindSettings = new Button(core.defaultSkin, "arrow-button"); + keybindSettings.addListener(new ChangeListener() { @Override - public void clicked(InputEvent event, float x, float y) { + public void changed(ChangeEvent event, Actor actor) { moreOptionsPage.setControlType((byte) 0); targetPosition.y = -0.5f*Gdx.graphics.getHeight(); - super.clicked(event, x, y); } }); keybindSettings.setPosition(optionsTable.getWidth()/3, optionsTable.getY()); @@ -137,14 +132,12 @@ public class OptionsPage extends Page { controlsSection.setPosition(keybindSettings.getX()+(keybindSettings.getWidth()-controlsSection.getWidth())/2, keybindSettings.getHeight()+keybindSettings.getY()); addActor(controlsSection); - ArrowButton graphicsSettings = new ArrowButton(core.defaultSkin); - graphicsSettings.setRotation(270f); - graphicsSettings.addListener(new ClickListener() { + Button graphicsSettings = new Button(core.defaultSkin, "arrow-button"); + graphicsSettings.addListener(new ChangeListener() { @Override - public void clicked(InputEvent event, float x, float y) { + public void changed(ChangeEvent event, Actor actor) { moreOptionsPage.setControlType((byte) 1); - targetPosition.y = -0.5f*Gdx.graphics.getHeight(); - super.clicked(event, x, y); + targetPosition.y = -0.5f*Gdx.graphics.getHeight(); } }); graphicsSettings.setPosition(optionsTable.getWidth()*2/3, optionsTable.getY()); diff --git a/core/src/zero1hd/polyjet/ui/builders/ArrowButton.java b/core/src/zero1hd/polyjet/ui/builders/ArrowButton.java deleted file mode 100755 index d4538c4..0000000 --- a/core/src/zero1hd/polyjet/ui/builders/ArrowButton.java +++ /dev/null @@ -1,15 +0,0 @@ -package zero1hd.polyjet.ui.builders; - -import com.badlogic.gdx.scenes.scene2d.actions.Actions; -import com.badlogic.gdx.scenes.scene2d.ui.Image; -import com.badlogic.gdx.scenes.scene2d.ui.Skin; - -public class ArrowButton extends Image { - public ArrowButton(Skin skin) { - super(skin.getDrawable("point-arrow")); - setOrigin(getWidth()/2, getHeight()/2); - setPosition(10, (getHeight()-getHeight())/2); - addAction(Actions.forever(Actions.sequence(Actions.alpha(0.5f, 1.5f), Actions.alpha(1f, 1.5f)))); - - } -} diff --git a/core/src/zero1hd/polyjet/ui/builders/MusicSelectable.java b/core/src/zero1hd/polyjet/ui/builders/MusicSelectable.java index c9e3077..94ea0ff 100755 --- a/core/src/zero1hd/polyjet/ui/builders/MusicSelectable.java +++ b/core/src/zero1hd/polyjet/ui/builders/MusicSelectable.java @@ -7,12 +7,9 @@ import com.badlogic.gdx.Preferences; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.ImageButton; import com.badlogic.gdx.scenes.scene2d.ui.Skin; -import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent; import com.mpatric.mp3agic.ID3v2; import com.mpatric.mp3agic.InvalidDataException; import com.mpatric.mp3agic.Mp3File;