merge development into test #26
@@ -5,43 +5,20 @@
|
|||||||
import com.jme3.scene.Node;
|
import com.jme3.scene.Node;
|
||||||
import pp.mdga.client.MdgaApp;
|
import pp.mdga.client.MdgaApp;
|
||||||
import pp.mdga.client.button.AbstractButton;
|
import pp.mdga.client.button.AbstractButton;
|
||||||
import pp.mdga.client.button.InputButton;
|
|
||||||
import pp.mdga.client.button.LabelButton;
|
import pp.mdga.client.button.LabelButton;
|
||||||
import pp.mdga.client.button.MenuButton;
|
import pp.mdga.client.button.MenuButton;
|
||||||
import pp.mdga.client.view.MainView;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class CeremonyDialog extends Dialog {
|
public class CeremonyDialog extends Dialog {
|
||||||
private ArrayList<ArrayList<LabelButton>> labels;
|
private ArrayList<ArrayList<LabelButton>> labels;
|
||||||
|
|
||||||
float offsetX = 0.5f;
|
float offsetX;
|
||||||
|
|
||||||
public CeremonyDialog(MdgaApp app, Node node) {
|
public CeremonyDialog(MdgaApp app, Node node) {
|
||||||
super(app, node);
|
super(app, node);
|
||||||
|
|
||||||
labels = new ArrayList<>();
|
prepare();
|
||||||
|
|
||||||
ArrayList<LabelButton> first = new ArrayList<>();
|
|
||||||
Vector2f size = new Vector2f(4, 1.2f);
|
|
||||||
first.add(new LabelButton(app, node, "", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Figuren geworfen", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Figuren verloren", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Verwendete Bonuskarten", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Gewürfelte 6en", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Gelaufene Felder", size, new Vector2f()));
|
|
||||||
first.add(new LabelButton(app, node, "Bonusfeldern erreicht", size, new Vector2f()));
|
|
||||||
|
|
||||||
float offsetY = 0.5f;
|
|
||||||
|
|
||||||
for (LabelButton b : first) {
|
|
||||||
b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetY));
|
|
||||||
offsetY += 0.8f;
|
|
||||||
}
|
|
||||||
|
|
||||||
offsetX += 2.3f;
|
|
||||||
|
|
||||||
labels.add(first);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -98,4 +75,31 @@ public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5
|
|||||||
|
|
||||||
labels.add(row);
|
labels.add(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void prepare() {
|
||||||
|
offsetX = 0.5f;
|
||||||
|
|
||||||
|
labels = new ArrayList<>();
|
||||||
|
|
||||||
|
ArrayList<LabelButton> first = new ArrayList<>();
|
||||||
|
Vector2f size = new Vector2f(4, 1.2f);
|
||||||
|
first.add(new LabelButton(app, node, "", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Figuren geworfen", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Figuren verloren", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Verwendete Bonuskarten", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Gewürfelte 6en", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Gelaufene Felder", size, new Vector2f()));
|
||||||
|
first.add(new LabelButton(app, node, "Bonusfeldern erreicht", size, new Vector2f()));
|
||||||
|
|
||||||
|
float offsetY = 0.5f;
|
||||||
|
|
||||||
|
for (LabelButton b : first) {
|
||||||
|
b.setPos(new Vector2f(offsetX, MenuButton.VERTICAL - offsetY));
|
||||||
|
offsetY += 0.8f;
|
||||||
|
}
|
||||||
|
|
||||||
|
offsetX += 2.3f;
|
||||||
|
|
||||||
|
labels.add(first);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,4 +165,5 @@ public void create(Vector3f pos, float scale, boolean shadow){
|
|||||||
public void setPos(Vector3f pos){
|
public void setPos(Vector3f pos){
|
||||||
spatial.setLocalTranslation(pos);
|
spatial.setLocalTranslation(pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
import pp.mdga.client.button.ButtonLeft;
|
import pp.mdga.client.button.ButtonLeft;
|
||||||
import pp.mdga.client.button.ButtonRight;
|
import pp.mdga.client.button.ButtonRight;
|
||||||
import pp.mdga.client.button.CeremonyButton;
|
import pp.mdga.client.button.CeremonyButton;
|
||||||
import pp.mdga.client.button.LobbyButton;
|
|
||||||
import pp.mdga.client.dialog.CeremonyDialog;
|
import pp.mdga.client.dialog.CeremonyDialog;
|
||||||
import pp.mdga.game.Color;
|
import pp.mdga.game.Color;
|
||||||
|
|
||||||
@@ -65,6 +64,8 @@ public void onLeave() {
|
|||||||
ceremonyButtons.clear();
|
ceremonyButtons.clear();
|
||||||
|
|
||||||
rootNode.removeLight(ambient);
|
rootNode.removeLight(ambient);
|
||||||
|
|
||||||
|
ceremonyDialog.prepare();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user