philippe.lhardy/artloglaby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display seed, create subpackage

Browse Source 
- display seed value ( can't be set yet )
- move MazeSetting in gui sub package
This commit is contained in:
philippe lhardy
2020-10-11 15:07:39 +02:00
parent 96c72506fb
commit 9ec3cf0d01
4 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
java/org/artisanlogiciel/games/Display.java
View File

@@ -23,7 +23,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.LinkedList;
import java.util.Locale;
import java.util.Random;
import java.util.ResourceBundle;
import javax.imageio.ImageIO;
@@ -32,6 +31,7 @@ import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.artisanlogiciel.games.maze.gui.MazeSettings;
import org.artisanlogiciel.games.stl.Wall3d;
import org.artisanlogiciel.util.UTF8Control;
@@ -46,7 +46,7 @@ public class Display extends JFrame {
// to please eclipse, not supposed to be serialized
private static final long serialVersionUID = 8500214871372184418L;
final static ResourceBundle labels = ResourceBundle.getBundle("LabelsBundle", Locale.getDefault(), Display.class.getClassLoader(), new UTF8Control());
public final static ResourceBundle labels = ResourceBundle.getBundle("LabelsBundle", Locale.getDefault(), Display.class.getClassLoader(), new UTF8Control());
MazeComponent maze;
MazeControler controler;
@@ -97,7 +97,7 @@ public class Display extends JFrame {
void recreateModel() {
// recreate labyrinth
if (params != null) {
params = controler.getSettings().getParams();
params = controler.getSettings().resetParams();
// DON'T keep current model...
// TODO control SEED.
model = new LabyModel(params);
@@ -120,7 +120,7 @@ public class Display extends JFrame {
void resetModel() {
// recreate labyrinth
if (params != null) {
params = controler.getSettings().getParams();
params = controler.getSettings().resetParams();
model = new LabyModel(params);
maze.resetWallsProvider(model);
model.setMazeListener(maze);
@@ -301,58 +301,6 @@ public class Display extends JFrame {
}
}
private class MazeSettings extends JPanel {
MazeParams params;
JTextField textWidth = null;
JTextField textHeight = null;
JTextField textDepth = null;
// TODO set width and height and depth of maze with gui
public MazeSettings(MazeParams params) {
super();
this.params = params;
createSettingsGui();
}
void createSettingsGui() {
if (params != null) {
JButton buttonReset = new JButton("reset");//labels.getString("reset"));
buttonReset.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
resetModel();
}
});
add(buttonReset);
}
if (params != null) {
JLabel widthLabel = new JLabel(labels.getString("width"));
textWidth = new JTextField("0" + params.getWidth());
add(widthLabel);
add(textWidth);
JLabel heightLabel = new JLabel(labels.getString("height"));
textHeight = new JTextField("0" + params.getHeight());
add(heightLabel);
add(textHeight);
JLabel depthLabel = new JLabel(labels.getString("depth"));
textDepth = new JTextField("0" + params.getMaxDepth());
add(depthLabel);
add(textDepth);
}
}
public MazeParams getParams() {
return new MazeParamsFixed(params.getSaveDir(),
Integer.parseInt(textWidth.getText()),
Integer.parseInt(textHeight.getText()),
Integer.parseInt(textDepth.getText()),
new Random().nextLong()
);
}
}
private class MazeControler extends JPanel {
/**
@@ -457,6 +405,14 @@ public class Display extends JFrame {
resolveQuitBar.add(quitButton);
JButton buttonReset = new JButton("reset");//labels.getString("reset"));
buttonReset.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
resetModel();
}
});
resolveQuitBar.add(buttonReset);
return resolveQuitBar;
}