Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
payne911 committed Oct 5, 2020
2 parents 8f2e2df + dc2cc97 commit 83d804c
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class Demonstration extends BaseScreen {
private Color backgroundColor = new Color(1, 1, 1, .2f);
private int dragPieAmount = 0;
private int permaPieAmount = 0;
private int radialAmount = 0;
private int widgetAmount = 0;
private final int INITIAL_CHILDREN_AMOUNT = 5;

public Demonstration(TestsMenu game) {
Expand Down Expand Up @@ -67,12 +67,12 @@ public void show() {
setUpButtonDragPieMenu(root);
setUpRightMousePieMenu();
setUpMiddleMousePieMenu();
setUpRadialWidget(root);
setUpPieWidget(root);
setUpPermaPieMenu();
}


private void setUpRadialWidget(Table root) {
private void setUpPieWidget(Table root) {

/* Setting up and creating the widget. */
PieWidgetStyle style = new PieWidgetStyle();
Expand All @@ -83,7 +83,7 @@ private void setUpRadialWidget(Table root) {

/* Populating the widget. */
for (int i = 0; i < INITIAL_CHILDREN_AMOUNT; i++) {
Label label = new Label(Integer.toString(radialAmount++), game.skin);
Label label = new Label(Integer.toString(widgetAmount++), game.skin);
widget.addActor(label);
}

Expand Down Expand Up @@ -297,7 +297,7 @@ private void setUpPermaPieMenu() {

/* Setting up and creating the widget. */
PieMenu.PieMenuStyle style = new PieMenu.PieMenuStyle();
style.circumferenceWidth = 1;
style.circumferenceWidth = 2;
style.backgroundColor = backgroundColor;
style.downColor = new Color(.5f, .5f, .5f, 1);
style.sliceColor = new Color(.33f, .33f, .33f, 1);
Expand Down Expand Up @@ -335,12 +335,12 @@ public void updateInputPost(float delta) {
if (Gdx.input.isKeyJustPressed(Input.Keys.M)) {
dragPie.addActor(new Label(Integer.toString(dragPieAmount++), game.skin));
permaPie.addActor(new Label(Integer.toString(permaPieAmount++), game.skin));
widget.addActor(new Label(Integer.toString(radialAmount++), game.skin));
widget.addActor(new Label(Integer.toString(widgetAmount++), game.skin));
}
if (Gdx.input.isKeyJustPressed(Input.Keys.R)) {
dragPieAmount = 0;
permaPieAmount = 0;
radialAmount = 0;
widgetAmount = 0;
dispose();
show();
}
Expand Down

0 comments on commit 83d804c

Please sign in to comment.