Merge remote-tracking branch 'origin/rollingDice' into development
This commit is contained in:
@@ -23,14 +23,13 @@ public class ChoisirBoolean implements Initializable{
|
||||
public void initialize(URL arg0, ResourceBundle arg1) {
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void choixOui(MouseEvent mouseEvent) throws IOException{
|
||||
PopUpBoolean.result = true;
|
||||
final Node source = (Node) mouseEvent.getSource();
|
||||
final Stage stage = (Stage) source.getScene().getWindow();
|
||||
stage.close();
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
@@ -40,6 +39,5 @@ public class ChoisirBoolean implements Initializable{
|
||||
final Node source = (Node) mouseEvent.getSource();
|
||||
final Stage stage = (Stage) source.getScene().getWindow();
|
||||
stage.close();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
37
src/ihm/controller/MenuJoueurController.java
Normal file
37
src/ihm/controller/MenuJoueurController.java
Normal file
@@ -0,0 +1,37 @@
|
||||
package ihm.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.SplitPane;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
|
||||
public class MenuJoueurController implements Initializable{
|
||||
|
||||
@Override
|
||||
public void initialize(URL arg0, ResourceBundle arg1) {
|
||||
//nomJoueur.setText(joueur.getNom());
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void changeZoneToScrollPaneJoueur(MouseEvent me) throws IOException {
|
||||
|
||||
AnchorPane bp = FXMLLoader.load(getClass().getResource("../ressources/ScrollPaneJoueur.fxml"));
|
||||
ImageView iv = ((ImageView)me.getSource());
|
||||
Parent p = iv.getParent().getParent();
|
||||
AnchorPane ap = (AnchorPane)p;
|
||||
ap.getChildren().setAll(bp);
|
||||
AnchorPane.setTopAnchor(bp, 0.0);
|
||||
AnchorPane.setBottomAnchor(bp, 0.0);
|
||||
AnchorPane.setLeftAnchor(bp, 0.0);
|
||||
AnchorPane.setRightAnchor(bp, 0.0);
|
||||
}
|
||||
|
||||
}
|
@@ -11,15 +11,23 @@ import java.util.ResourceBundle;
|
||||
|
||||
import ihm.PopUp;
|
||||
import ihm.PopUpBoolean;
|
||||
import ihm.SpriteAnimation;
|
||||
import javafx.animation.Animation;
|
||||
import javafx.event.Event;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.geometry.Rectangle2D;
|
||||
import javafx.scene.Group;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.VBox;
|
||||
import main.GestionnaireJeu;
|
||||
import javafx.util.Duration;
|
||||
import main.Joueur;
|
||||
import main.View;
|
||||
|
||||
@@ -39,6 +47,10 @@ public class PlateauController implements Initializable {
|
||||
@FXML private VBox joueur7;
|
||||
@FXML private VBox joueur8;
|
||||
|
||||
public static int DICE_SIX = 2;
|
||||
public static int DICE_QUATRE = 1;
|
||||
public static int DICE_BOTH = 0;
|
||||
|
||||
/**
|
||||
* initialise les donn<6E>es du plateau
|
||||
*/
|
||||
@@ -105,9 +117,7 @@ public class PlateauController implements Initializable {
|
||||
Parent root = loader.load();
|
||||
|
||||
PopUpBoolean popup = new PopUpBoolean(root, "Consulter sa carte");
|
||||
return popup.display();
|
||||
|
||||
|
||||
return popup.display();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -141,4 +151,11 @@ public class PlateauController implements Initializable {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void rollDice(Joueur joueur, int typeDice, int[] rolls) {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
182
src/ihm/controller/PlateauControllerTest.java
Normal file
182
src/ihm/controller/PlateauControllerTest.java
Normal file
@@ -0,0 +1,182 @@
|
||||
package ihm.controller;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import ihm.PopUpBoolean;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.ScrollPane;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
import main.Joueur;
|
||||
|
||||
public class PlateauControllerTest implements Initializable {
|
||||
|
||||
|
||||
@FXML private BorderPane root;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* initialise les donn<6E>es du plateau
|
||||
*/
|
||||
@Override
|
||||
public void initialize(URL arg0, ResourceBundle arg1) {
|
||||
//initialisation des attributs des joueurs
|
||||
|
||||
for(int i = 0; i < 8; i++) {
|
||||
|
||||
|
||||
AnchorPane ap = getAnchorPaneJoueur(i);
|
||||
Pane p;
|
||||
try {
|
||||
p = FXMLLoader.load(getClass().getResource("../ressources/MenuJoueur.fxml"));
|
||||
if(i > 1 && i < 3) {
|
||||
rotateContent(p, 90);
|
||||
}
|
||||
setContentAnchorPane(ap, p);
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public GridPane getGridPaneJoueur(int pos) {
|
||||
|
||||
int position = pos%8 / 2;
|
||||
|
||||
position++;
|
||||
|
||||
AnchorPane apParent = (AnchorPane) root.getChildren().get(position);
|
||||
|
||||
GridPane gp = (GridPane) apParent.getChildren().get(0);
|
||||
|
||||
return (GridPane) gp.getChildren().get(pos%2);
|
||||
}
|
||||
|
||||
|
||||
public AnchorPane getAnchorPaneJoueur(int pos) {
|
||||
|
||||
GridPane gp = getGridPaneJoueur(pos);
|
||||
return (AnchorPane) gp.getChildren().get(0);
|
||||
}
|
||||
|
||||
public ImageView getImageViewJoueur(int pos) {
|
||||
|
||||
GridPane gp = getGridPaneJoueur(pos);
|
||||
return (ImageView) gp.getChildren().get(1);
|
||||
}
|
||||
|
||||
public ScrollPane getScrollPaneJoueur(int pos) {
|
||||
|
||||
GridPane gp = getGridPaneJoueur(pos);
|
||||
return (ScrollPane) gp.getChildren().get(2);
|
||||
}
|
||||
|
||||
|
||||
public void setContentAnchorPane(AnchorPane ap, Pane p) {
|
||||
|
||||
ap.getChildren().setAll(p);
|
||||
|
||||
AnchorPane.setTopAnchor(p, 0.0);
|
||||
AnchorPane.setBottomAnchor(p, 0.0);
|
||||
AnchorPane.setLeftAnchor(p, 0.0);
|
||||
AnchorPane.setRightAnchor(p, 0.0);
|
||||
|
||||
}
|
||||
|
||||
public void rotateContent(Pane p, double rotation) {
|
||||
p.setRotate(rotation);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
int OFFSET_X = 0;
|
||||
int OFFSET_Y = 0;
|
||||
int WIDTH = 557;
|
||||
int HEIGHT = 557;
|
||||
int COUNT = 6;
|
||||
int COLUMNS = 6;
|
||||
|
||||
//anchorPane1.getChildren().setAll(imageView);
|
||||
|
||||
|
||||
ImageView imageView;
|
||||
try {
|
||||
imageView = FXMLLoader.load(getClass().getResource("../ressources/Dés.fxml"));
|
||||
imageView.setViewport(new Rectangle2D(OFFSET_X, OFFSET_Y, WIDTH, HEIGHT));
|
||||
|
||||
imageView.fitWidthProperty().bind(anchorPane1.widthProperty());
|
||||
final SpriteAnimation animation = new SpriteAnimation(
|
||||
imageView,
|
||||
Duration.millis(250),
|
||||
COUNT, COLUMNS,
|
||||
OFFSET_X, OFFSET_Y,
|
||||
WIDTH, HEIGHT
|
||||
);
|
||||
animation.setCycleCount(Animation.INDEFINITE);
|
||||
animation.play();
|
||||
anchorPane1.getChildren().addAll(new Group(imageView));
|
||||
anchorPane1.setOnMousePressed(new EventHandler<Event>(
|
||||
|
||||
) {
|
||||
|
||||
@Override
|
||||
public void handle(Event arg0) {
|
||||
animation.stop();
|
||||
|
||||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Affiche aux yeux de tous la carte personnage du joueur
|
||||
*
|
||||
* @param j : Le joueur sur lequel on a cliqu<71>
|
||||
*/
|
||||
|
||||
|
||||
public boolean choisir(Joueur j) throws IOException {
|
||||
|
||||
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ressources/choisirBoolean.fxml"));
|
||||
Parent root = loader.load();
|
||||
|
||||
PopUpBoolean popup = new PopUpBoolean(root, "Consulter sa carte");
|
||||
return popup.display();
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void rollDice(Joueur j, int typeDice, int[] resultats) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Permet de consulter sa carte perssonage en cas d'oublie
|
||||
*
|
||||
* @param j : Le joueur sur lequel on a cliqu<71>
|
||||
*/
|
||||
|
||||
|
||||
}
|
@@ -16,8 +16,6 @@ import javafx.fxml.Initializable;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Alert;
|
||||
import javafx.scene.control.Alert.AlertType;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.TextField;
|
||||
|
44
src/ihm/controller/ScrollPaneJoueurController.java
Normal file
44
src/ihm/controller/ScrollPaneJoueurController.java
Normal file
@@ -0,0 +1,44 @@
|
||||
package ihm.controller;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.SplitPane;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
|
||||
public class ScrollPaneJoueurController implements Initializable{
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void initialize(URL arg0, ResourceBundle arg1) {
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void changeZoneJoueurToMenuJoueur(MouseEvent me) throws IOException {
|
||||
|
||||
BorderPane bp = FXMLLoader.load(getClass().getResource("../ressources/MenuJoueur.fxml"));
|
||||
ImageView iv = ((ImageView)me.getSource());
|
||||
Parent p = iv.getParent().getParent().getParent().getParent();
|
||||
AnchorPane ap = (AnchorPane)p;
|
||||
|
||||
System.out.println(bp.getRotate()+" "+ ap.getRotate());
|
||||
ap.getChildren().setAll(bp);
|
||||
|
||||
AnchorPane.setTopAnchor(bp, 0.0);
|
||||
AnchorPane.setBottomAnchor(bp, 0.0);
|
||||
AnchorPane.setLeftAnchor(bp, 0.0);
|
||||
AnchorPane.setRightAnchor(bp, 0.0);
|
||||
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user