diff --git a/.gitignore b/.gitignore index f098703f25f3c63f41e25bbeb7271929a0b97491..a97af95e2fa0eee577c273b850dc914a43beacc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ bin/ __pycache__/ +.metadata +gui/.classpath +gui/bin +gui/.project +gui/.settings diff --git a/gui/.classpath b/gui/.classpath deleted file mode 100644 index e78c21471e520d284b83deeb128d0ab6ae667550..0000000000000000000000000000000000000000 --- a/gui/.classpath +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/gui/json-20160212.jar b/gui/json-20160212.jar new file mode 100644 index 0000000000000000000000000000000000000000..21e09dbc2a97b3b6ee01a9c51fa6a6a9d6b415a9 Binary files /dev/null and b/gui/json-20160212.jar differ diff --git a/gui/src/Case.java b/gui/src/Case.java index 404f448dce1982a3b366e972b88b4e513947b06f..6388147470a1086cf46606f751faf1d8502e1865 100644 --- a/gui/src/Case.java +++ b/gui/src/Case.java @@ -1,6 +1,6 @@ -import javafx.scene.shape.*; public class Case { - private int rang; //N° de la case (bottom right = 0, top left = 59) + + private int rang; //N� de la case (bottom right = 0, top left = 59) private int nbFish;//Nb de poissons sur la case (0 si vide) private boolean bluePenguin; //true s'il y a un pinguin bleu sur la case private boolean redPenguin; //true s'il y a un pinguin rouge sur la case diff --git a/gui/src/Controller.java b/gui/src/Controller.java index d3f97dacd03b902627c1e32a1019cf8ad7617274..10651a9ca77a54bfd3cbf70d3e492836b4f8e8d8 100644 --- a/gui/src/Controller.java +++ b/gui/src/Controller.java @@ -1,3 +1,4 @@ +import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; @@ -9,10 +10,14 @@ import javafx.scene.layout.BorderPane; import javafx.scene.paint.Color; import javafx.scene.shape.Polygon; public class Controller implements Initializable { + + private State state; + private Process gameProcess; + @FXML - private Polygon case0; - @FXML - private Polygon case1; + private Polygon case0,case1; + //@FXML + //private Polygon case1; @FXML private Polygon case2; @FXML @@ -135,6 +140,15 @@ public class Controller implements Initializable { @Override public void initialize(URL location, ResourceBundle resources) { + try { + this.gameProcess = new ProcessBuilder("../bin/theturk").start(); + } catch (IOException e) { + // TODO Error message and exit + e.printStackTrace(); + } + + + case0.setOnMouseClicked(new MyClickHandler()); case1.setOnMouseClicked(new MyClickHandler()); case2.setOnMouseClicked(new MyClickHandler()); diff --git a/gui/src/Player.java b/gui/src/Player.java new file mode 100644 index 0000000000000000000000000000000000000000..e22d75a25e9249762f729497a61e52cd5d40dd1c --- /dev/null +++ b/gui/src/Player.java @@ -0,0 +1,6 @@ + +public enum Player { + RED, BLUE + + //TODO +} diff --git a/gui/src/State.java b/gui/src/State.java new file mode 100644 index 0000000000000000000000000000000000000000..4301973e9751561cdd5a0fb98971494f0cc64103 --- /dev/null +++ b/gui/src/State.java @@ -0,0 +1,10 @@ +import org.json.*; +public class State { + public void update (String json){};//TODO + public int getPenguinPos (int i, Player player) + { + //TODO + return -1; + } + +}