modification makefile + transsition fenetre pair programing
This commit is contained in:
parent
5bef75ddba
commit
f5c3fa6149
src/main
Main.javaMakefile
classes
controller
CameraController.classCameraControllerListener.classGameContext.classGameController.classHexagonMouseListener.classMenuController.classMouseDragHandler.classMousePressHandler.classMouseWheelController.classNewListener.classQuiListener.classResListener.classTilePlacer.class
java/view/img
main
model
view
java
@ -16,10 +16,7 @@ public class Main {
|
||||
MenuModel model = new MenuModel();
|
||||
MenuView view = new MenuView();
|
||||
|
||||
JFrame frame = new JFrame(" Menu");
|
||||
frame.setSize(1500, 750);
|
||||
frame.setLocation(0, 0);
|
||||
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
JFrame frame = App.getInstance();
|
||||
frame.add(view);
|
||||
|
||||
// Créer le contrôleur
|
||||
|
@ -21,7 +21,7 @@ java/controller/NewListener.class: java/controller/NewListener.java
|
||||
java/controller/QuiListener.class: java/controller/QuiListener.java
|
||||
$(JC) $(JCFLAGS) java/controller/QuiListener.java
|
||||
|
||||
java/controller/ResListener.class: java/controller/ResListener.java java/view/GameView.class
|
||||
java/controller/ResListener.class: java/controller/ResListener.java java/view/GameView.class java/view/App.class
|
||||
$(JC) $(JCFLAGS) java/controller/ResListener.java
|
||||
|
||||
java/controller/GameController.class: java/controller/GameController.java java/controller/TilePlacer.class java/model/Tile.class java/controller/CameraController.class java/controller/HexagonMouseListener.class
|
||||
@ -66,6 +66,9 @@ java/view/BtnPerso.class: java/view/BtnPerso.java
|
||||
java/view/ButtonHoverListener.class: java/view/ButtonHoverListener.java
|
||||
$(JC) $(JCFLAGS) java/view/ButtonHoverListener.java
|
||||
|
||||
java/view/App.class: java/view/App.java
|
||||
$(JC) $(JCFLAGS) java/view/App.java
|
||||
|
||||
# Compilation des handlers
|
||||
java/controller/MousePressHandler.class: java/controller/MousePressHandler.java java/controller/CameraControllerListener.class
|
||||
$(JC) $(JCFLAGS) java/controller/MousePressHandler.java
|
||||
|
BIN
src/main/classes/controller/CameraController.class
Normal file
BIN
src/main/classes/controller/CameraController.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/CameraControllerListener.class
Normal file
BIN
src/main/classes/controller/CameraControllerListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/GameContext.class
Normal file
BIN
src/main/classes/controller/GameContext.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/GameController.class
Normal file
BIN
src/main/classes/controller/GameController.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/HexagonMouseListener.class
Normal file
BIN
src/main/classes/controller/HexagonMouseListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/MenuController.class
Normal file
BIN
src/main/classes/controller/MenuController.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/MouseDragHandler.class
Normal file
BIN
src/main/classes/controller/MouseDragHandler.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/MousePressHandler.class
Normal file
BIN
src/main/classes/controller/MousePressHandler.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/MouseWheelController.class
Normal file
BIN
src/main/classes/controller/MouseWheelController.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/NewListener.class
Normal file
BIN
src/main/classes/controller/NewListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/QuiListener.class
Normal file
BIN
src/main/classes/controller/QuiListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/ResListener.class
Normal file
BIN
src/main/classes/controller/ResListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/controller/TilePlacer.class
Normal file
BIN
src/main/classes/controller/TilePlacer.class
Normal file
Binary file not shown.
BIN
src/main/classes/java/view/img/D.png
Normal file
BIN
src/main/classes/java/view/img/D.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 27 KiB |
BIN
src/main/classes/java/view/img/bg.png
Normal file
BIN
src/main/classes/java/view/img/bg.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 322 KiB |
BIN
src/main/classes/java/view/img/quit.png
Normal file
BIN
src/main/classes/java/view/img/quit.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 36 KiB |
BIN
src/main/classes/main/Main.class
Normal file
BIN
src/main/classes/main/Main.class
Normal file
Binary file not shown.
BIN
src/main/classes/model/MenuModel.class
Normal file
BIN
src/main/classes/model/MenuModel.class
Normal file
Binary file not shown.
BIN
src/main/classes/model/TerrainType.class
Normal file
BIN
src/main/classes/model/TerrainType.class
Normal file
Binary file not shown.
BIN
src/main/classes/model/Tile.class
Normal file
BIN
src/main/classes/model/Tile.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/App.class
Normal file
BIN
src/main/classes/view/App.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/BtnPerso.class
Normal file
BIN
src/main/classes/view/BtnPerso.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/ButtonHoverListener.class
Normal file
BIN
src/main/classes/view/ButtonHoverListener.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/GameView.class
Normal file
BIN
src/main/classes/view/GameView.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/HexagonTile$1.class
Normal file
BIN
src/main/classes/view/HexagonTile$1.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/HexagonTile.class
Normal file
BIN
src/main/classes/view/HexagonTile.class
Normal file
Binary file not shown.
BIN
src/main/classes/view/MenuView.class
Normal file
BIN
src/main/classes/view/MenuView.class
Normal file
Binary file not shown.
@ -1,4 +1,5 @@
|
||||
package controller;
|
||||
import view.App;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
@ -10,6 +11,7 @@ public class ResListener implements ActionListener {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
SwingUtilities.invokeLater(() -> new GameView());
|
||||
App.getInstance().dispose();
|
||||
|
||||
}
|
||||
}
|
17
src/main/java/view/App.java
Normal file
17
src/main/java/view/App.java
Normal file
@ -0,0 +1,17 @@
|
||||
package view;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
public class App {
|
||||
private static JFrame frame;
|
||||
|
||||
public static JFrame getInstance() {
|
||||
if (frame == null) {
|
||||
frame = new JFrame("Menu");
|
||||
frame.setSize(1500, 750);
|
||||
frame.setLocationRelativeTo(null);
|
||||
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
}
|
||||
return frame;
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user