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

wall half closure control + layers

Browse Source 
- add onewaywall option to create a wall if there is not step back
- add layers of maze
- load minetest scheme .we with onewall option
This commit is contained in:
philippe lhardy
2020-11-05 19:50:42 +01:00
parent 52a2d3f1e3
commit bf918333bf
5 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
java/org/artisanlogiciel/games/maze/gui/Display.java
View File

@@ -1,9 +1,6 @@
package org.artisanlogiciel.games.maze.gui;
import org.artisanlogiciel.games.maze.DrawingGenerator;
import org.artisanlogiciel.games.maze.LabyModel;
import org.artisanlogiciel.games.maze.MazeParams;
import org.artisanlogiciel.games.maze.MazeParamsFixed;
import org.artisanlogiciel.games.maze.*;
import org.artisanlogiciel.games.maze.persist.MazePersistWorldEdit;
import org.artisanlogiciel.games.maze.persist.MazePersistRaw;
import org.artisanlogiciel.games.maze.solve.SolvingModel;
@@ -40,6 +37,9 @@ implements StatusListener
public final static ResourceBundle labels = ResourceBundle.getBundle("LabelsBundle", Locale.getDefault(), Display.class.getClassLoader(), new UTF8Control());
LabyLayers layers = new LabyLayers();
int layer = 0;
MazeComponent maze;
MazeControler controler;
LabyModel model;
@@ -110,12 +110,17 @@ implements StatusListener
}
}
void setModel( LabyModel model)
{
this.model = model;
layers.addLabyModel(layer, model);
}
void resetModel() {
// recreate labyrinth
if (params != null) {
params = controler.getSettings().resetParams();
model = new LabyModel(params);
setModel(new LabyModel(params));
refresh();
}
}
@@ -133,7 +138,6 @@ implements StatusListener
maze.changed(null, null, model);
}
}.start();
}
}
@@ -623,11 +627,19 @@ implements StatusListener
setAutoSize(autoSlide.isSelected());
}
});
final JSlider layerSlide = new JSlider( JSlider.HORIZONTAL, 0,10, 0);
layerSlide.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
int r = setLayer(layerSlide.getValue());
//layerSlide.setMaximum(r);
}
});
resizecontrol = new JPanel(new FlowLayout());
resizecontrol.add(showAll);
resizecontrol.add(slider);
resizecontrol.add(autoSlide);
resizecontrol.add(layerSlide);
add(controlDisplayPanel, BorderLayout.SOUTH);
add(resizecontrol, BorderLayout.WEST);
@@ -658,7 +670,7 @@ implements StatusListener
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(infile);
model = new MazePersistRaw().parseInputStream("raw",inputStream);
setModel(new MazePersistRaw().parseInputStream("raw",inputStream));
} catch (IOException io) {
io.printStackTrace(System.err);
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
@@ -787,7 +799,7 @@ implements StatusListener
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(infile);
model = new MazePersistWorldEdit().parseInputStream("we",inputStream);
setModel(new MazePersistWorldEdit().parseInputStream("we",inputStream));
} catch (IOException io) {
io.printStackTrace(System.err);
statusField.setText("[ERROR] Can't load " + infile.getAbsolutePath());
@@ -874,6 +886,24 @@ implements StatusListener
}
}
private int setLayer(int x)
{
addStatus("set layer " + x);
LabyModel layermodel = layers.getLayer(x);
if ( layermodel == null )
{
// clone it
model = new LabyModel(model);
layers.addLabyModel(x, model);
}
else
{
model = layermodel;
}
layer = x;
refresh();
return layer;
}
public static void main(String pArgs[]) {
LabyModel model = null;