jonas/CT-Conway-s-Game-of-Life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just a small UI changes. New architecture.

Browse Source
This commit is contained in:
Noah
2021-10-05 16:18:15 +02:00
parent 8a9d1ec2e6
commit 808083a770
5 changed files with 99 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Control.java
+1 -10
View File
@@ -1,6 +1,5 @@
package game;
import gui.ControlWindow;
import gui.GUI;
import java.util.concurrent.ThreadLocalRandom;
@@ -63,7 +62,7 @@ public class Control {
gui.createGameWindow(this.xSize, this.ySize, this.width, this.height);
if (startMode == StartMode.Manuel){
buildControlWindow();
gui.buildControlWindow();
}
@@ -222,14 +221,6 @@ public class Control {
}
public void buildControlWindow() {
gui.createControlWindow();
}
public ControlWindow getControlWindow(){
return gui.getControlWindow();
}
public void setVisibility(boolean value){
gui.setVisibility(value);
}
src/gui/GUI.java
+21 -5
View File
@@ -1,6 +1,7 @@
package gui;
import game.Control;
import game.StartMode;
import javax.swing.*;
import java.awt.*;
@@ -9,10 +10,10 @@ public class GUI {
private final String title = "Conway's game if Live";
private final int offset = 10;
private final Control control;
private final int offset = 10;
private MenuWindow menuWindow;
private GameWindow gameWindow;
private ControlWindow controlWindow;
@@ -22,12 +23,11 @@ public class GUI {
}
public void createMenuWindow(){
menuWindow = new MenuWindow(title, control);
menuWindow = new MenuWindow(title, this);
}
public void createGameWindow(int cellCountX, int cellCountY, int width, int height){
gameWindow = new GameWindow(title, control, cellCountX, cellCountY, width, height);
gameWindow = new GameWindow(title, this, cellCountX, cellCountY, width, height);
}
public void createControlWindow(){
@@ -38,6 +38,20 @@ public class GUI {
gameWindow.showGrid(grid);
}
public void buildGameWindow(int xSize, int ySize, int cellCount, StartMode startMode){
control.buildGameWindow(xSize, ySize, cellCount, startMode);
}
public void buildControlWindow(){
createControlWindow();
}
public void setCell(int mouseX, int mouseY, boolean value){
control.setCell(mouseX, mouseY, value);
}
//TODO: Delet this Methods. Those are shit.
public void setVisibility(boolean value){
controlWindow.setVisibility(value);
}
@@ -46,4 +60,6 @@ public class GUI {
return controlWindow;
}
}
src/gui/GameWindow.java
+8 -9
View File
@@ -1,7 +1,6 @@
package gui;
import draw.Draw;
import game.Control;
import javax.swing.*;
import java.awt.*;
@@ -20,7 +19,7 @@ public class GameWindow {
private boolean mouseLeft = false, mouseRight = false;
public GameWindow(String title, Control control, int cellCountX, int cellCountY, int width, int height) {
public GameWindow(String title, GUI gui, int cellCountX, int cellCountY, int width, int height) {
this.cellCountX = cellCountX;
this.cellCountY = cellCountY;
@@ -39,10 +38,10 @@ public class GameWindow {
@Override
public void keyPressed(KeyEvent e) {
if (e.isControlDown() && e.isAltDown() && e.getKeyCode() == KeyEvent.VK_C) {
if (control.getControlWindow() == null){
control.buildControlWindow();
if (gui.getControlWindow() == null){
gui.buildControlWindow();
} else {
control.setVisibility(true);
gui.setVisibility(true);
}
}
@@ -59,9 +58,9 @@ public class GameWindow {
@Override
public void mouseDragged(MouseEvent e) {
if (mouseLeft) {
control.setCell(e.getX(), e.getY(), true);
gui.setCell(e.getX(), e.getY(), true);
} else if (mouseRight) {
control.setCell(e.getX(), e.getY(), false);
gui.setCell(e.getX(), e.getY(), false);
}
}
@@ -82,11 +81,11 @@ public class GameWindow {
switch (e.getButton()) {
case 1 -> {
mouseLeft = true;
control.setCell(e.getX(), e.getY(), true);
gui.setCell(e.getX(), e.getY(), true);
}
case 3 -> {
mouseRight = true;
control.setCell(e.getX(), e.getY(), false);
gui.setCell(e.getX(), e.getY(), false);
}
}
}
src/gui/MenuWindow.java
+68 -47
View File
@@ -1,6 +1,6 @@
package gui;
import game.Control;
import game.StartMode;
import javax.swing.*;
@@ -15,7 +15,14 @@ public class MenuWindow {
private final JFrame menuWindow;
private Font head;
private Font text;
private JLabel heading;
private final int xAxisMin = 6, xAxisMax = 1024;
private final int yAxisMin = 6, yAxisMax = 1024;
private int xAxisSize = 6;
private JSlider xAxis;
private JLabel xAxisName;
@@ -42,7 +49,7 @@ public class MenuWindow {
private boolean sliderLocked = false;
public MenuWindow(String title, Control control){
public MenuWindow(String title, GUI gui){
menuWindow = new JFrame();
menuWindow.setTitle(title);
@@ -61,7 +68,7 @@ public class MenuWindow {
menuWindow.setResizable(false);
initComponents(control);
initComponents(gui);
addComponents();
@@ -69,18 +76,50 @@ public class MenuWindow {
menuWindow.setVisible(true);
}
private void initComponents(Control control) {
Font head = new Font("Segoe UI Light", Font.PLAIN, 24);
Font text = new Font("Segoe UI Light", Font.PLAIN, 16);
private void initComponents(GUI gui) {
heading = new JLabel("Control Panel");
head = new Font("Segoe UI Light", Font.PLAIN, 24);
text = new Font("Segoe UI Light", Font.PLAIN, 16);
hover = new MouseAdapter() {
@Override
public void mouseEntered(MouseEvent e) {
super.mouseEntered(e);
JButton b = (JButton) e.getSource();
b.setForeground(Color.decode("#C40233"));
b.setBounds(b.getX() - 10, b.getY() - 10, b.getWidth() + 20, b.getHeight() + 20);
}
@Override
public void mouseExited(MouseEvent e) {
super.mouseExited(e);
JButton b = (JButton) e.getSource();
b.setForeground(Color.decode("#121212"));
b.setBounds(b.getX() + 10, b.getY() + 10, b.getWidth() - 20, b.getHeight() - 20);
}
};
initHeading();
initXAxis();
initYAxis();
initStartCells();
initModeBox();
initStartButton(gui);
initManuelStart(gui);
initIMG();
}
private void initHeading(){
heading = new JLabel("Menu Panel");
heading.setFont(head);
heading.setForeground(Color.decode("#121212"));
heading.setBounds(50, 25, 400, 50);
heading.setVisible(true);
}
int xAxisMin = 6;
int xAxisMax = 1024;
private void initXAxis(){
xAxis = new JSlider(xAxisMin, xAxisMax);
xAxis.setBounds(180, 110, 200, 20);
xAxis.setFont(text);
@@ -142,11 +181,9 @@ public class MenuWindow {
}
});
}
int yAxisMin = 6;
int yAxisMax = 1024;
private void initYAxis(){
yAxis = new JSlider(yAxisMin, yAxisMax);
yAxis.setBounds(180, 160, 200, 20);
yAxis.setFont(text);
@@ -207,8 +244,9 @@ public class MenuWindow {
}
});
}
private void initStartCells(){
startCells = new JSlider(6, 6);
startCells.setBounds(180, 210, 200, 20);
startCells.setFont(text);
@@ -271,33 +309,9 @@ public class MenuWindow {
updateStartCells();
}
hover = new MouseAdapter() {
@Override
public void mouseEntered(MouseEvent e) {
super.mouseEntered(e);
JButton b = (JButton) e.getSource();
b.setForeground(Color.decode("#C40233"));
b.setBounds(b.getX() - 10, b.getY() - 10, b.getWidth() + 20, b.getHeight() + 20);
}
@Override
public void mouseExited(MouseEvent e) {
super.mouseExited(e);
JButton b = (JButton) e.getSource();
b.setForeground(Color.decode("#121212"));
b.setBounds(b.getX() + 10, b.getY() + 10, b.getWidth() - 20, b.getHeight() - 20);
}
};
modeName = new JLabel("Select Figure: ");
modeName.setBounds(50, 250, 200, 30);
modeName.setFont(text);
modeName.setForeground(Color.decode("#121212"));
modeName.setVisible(true);
private void initModeBox(){
modeBox = new JComboBox<String>();
modeBox.setBounds(180, 257, 100, 20);
addComboBoxEntry(modeBox, "Randomized");
@@ -305,7 +319,14 @@ public class MenuWindow {
addComboBoxEntry(modeBox, "Blinker");
addComboBoxEntry(modeBox, "Toad");
modeName = new JLabel("Select Figure: ");
modeName.setBounds(50, 250, 200, 30);
modeName.setFont(text);
modeName.setForeground(Color.decode("#121212"));
modeName.setVisible(true);
}
private void initStartButton(GUI gui){
startButton = new JButton();
startButton.setText("Start Game");
startButton.setFont(text);
@@ -321,16 +342,16 @@ public class MenuWindow {
@Override
public void actionPerformed(ActionEvent e) {
StartMode startMethod = StartMode.Task1;
int index = modeBox.getSelectedIndex();
startMethod = StartMode.values()[index + 1]; // + 1 BECAUSE MANUEL HAS THE FIRST INDEX IN ENUM
StartMode startMode = StartMode.values()[index + 1]; // + 1 BECAUSE MANUEL HAS THE FIRST INDEX IN ENUM
control.buildGameWindow(xAxisSize, yAxisSize, cellCount, startMethod);
gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, startMode);
}
});
}
private void initManuelStart(GUI gui){
manuelStart = new JButton();
manuelStart.setText("Manuel Start");
manuelStart.setFont(text);
@@ -345,15 +366,15 @@ public class MenuWindow {
manuelStart.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
control.buildGameWindow(xAxisSize, yAxisSize, cellCount, StartMode.Manuel);
gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, StartMode.Manuel);
}
});
}
private void initIMG(){
preview = new ImageIcon("src/files/PNG/Preview.png");
previewLabel = new JLabel(preview);
previewLabel.setBounds(450, 45, 203, 302);
}
private void updateStartCells() {
src/main/Main.java
+1 -6
View File
@@ -8,7 +8,7 @@ public class Main {
//TODO: Inputfield witch Changelistner to cange Slider, Generic ActionListener.
//TODO: Offset in each Window.
//TODO: GUI Structure.
//TODO: Window visibility, Ccntrol window create only one time. Visibility = false when game started, Visibility = true when game quited.
//TODO: Window visibility, Control window create only one time. Visibility = false when game started, Visibility = true when game quited.
//TODO: Database
@@ -16,11 +16,6 @@ public class Main {
public static void main(String[] args) {
Control control = new Control();
control.start();
while (1 == 1){
System.out.println("TEST");
}
}