diff --git a/robots/src/gui/GameVisualizer.java b/robots/src/gui/GameVisualizer.java deleted file mode 100644 index f82cfd8f8..000000000 --- a/robots/src/gui/GameVisualizer.java +++ /dev/null @@ -1,210 +0,0 @@ -package gui; - -import java.awt.Color; -import java.awt.EventQueue; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.geom.AffineTransform; -import java.util.Timer; -import java.util.TimerTask; - -import javax.swing.JPanel; - -public class GameVisualizer extends JPanel -{ - private final Timer m_timer = initTimer(); - - private static Timer initTimer() - { - Timer timer = new Timer("events generator", true); - return timer; - } - - private volatile double m_robotPositionX = 100; - private volatile double m_robotPositionY = 100; - private volatile double m_robotDirection = 0; - - private volatile int m_targetPositionX = 150; - private volatile int m_targetPositionY = 100; - - private static final double maxVelocity = 0.1; - private static final double maxAngularVelocity = 0.001; - - public GameVisualizer() - { - m_timer.schedule(new TimerTask() - { - @Override - public void run() - { - onRedrawEvent(); - } - }, 0, 50); - m_timer.schedule(new TimerTask() - { - @Override - public void run() - { - onModelUpdateEvent(); - } - }, 0, 10); - addMouseListener(new MouseAdapter() - { - @Override - public void mouseClicked(MouseEvent e) - { - setTargetPosition(e.getPoint()); - repaint(); - } - }); - setDoubleBuffered(true); - } - - protected void setTargetPosition(Point p) - { - m_targetPositionX = p.x; - m_targetPositionY = p.y; - } - - protected void onRedrawEvent() - { - EventQueue.invokeLater(this::repaint); - } - - private static double distance(double x1, double y1, double x2, double y2) - { - double diffX = x1 - x2; - double diffY = y1 - y2; - return Math.sqrt(diffX * diffX + diffY * diffY); - } - - private static double angleTo(double fromX, double fromY, double toX, double toY) - { - double diffX = toX - fromX; - double diffY = toY - fromY; - - return asNormalizedRadians(Math.atan2(diffY, diffX)); - } - - protected void onModelUpdateEvent() - { - double distance = distance(m_targetPositionX, m_targetPositionY, - m_robotPositionX, m_robotPositionY); - if (distance < 0.5) - { - return; - } - double velocity = maxVelocity; - double angleToTarget = angleTo(m_robotPositionX, m_robotPositionY, m_targetPositionX, m_targetPositionY); - double angularVelocity = 0; - if (angleToTarget > m_robotDirection) - { - angularVelocity = maxAngularVelocity; - } - if (angleToTarget < m_robotDirection) - { - angularVelocity = -maxAngularVelocity; - } - - moveRobot(velocity, angularVelocity, 10); - } - - private static double applyLimits(double value, double min, double max) - { - if (value < min) - return min; - if (value > max) - return max; - return value; - } - - private void moveRobot(double velocity, double angularVelocity, double duration) - { - velocity = applyLimits(velocity, 0, maxVelocity); - angularVelocity = applyLimits(angularVelocity, -maxAngularVelocity, maxAngularVelocity); - double newX = m_robotPositionX + velocity / angularVelocity * - (Math.sin(m_robotDirection + angularVelocity * duration) - - Math.sin(m_robotDirection)); - if (!Double.isFinite(newX)) - { - newX = m_robotPositionX + velocity * duration * Math.cos(m_robotDirection); - } - double newY = m_robotPositionY - velocity / angularVelocity * - (Math.cos(m_robotDirection + angularVelocity * duration) - - Math.cos(m_robotDirection)); - if (!Double.isFinite(newY)) - { - newY = m_robotPositionY + velocity * duration * Math.sin(m_robotDirection); - } - m_robotPositionX = newX; - m_robotPositionY = newY; - double newDirection = asNormalizedRadians(m_robotDirection + angularVelocity * duration); - m_robotDirection = newDirection; - } - - private static double asNormalizedRadians(double angle) - { - while (angle < 0) - { - angle += 2*Math.PI; - } - while (angle >= 2*Math.PI) - { - angle -= 2*Math.PI; - } - return angle; - } - - private static int round(double value) - { - return (int)(value + 0.5); - } - - @Override - public void paint(Graphics g) - { - super.paint(g); - Graphics2D g2d = (Graphics2D)g; - drawRobot(g2d, round(m_robotPositionX), round(m_robotPositionY), m_robotDirection); - drawTarget(g2d, m_targetPositionX, m_targetPositionY); - } - - private static void fillOval(Graphics g, int centerX, int centerY, int diam1, int diam2) - { - g.fillOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); - } - - private static void drawOval(Graphics g, int centerX, int centerY, int diam1, int diam2) - { - g.drawOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); - } - - private void drawRobot(Graphics2D g, int x, int y, double direction) - { - int robotCenterX = round(m_robotPositionX); - int robotCenterY = round(m_robotPositionY); - AffineTransform t = AffineTransform.getRotateInstance(direction, robotCenterX, robotCenterY); - g.setTransform(t); - g.setColor(Color.MAGENTA); - fillOval(g, robotCenterX, robotCenterY, 30, 10); - g.setColor(Color.BLACK); - drawOval(g, robotCenterX, robotCenterY, 30, 10); - g.setColor(Color.WHITE); - fillOval(g, robotCenterX + 10, robotCenterY, 5, 5); - g.setColor(Color.BLACK); - drawOval(g, robotCenterX + 10, robotCenterY, 5, 5); - } - - private void drawTarget(Graphics2D g, int x, int y) - { - AffineTransform t = AffineTransform.getRotateInstance(0, 0, 0); - g.setTransform(t); - g.setColor(Color.GREEN); - fillOval(g, x, y, 5, 5); - g.setColor(Color.BLACK); - drawOval(g, x, y, 5, 5); - } -} diff --git a/robots/src/gui/GameWindow.java b/robots/src/gui/GameWindow.java deleted file mode 100644 index ecb63c00f..000000000 --- a/robots/src/gui/GameWindow.java +++ /dev/null @@ -1,20 +0,0 @@ -package gui; - -import java.awt.BorderLayout; - -import javax.swing.JInternalFrame; -import javax.swing.JPanel; - -public class GameWindow extends JInternalFrame -{ - private final GameVisualizer m_visualizer; - public GameWindow() - { - super("Игровое поле", true, true, true, true); - m_visualizer = new GameVisualizer(); - JPanel panel = new JPanel(new BorderLayout()); - panel.add(m_visualizer, BorderLayout.CENTER); - getContentPane().add(panel); - pack(); - } -} diff --git a/robots/src/gui/MainApplicationFrame.java b/robots/src/gui/MainApplicationFrame.java deleted file mode 100644 index 62e943ee1..000000000 --- a/robots/src/gui/MainApplicationFrame.java +++ /dev/null @@ -1,156 +0,0 @@ -package gui; - -import java.awt.Dimension; -import java.awt.Toolkit; -import java.awt.event.KeyEvent; - -import javax.swing.JDesktopPane; -import javax.swing.JFrame; -import javax.swing.JInternalFrame; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; - -import log.Logger; - -/** - * Что требуется сделать: - * 1. Метод создания меню перегружен функционалом и трудно читается. - * Следует разделить его на серию более простых методов (или вообще выделить отдельный класс). - * - */ -public class MainApplicationFrame extends JFrame -{ - private final JDesktopPane desktopPane = new JDesktopPane(); - - public MainApplicationFrame() { - //Make the big window be indented 50 pixels from each edge - //of the screen. - int inset = 50; - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - setBounds(inset, inset, - screenSize.width - inset*2, - screenSize.height - inset*2); - - setContentPane(desktopPane); - - - LogWindow logWindow = createLogWindow(); - addWindow(logWindow); - - GameWindow gameWindow = new GameWindow(); - gameWindow.setSize(400, 400); - addWindow(gameWindow); - - setJMenuBar(generateMenuBar()); - setDefaultCloseOperation(EXIT_ON_CLOSE); - } - - protected LogWindow createLogWindow() - { - LogWindow logWindow = new LogWindow(Logger.getDefaultLogSource()); - logWindow.setLocation(10,10); - logWindow.setSize(300, 800); - setMinimumSize(logWindow.getSize()); - logWindow.pack(); - Logger.debug("Протокол работает"); - return logWindow; - } - - protected void addWindow(JInternalFrame frame) - { - desktopPane.add(frame); - frame.setVisible(true); - } - -// protected JMenuBar createMenuBar() { -// JMenuBar menuBar = new JMenuBar(); -// -// //Set up the lone menu. -// JMenu menu = new JMenu("Document"); -// menu.setMnemonic(KeyEvent.VK_D); -// menuBar.add(menu); -// -// //Set up the first menu item. -// JMenuItem menuItem = new JMenuItem("New"); -// menuItem.setMnemonic(KeyEvent.VK_N); -// menuItem.setAccelerator(KeyStroke.getKeyStroke( -// KeyEvent.VK_N, ActionEvent.ALT_MASK)); -// menuItem.setActionCommand("new"); -//// menuItem.addActionListener(this); -// menu.add(menuItem); -// -// //Set up the second menu item. -// menuItem = new JMenuItem("Quit"); -// menuItem.setMnemonic(KeyEvent.VK_Q); -// menuItem.setAccelerator(KeyStroke.getKeyStroke( -// KeyEvent.VK_Q, ActionEvent.ALT_MASK)); -// menuItem.setActionCommand("quit"); -//// menuItem.addActionListener(this); -// menu.add(menuItem); -// -// return menuBar; -// } - - private JMenuBar generateMenuBar() - { - JMenuBar menuBar = new JMenuBar(); - - JMenu lookAndFeelMenu = new JMenu("Режим отображения"); - lookAndFeelMenu.setMnemonic(KeyEvent.VK_V); - lookAndFeelMenu.getAccessibleContext().setAccessibleDescription( - "Управление режимом отображения приложения"); - - { - JMenuItem systemLookAndFeel = new JMenuItem("Системная схема", KeyEvent.VK_S); - systemLookAndFeel.addActionListener((event) -> { - setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - this.invalidate(); - }); - lookAndFeelMenu.add(systemLookAndFeel); - } - - { - JMenuItem crossplatformLookAndFeel = new JMenuItem("Универсальная схема", KeyEvent.VK_S); - crossplatformLookAndFeel.addActionListener((event) -> { - setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); - this.invalidate(); - }); - lookAndFeelMenu.add(crossplatformLookAndFeel); - } - - JMenu testMenu = new JMenu("Тесты"); - testMenu.setMnemonic(KeyEvent.VK_T); - testMenu.getAccessibleContext().setAccessibleDescription( - "Тестовые команды"); - - { - JMenuItem addLogMessageItem = new JMenuItem("Сообщение в лог", KeyEvent.VK_S); - addLogMessageItem.addActionListener((event) -> { - Logger.debug("Новая строка"); - }); - testMenu.add(addLogMessageItem); - } - - menuBar.add(lookAndFeelMenu); - menuBar.add(testMenu); - return menuBar; - } - - private void setLookAndFeel(String className) - { - try - { - UIManager.setLookAndFeel(className); - SwingUtilities.updateComponentTreeUI(this); - } - catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) - { - // just ignore - } - } -} diff --git a/robots/src/gui/RobotsProgram.java b/robots/src/gui/RobotsProgram.java deleted file mode 100644 index ae0930a8b..000000000 --- a/robots/src/gui/RobotsProgram.java +++ /dev/null @@ -1,25 +0,0 @@ -package gui; - -import java.awt.Frame; - -import javax.swing.SwingUtilities; -import javax.swing.UIManager; - -public class RobotsProgram -{ - public static void main(String[] args) { - try { - UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); -// UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); -// UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); -// UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); - } catch (Exception e) { - e.printStackTrace(); - } - SwingUtilities.invokeLater(() -> { - MainApplicationFrame frame = new MainApplicationFrame(); - frame.pack(); - frame.setVisible(true); - frame.setExtendedState(Frame.MAXIMIZED_BOTH); - }); - }} diff --git a/robots/src/log/LogChangeListener.java b/robots/src/log/LogChangeListener.java deleted file mode 100644 index 0b0fb85dd..000000000 --- a/robots/src/log/LogChangeListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package log; - -public interface LogChangeListener -{ - public void onLogChanged(); -} diff --git a/robots/src/log/LogWindowSource.java b/robots/src/log/LogWindowSource.java deleted file mode 100644 index ca0ce4426..000000000 --- a/robots/src/log/LogWindowSource.java +++ /dev/null @@ -1,89 +0,0 @@ -package log; - -import java.util.ArrayList; -import java.util.Collections; - -/** - * Что починить: - * 1. Этот класс порождает утечку ресурсов (связанные слушатели оказываются - * удерживаемыми в памяти) - * 2. Этот класс хранит активные сообщения лога, но в такой реализации он - * их лишь накапливает. Надо же, чтобы количество сообщений в логе было ограничено - * величиной m_iQueueLength (т.е. реально нужна очередь сообщений - * ограниченного размера) - */ -public class LogWindowSource -{ - private int m_iQueueLength; - - private ArrayList m_messages; - private final ArrayList m_listeners; - private volatile LogChangeListener[] m_activeListeners; - - public LogWindowSource(int iQueueLength) - { - m_iQueueLength = iQueueLength; - m_messages = new ArrayList(iQueueLength); - m_listeners = new ArrayList(); - } - - public void registerListener(LogChangeListener listener) - { - synchronized(m_listeners) - { - m_listeners.add(listener); - m_activeListeners = null; - } - } - - public void unregisterListener(LogChangeListener listener) - { - synchronized(m_listeners) - { - m_listeners.remove(listener); - m_activeListeners = null; - } - } - - public void append(LogLevel logLevel, String strMessage) - { - LogEntry entry = new LogEntry(logLevel, strMessage); - m_messages.add(entry); - LogChangeListener [] activeListeners = m_activeListeners; - if (activeListeners == null) - { - synchronized (m_listeners) - { - if (m_activeListeners == null) - { - activeListeners = m_listeners.toArray(new LogChangeListener [0]); - m_activeListeners = activeListeners; - } - } - } - for (LogChangeListener listener : activeListeners) - { - listener.onLogChanged(); - } - } - - public int size() - { - return m_messages.size(); - } - - public Iterable range(int startFrom, int count) - { - if (startFrom < 0 || startFrom >= m_messages.size()) - { - return Collections.emptyList(); - } - int indexTo = Math.min(startFrom + count, m_messages.size()); - return m_messages.subList(startFrom, indexTo); - } - - public Iterable all() - { - return m_messages; - } -} diff --git a/robots/src/main/java/gui/GameVisualizer.java b/robots/src/main/java/gui/GameVisualizer.java new file mode 100644 index 000000000..8657ed3a2 --- /dev/null +++ b/robots/src/main/java/gui/GameVisualizer.java @@ -0,0 +1,87 @@ +package main.java.gui; + +import model.*; + +import java.awt.Color; +import java.awt.EventQueue; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.geom.AffineTransform; +import java.util.Observable; +import java.util.Observer; + +import javax.swing.JPanel; + +import static main.java.tools.DrawTools.*; +import static main.java.tools.MathTools.*; + + +public class GameVisualizer extends JPanel implements Observer { + private final RobotModel robotModel; + private final TargetModel targetModel; + + public GameVisualizer(RobotModel robotModel, TargetModel targetModel) { + this.robotModel = robotModel; + this.targetModel = targetModel; + robotModel.addObserver(this); + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + targetModel.setTargetPosition(e.getPoint()); + repaint(); + } + }); + setDoubleBuffered(true); + } + + + protected void onRedrawEvent() { + EventQueue.invokeLater(this::repaint); + } + + @Override + public void update(Observable o, Object arg) { + if (arg.equals(RobotModel.ROBOT_POSITION_CHANGED)) EventQueue.invokeLater(this::onRedrawEvent); + } + + + @Override + public void paint(Graphics g) { + super.paint(g); + Graphics2D g2d = (Graphics2D) g.create(); + try { + drawRobot(g2d, robotModel); + drawTarget(g2d, targetModel); + } finally { + g2d.dispose(); + } + } + + private void drawTarget(Graphics2D g, TargetModel targetModel) { + int targetX = targetModel.getTargetX(); + int targetY = targetModel.getTargetY(); + AffineTransform t = new AffineTransform(); + g.setTransform(t); + g.setColor(Color.GREEN); + fillOval(g, targetX, targetY, 5, 5); + g.setColor(Color.BLACK); + drawOval(g, targetX, targetY, 5, 5); + } + + private void drawRobot(Graphics2D g, RobotModel robotModel) { + int robotCenterX = round(robotModel.getM_robotPositionX()); + int robotCenterY = round(robotModel.getM_robotPositionY()); + AffineTransform t = AffineTransform.getRotateInstance(robotModel.getM_robotDirection(), robotCenterX, robotCenterY); + g.setTransform(t); + g.setColor(Color.MAGENTA); + fillOval(g, robotCenterX, robotCenterY, 30, 10); + g.setColor(Color.BLACK); + drawOval(g, robotCenterX, robotCenterY, 30, 10); + g.setColor(Color.WHITE); + fillOval(g, robotCenterX + 10, robotCenterY, 5, 5); + g.setColor(Color.BLACK); + drawOval(g, robotCenterX + 10, robotCenterY, 5, 5); + } +} diff --git a/robots/src/main/java/gui/GameWindow.java b/robots/src/main/java/gui/GameWindow.java new file mode 100644 index 000000000..8208d345a --- /dev/null +++ b/robots/src/main/java/gui/GameWindow.java @@ -0,0 +1,23 @@ +package main.java.gui; + +import main.java.view.GameView; + +import javax.swing.*; +import java.awt.*; + +public class GameWindow extends JInternalFrame { + private final GameView gameView; + + public GameWindow(GameView gameView) { + super("Игровое поле", true, true, true, true); + this.gameView = gameView; + JPanel panel = new JPanel(new BorderLayout()); + panel.add(this.gameView, BorderLayout.CENTER); + getContentPane().add(panel); + pack(); + } + + public GameView getGameView() { + return this.gameView; + } +} \ No newline at end of file diff --git a/robots/src/gui/LogWindow.java b/robots/src/main/java/gui/LogWindow.java similarity index 67% rename from robots/src/gui/LogWindow.java rename to robots/src/main/java/gui/LogWindow.java index 723d3e2fc..40487fd4f 100644 --- a/robots/src/gui/LogWindow.java +++ b/robots/src/main/java/gui/LogWindow.java @@ -1,29 +1,28 @@ -package gui; +package main.java.gui; import java.awt.BorderLayout; import java.awt.EventQueue; import java.awt.TextArea; +import java.util.ResourceBundle; import javax.swing.JInternalFrame; import javax.swing.JPanel; -import log.LogChangeListener; -import log.LogEntry; -import log.LogWindowSource; +import main.java.log.LogChangeListener; +import main.java.log.LogEntry; +import main.java.log.LogWindowSource; -public class LogWindow extends JInternalFrame implements LogChangeListener -{ +public class LogWindow extends JInternalFrame implements LogChangeListener, Translatable { private LogWindowSource m_logSource; private TextArea m_logContent; - public LogWindow(LogWindowSource logSource) - { + public LogWindow(LogWindowSource logSource) { super("Протокол работы", true, true, true, true); m_logSource = logSource; m_logSource.registerListener(this); m_logContent = new TextArea(""); m_logContent.setSize(200, 500); - + JPanel panel = new JPanel(new BorderLayout()); panel.add(m_logContent, BorderLayout.CENTER); getContentPane().add(panel); @@ -31,20 +30,22 @@ public LogWindow(LogWindowSource logSource) updateLogContent(); } - private void updateLogContent() - { + private void updateLogContent() { StringBuilder content = new StringBuilder(); - for (LogEntry entry : m_logSource.all()) - { + for (LogEntry entry : m_logSource.all()) { content.append(entry.getMessage()).append("\n"); } m_logContent.setText(content.toString()); m_logContent.invalidate(); } - + @Override - public void onLogChanged() - { + public void onLogChanged() { EventQueue.invokeLater(this::updateLogContent); } + + @Override + public void translate(ResourceBundle bundle) { + setTitle(bundle.getString("logWindowHeader")); + } } diff --git a/robots/src/main/java/gui/MainApplicationFrame.java b/robots/src/main/java/gui/MainApplicationFrame.java new file mode 100644 index 000000000..02b6692b3 --- /dev/null +++ b/robots/src/main/java/gui/MainApplicationFrame.java @@ -0,0 +1,100 @@ +package main.java.gui; + +import main.java.log.Logger; +import main.java.view.ViewModel; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + +public class MainApplicationFrame extends JFrame { + private final JDesktopPane desktopPane = new JDesktopPane(); + + public MainApplicationFrame(ViewModel gameViewModel) { + + int inset = 50; + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + setBounds(inset, inset, + screenSize.width - inset * 2, + screenSize.height - inset * 2); + + setContentPane(desktopPane); + + LogWindow logWindow = createLogWindow(); + addWindow(logWindow); + + GameWindow gameWindow = gameViewModel.getGameWindow(); + addWindow(gameWindow); + + setJMenuBar(generateMenuBar()); + setDefaultCloseOperation(EXIT_ON_CLOSE); + } + + protected LogWindow createLogWindow() { + LogWindow logWindow = new LogWindow(Logger.getDefaultLogSource()); + logWindow.setLocation(610, 0); + logWindow.setSize(300, 800); + setMinimumSize(logWindow.getSize()); + logWindow.pack(); + Logger.debug("Протокол работает"); + return logWindow; + } + + protected void addWindow(JInternalFrame frame) { + desktopPane.add(frame); + frame.setVisible(true); + } + + private JMenu createMenu(String nameOfMenu, String description, int mnemonic) { + JMenu lookAndFeelMenu = new JMenu(nameOfMenu); + lookAndFeelMenu.setMnemonic(KeyEvent.VK_V); + lookAndFeelMenu.getAccessibleContext().setAccessibleDescription( + description); + return lookAndFeelMenu; + } + + private JMenuItem createMenuItem(String name, ActionListener l) { + JMenuItem systemLookAndFeel = new JMenuItem(name, KeyEvent.VK_S); + systemLookAndFeel.addActionListener(l); + + return systemLookAndFeel; + } + + private JMenuBar generateMenuBar() { + JMenuBar menuBar = new JMenuBar(); + + JMenu lookAndFeelMenu = createMenu("Режим отображения", + "Управление режимом отображения приложения", KeyEvent.VK_V); + JMenuItem systemLookAndFeel = createMenuItem("Системная схема", (event) -> { + setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + this.invalidate(); + }); + lookAndFeelMenu.add(systemLookAndFeel); + + JMenuItem crossplatformLookAndFeel = createMenuItem("Универсальная схема", (event) -> { + setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()); + this.invalidate(); + }); + lookAndFeelMenu.add(crossplatformLookAndFeel); + + JMenu testMenu = createMenu("Тесты", "Тестовые команды", KeyEvent.VK_S); + + JMenuItem addLogMessageItem = createMenuItem("Сообщение в лог", + (event) -> Logger.debug("Новая строка")); + testMenu.add(addLogMessageItem); + + menuBar.add(lookAndFeelMenu); + menuBar.add(testMenu); + return menuBar; + } + + private void setLookAndFeel(String className) { + try { + UIManager.setLookAndFeel(className); + SwingUtilities.updateComponentTreeUI(this); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // just ignore + } + } +} diff --git a/robots/src/main/java/gui/PositionWindow.java b/robots/src/main/java/gui/PositionWindow.java new file mode 100644 index 000000000..d7766c3ee --- /dev/null +++ b/robots/src/main/java/gui/PositionWindow.java @@ -0,0 +1,45 @@ +package main.java.gui; + +import model.RobotModel; + +import java.util.Observable; +import java.util.Observer; +import javax.swing.*; +import java.awt.*; +import java.util.ResourceBundle; + +public class PositionWindow extends JInternalFrame implements Observer, Translatable { + private final JLabel labelX; + private final JLabel labelY; + private final RobotModel m_RobotModel; + + public PositionWindow(RobotModel robotModel, int width, int height) { + super("Координаты робота", true, true, true, true); + m_RobotModel = robotModel; + JPanel panel = new JPanel(new BorderLayout()); + m_RobotModel.addObserver(this); + labelX = new JLabel("X: %f".formatted(m_RobotModel.getM_robotPositionX())); + labelY = new JLabel("Y: %f".formatted(m_RobotModel.getM_robotPositionY())); + panel.add(labelX, BorderLayout.BEFORE_FIRST_LINE); + panel.add(labelY, BorderLayout.CENTER); + getContentPane().add(panel); + pack(); + setSize(width, height); + setLocation(1600, 50); + } + + @Override + public void update(Observable o, Object arg) { + if (arg.equals(RobotModel.ROBOT_POSITION_CHANGED)) EventQueue.invokeLater(this::updateCoords); + } + + void updateCoords() { + labelX.setText("X: %f".formatted(m_RobotModel.getM_robotPositionX())); + labelY.setText("Y: %f".formatted(m_RobotModel.getM_robotPositionY())); + } + + @Override + public void translate(ResourceBundle bundle) { + setTitle(bundle.getString("positionWindowHeader")); + } +} diff --git a/robots/src/main/java/gui/RobotsProgram.java b/robots/src/main/java/gui/RobotsProgram.java new file mode 100644 index 000000000..f09ac8521 --- /dev/null +++ b/robots/src/main/java/gui/RobotsProgram.java @@ -0,0 +1,40 @@ +package main.java.gui; + +import model.RobotModel; +import model.TargetModel; +import main.java.view.GameView; +import model.Model; +import main.java.view.ViewModel; +import javax.swing.*; +import java.awt.*; + +public class RobotsProgram { + public static void main(String[] args) { + try { + UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); + } catch (Exception e) { + e.printStackTrace(); + } + Model gameModel = new Model(); + GameView gameView = new GameView(gameModel); + GameWindow gameWindow = new GameWindow(gameView); + + + TargetModel targetModel = new TargetModel(); + RobotModel robotModel = new RobotModel(targetModel); + + GameVisualizer gameVisualizer = new GameVisualizer(robotModel, targetModel); + PositionWindow positionWindow = new PositionWindow(robotModel, 800, 600); + gameVisualizer.onRedrawEvent(); + positionWindow.updateCoords(); + + ViewModel viewModel = new ViewModel(gameModel, gameWindow); + + SwingUtilities.invokeLater(() -> { + MainApplicationFrame frame = new MainApplicationFrame(viewModel); + frame.pack(); + frame.setVisible(true); + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + }); + } +} diff --git a/robots/src/main/java/gui/Translatable.java b/robots/src/main/java/gui/Translatable.java new file mode 100644 index 000000000..31fb3f0b6 --- /dev/null +++ b/robots/src/main/java/gui/Translatable.java @@ -0,0 +1,7 @@ +package main.java.gui; + +import java.util.ResourceBundle; + +public interface Translatable { + void translate(ResourceBundle bundle); +} diff --git a/robots/src/main/java/log/LogChangeListener.java b/robots/src/main/java/log/LogChangeListener.java new file mode 100644 index 000000000..c9e263260 --- /dev/null +++ b/robots/src/main/java/log/LogChangeListener.java @@ -0,0 +1,6 @@ +package main.java.log; + +public interface LogChangeListener +{ + public void onLogChanged(); +} diff --git a/robots/src/log/LogEntry.java b/robots/src/main/java/log/LogEntry.java similarity index 92% rename from robots/src/log/LogEntry.java rename to robots/src/main/java/log/LogEntry.java index 3d9147107..a29b50e7e 100644 --- a/robots/src/log/LogEntry.java +++ b/robots/src/main/java/log/LogEntry.java @@ -1,24 +1,23 @@ -package log; +package main.java.log; public class LogEntry { private LogLevel m_logLevel; private String m_strMessage; - + public LogEntry(LogLevel logLevel, String strMessage) { m_strMessage = strMessage; m_logLevel = logLevel; } - + public String getMessage() { return m_strMessage; } - + public LogLevel getLevel() { return m_logLevel; } -} - +} \ No newline at end of file diff --git a/robots/src/log/LogLevel.java b/robots/src/main/java/log/LogLevel.java similarity index 90% rename from robots/src/log/LogLevel.java rename to robots/src/main/java/log/LogLevel.java index 582d010cc..db858dd9f 100644 --- a/robots/src/log/LogLevel.java +++ b/robots/src/main/java/log/LogLevel.java @@ -1,4 +1,4 @@ -package log; +package main.java.log; public enum LogLevel { @@ -8,14 +8,14 @@ public enum LogLevel Warning(3), Error(4), Fatal(5); - + private int m_iLevel; - + private LogLevel(int iLevel) { m_iLevel = iLevel; } - + public int level() { return m_iLevel; diff --git a/robots/src/main/java/log/LogWindowSource.java b/robots/src/main/java/log/LogWindowSource.java new file mode 100644 index 000000000..a283d2720 --- /dev/null +++ b/robots/src/main/java/log/LogWindowSource.java @@ -0,0 +1,65 @@ +package main.java.log; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.concurrent.CopyOnWriteArrayList; + +public class LogWindowSource { + private final int m_iQueueLength; + + private final ArrayList m_messages; + private final CopyOnWriteArrayList m_listeners; + private volatile LogChangeListener[] m_activeListeners; + + public LogWindowSource(int iQueueLength) { + m_iQueueLength = iQueueLength; + m_messages = new ArrayList<>(iQueueLength); + m_listeners = new CopyOnWriteArrayList<>(); + } + + public void registerListener(LogChangeListener listener) { + m_listeners.add(listener); + m_activeListeners = null; + } + + public void unregisterListener(LogChangeListener listener) { + m_listeners.remove(listener); + m_activeListeners = null; + } + + public void append(LogLevel logLevel, String strMessage) { + LogEntry entry = new LogEntry(logLevel, strMessage); + if (size() >= m_iQueueLength) m_messages.remove(0); + synchronized (this) { + m_messages.add(entry); + } + LogChangeListener[] activeListeners = m_activeListeners; + if (activeListeners == null) { + synchronized (m_listeners) { + if (m_activeListeners == null) { + activeListeners = m_listeners.toArray(new LogChangeListener[0]); + m_activeListeners = activeListeners; + } + } + } + for (LogChangeListener listener : activeListeners) { + listener.onLogChanged(); + } + } + + public synchronized int size() { + return m_messages.size(); + } + + public synchronized Iterable range(int startFrom, int count) { + if (startFrom < 0 || startFrom >= size()) { + return Collections.emptyList(); + } + int indexTo = Math.min(startFrom + count, size()); + return m_messages.subList(startFrom, indexTo); + } + + public synchronized Iterable all() { + return m_messages; + } +} diff --git a/robots/src/log/Logger.java b/robots/src/main/java/log/Logger.java similarity index 95% rename from robots/src/log/Logger.java rename to robots/src/main/java/log/Logger.java index b008a5d01..d7cf78f2f 100644 --- a/robots/src/log/Logger.java +++ b/robots/src/main/java/log/Logger.java @@ -1,4 +1,4 @@ -package log; +package main.java.log; public final class Logger { @@ -6,7 +6,7 @@ public final class Logger static { defaultLogSource = new LogWindowSource(100); } - + private Logger() { } @@ -15,7 +15,7 @@ public static void debug(String strMessage) { defaultLogSource.append(LogLevel.Debug, strMessage); } - + public static void error(String strMessage) { defaultLogSource.append(LogLevel.Error, strMessage); diff --git a/robots/src/main/java/model/Entity.java b/robots/src/main/java/model/Entity.java new file mode 100644 index 000000000..3a081d7e4 --- /dev/null +++ b/robots/src/main/java/model/Entity.java @@ -0,0 +1,12 @@ +package model; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +public interface Entity extends PropertyChangeListener { + void update(); + + void onStart(PropertyChangeSupport publisher); + + void onFinish(PropertyChangeSupport publisher); +} \ No newline at end of file diff --git a/robots/src/main/java/model/Model.java b/robots/src/main/java/model/Model.java new file mode 100644 index 000000000..fa7e212f8 --- /dev/null +++ b/robots/src/main/java/model/Model.java @@ -0,0 +1,66 @@ +package model; + +import java.awt.*; +import java.beans.PropertyChangeSupport; +import java.util.ArrayList; +import java.util.List; +import java.util.Timer; +import java.util.TimerTask; + +public class Model { + private final List entities; + private final PropertyChangeSupport support; + + public Model() { + this.support = new PropertyChangeSupport(this); + this.entities = initStateOfBacterias(2); + + Timer timer = initTimer(); + timer.schedule(new TimerTask() { + @Override + public void run() { + System.out.println("timer"); + support.firePropertyChange("change satiety", null, -10); + } + }, 0, 1500); + } + + private static java.util.Timer initTimer() { + return new Timer("satiety generator", true); + } + + public void setDimension(Dimension dimension) { + support.firePropertyChange("set dimension", null, dimension); + } + + public Dimension getDimension() { + return ((Robot) entities.get(0)).getDimension(); + } + + public void updateModel() { + for (Entity entity : entities) { + entity.update(); + } + } + + public List getEntities() { + return entities; + } + + public void setTarget(Point point) { + support.firePropertyChange("new point", null, point); + } + + public List initStateOfBacterias(int amount) { + List entityList = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + Robot robot = new Robot(Math.random() * 400, Math.random() * 400); + robot.setTarget(new Point((int) (Math.random() * 400), (int) (Math.random() * 400))); + robot.onStart(support); + entityList.add(robot); + } + return entityList; + } +} + + diff --git a/robots/src/main/java/model/Robot.java b/robots/src/main/java/model/Robot.java new file mode 100644 index 000000000..f97ce7c79 --- /dev/null +++ b/robots/src/main/java/model/Robot.java @@ -0,0 +1,234 @@ +package model; + +import java.awt.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeSupport; + +public class Robot implements Entity { + private double positionX; + private double positionY; + private Target target; + private Dimension dimension; + private volatile double robotDirection; + public static final double maxVelocity = 0.1; + public static final double maxAngularVelocity = 0.01; + private static final int INITIAL_SATIETY = 50; + private static final int MAX_SATIETY = 100; + private int satiety; + private TypeRobot type; + private boolean isAlive; + private boolean isTargetAchieved; + + public Robot(double x, double y) { + this.positionX = x; + this.positionY = y; + this.target = new Target(); + this.robotDirection = Math.random() * 10;; + this.dimension = new Dimension(300, 300); + this.satiety = (int) (INITIAL_SATIETY + Math.random() * (MAX_SATIETY - INITIAL_SATIETY)); + this.isAlive = true; + this.type= TypeRobot.randomType(); + } + + public Robot() { + this.positionX = 300; + this.positionY = 300; + this.target = new Target(); + this.robotDirection = 0; + } + + private void setRandomType() { + this.type = TypeRobot.randomType(); + } + + public void setType(TypeRobot type) { + this.type = type; + } + public TypeRobot getType() { + return type; + } + + public int getSatiety() { + return satiety; + } + + public void changeSatiety(int satiety) { + this.satiety += satiety; + } + + public void setDimension(Dimension dimension) { + this.dimension = dimension; + if (!target.isPositionCorrect(dimension)) { + target = new Target((int) (Math.random() * dimension.width), (int) (Math.random() * dimension.height)); + } + } + + public Dimension getDimension() { + return this.dimension; + } + + public double getPositionX() { + return positionX; + } + + public void setPositionX(double positionX) { + this.positionX = positionX; + } + + public double getPositionY() { + return positionY; + } + + public void setPositionY(double positionY) { + this.positionY = positionY; + } + + public double getRobotDirection() { + return robotDirection; + } + + public void setRobotDirection(double robotDirection) { + this.robotDirection = robotDirection; + } + + private static double distance(double x1, double y1, double x2, double y2) { + double diffX = x1 - x2; + double diffY = y1 - y2; + return Math.sqrt(diffX * diffX + diffY * diffY); + } + + private static double angleTo(double fromX, double fromY, double toX, double toY) { + double diffX = toX - fromX; + double diffY = toY - fromY; + + return asNormalizedRadians(Math.atan2(diffY, diffX)); + } + + private static double asNormalizedRadians(double angle) { + while (angle < 0) { + angle += 2 * Math.PI; + } + while (angle >= 2 * Math.PI) { + angle -= 2 * Math.PI; + } + return angle; + } + + private double normalizedPositionX(double x) { + if (x < 0) + return 0; + if (x > dimension.width) + return dimension.width; + return x; + } + + private double normalizedPositionY(double y) { + if (y < 0) + return 0; + if (y > dimension.height) + return dimension.height; + return y; + } + + private static double applyLimits(double value, double min, double max) { + if (value < min) + return min; + if (value > max) + return max; + return value; + } + + public Target getTarget() { + return target; + } + + public void setTarget(Point point) { + this.target.setTargetPosition(point); + } + + private void moveRobot(double velocity, double angularVelocity, double duration) { + velocity = applyLimits(velocity, 0, Robot.maxVelocity); + angularVelocity = applyLimits(angularVelocity, -Robot.maxAngularVelocity, Robot.maxAngularVelocity); + double newX = getPositionX() + velocity / angularVelocity * + (Math.sin(getRobotDirection() + angularVelocity * duration) - + Math.sin(getRobotDirection())); + if (!Double.isFinite(newX)) { + newX = getPositionX() + velocity * duration * Math.cos(getRobotDirection()); + } + double newY = getPositionY() - velocity / angularVelocity * + (Math.cos(getRobotDirection() + angularVelocity * duration) - + Math.cos(getRobotDirection())); + if (!Double.isFinite(newY)) { + newY = getPositionY() + velocity * duration * Math.sin(getRobotDirection()); + } + setPositionX(normalizedPositionX(newX)); + setPositionY(normalizedPositionY(newY)); + double newDirection = asNormalizedRadians(getRobotDirection() + angularVelocity * duration); + setRobotDirection(newDirection); + } + + @Override + public void update() { + if (!this.isAlive) { + this.setType(TypeRobot.DEAD); + + return; + } + if (this.satiety < 50) { + if (this.satiety < 0) { + isAlive = false; + } + this.setType(TypeRobot.HUNGRY); + + } + double distance = distance(target.getX(), target.getY(), + getPositionX(), getPositionY()); + this.isTargetAchieved = false; + if (distance < 0.5) { + this.isTargetAchieved = true; + this.onTargetAchieved(); + + return; + } + double angleToTarget = angleTo(getPositionX(), getPositionY(), + target.getX(), target.getY()); + double angularVelocity = 0; + if (angleToTarget > getRobotDirection()) { + angularVelocity = Robot.maxAngularVelocity; + } + if (angleToTarget < getRobotDirection()) { + angularVelocity = -Robot.maxAngularVelocity; + } + + moveRobot(Robot.maxVelocity, angularVelocity, 10); + + } + + @Override + public void onStart(PropertyChangeSupport publisher) { + publisher.addPropertyChangeListener(this); + } + + @Override + public void onFinish(PropertyChangeSupport publisher) { + publisher.removePropertyChangeListener(this); + } + + private void onTargetAchieved() { + this.setTarget(new Point((int) (Math.random() * dimension.width), (int) (Math.random() * dimension.height))); + this.satiety += 25; + if (this.satiety > 50) { + this.setRandomType(); + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals("new point")) + setTarget((Point) evt.getNewValue()); + if (evt.getPropertyName().equals("change satiety")) + changeSatiety((int) evt.getNewValue()); + if (evt.getPropertyName().equals("set dimension")) + setDimension((Dimension) evt.getNewValue()); + } +} diff --git a/robots/src/main/java/model/RobotModel.java b/robots/src/main/java/model/RobotModel.java new file mode 100644 index 000000000..952ba599b --- /dev/null +++ b/robots/src/main/java/model/RobotModel.java @@ -0,0 +1,64 @@ +package model; + +import java.util.Observable; + +import static main.java.tools.MathTools.*; + +public class RobotModel extends Observable { + private volatile double m_robotPositionX = 100; + private volatile double m_robotPositionY = 100; + private volatile double m_robotDirection = 0; + public static final double maxVelocity = 0.1; + public static final double maxAngularVelocity = 0.001; + private final TargetModel targetModel; + public final static String ROBOT_POSITION_CHANGED = "The robot's position has changed"; + + public RobotModel(TargetModel targetModel) { + this.targetModel = targetModel; + } + + public double getM_robotPositionX() { + return m_robotPositionX; + } + + public double getM_robotPositionY() { + return m_robotPositionY; + } + + public double getM_robotDirection() { + return m_robotDirection; + } + + public void moveRobot(double velocity, double angularVelocity, double duration) { + velocity = applyLimits(velocity, 0, maxVelocity); + angularVelocity = applyLimits(angularVelocity, -maxAngularVelocity, maxAngularVelocity); + double newX = m_robotPositionX + velocity / angularVelocity * + (Math.sin(m_robotDirection + angularVelocity * duration) - + Math.sin(m_robotDirection)); + double newY = m_robotPositionY - velocity / angularVelocity * + (Math.cos(m_robotDirection + angularVelocity * duration) - + Math.cos(m_robotDirection)); + + if (!Double.isFinite(newX)) newX = m_robotPositionX + velocity * duration * Math.cos(m_robotDirection); + if (!Double.isFinite(newY)) newY = m_robotPositionY + velocity * duration * Math.sin(m_robotDirection); + + m_robotPositionX = newX; + m_robotPositionY = newY; + m_robotDirection = asNormalizedRadians(m_robotDirection + angularVelocity * duration); + setChanged(); + notifyObservers(ROBOT_POSITION_CHANGED); + } + + public void updateRobotPosition() { + double distance = distance(targetModel.getTargetX(), targetModel.getTargetY(), m_robotPositionX, m_robotPositionY); + if (distance < 0.5) return; + + double angleToTarget = angleTo(m_robotPositionX, m_robotPositionY, targetModel.getTargetX(), targetModel.getTargetY()); + double angularVelocity = 0; + if (angleToTarget > m_robotDirection) angularVelocity = maxAngularVelocity; + if (angleToTarget < m_robotDirection) angularVelocity = -maxAngularVelocity; + if (Math.abs(angleToTarget - m_robotDirection) > Math.PI) angularVelocity = -angularVelocity; + moveRobot(maxVelocity, angularVelocity, 10); + + } +} diff --git a/robots/src/main/java/model/Target.java b/robots/src/main/java/model/Target.java new file mode 100644 index 000000000..3bbb9442b --- /dev/null +++ b/robots/src/main/java/model/Target.java @@ -0,0 +1,46 @@ +package model; + +import java.awt.*; + +public class Target { + private volatile int x; + private volatile int y; + + public Target() { + this.x = 100; + this.y = 100; + } + + public Target(int x, int y) { + this.x = x; + this.y = y; + } + + public void setX(int x) { + this.x = x; + } + + public void setY(int y) { + this.y = y; + } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public void setTargetPosition(Point p) { + setX(p.x); + setY(p.y); + } + + + + public boolean isPositionCorrect(Dimension dimension) { + return this.x <= dimension.width && this.y <= dimension.height; + } + +} diff --git a/robots/src/main/java/model/TargetModel.java b/robots/src/main/java/model/TargetModel.java new file mode 100644 index 000000000..bf62915ad --- /dev/null +++ b/robots/src/main/java/model/TargetModel.java @@ -0,0 +1,21 @@ +package model; + +import java.awt.*; + +public class TargetModel { + private volatile int m_targetPositionX = 150; + private volatile int m_targetPositionY = 100; + + public void setTargetPosition(Point p) { + m_targetPositionX = p.x; + m_targetPositionY = p.y; + } + + public int getTargetX() { + return m_targetPositionX; + } + + public int getTargetY() { + return m_targetPositionY; + } +} diff --git a/robots/src/main/java/model/TypeRobot.java b/robots/src/main/java/model/TypeRobot.java new file mode 100644 index 000000000..e733f7891 --- /dev/null +++ b/robots/src/main/java/model/TypeRobot.java @@ -0,0 +1,27 @@ +package model; + +import java.awt.*; +import java.util.List; +import java.util.Random; + +public enum TypeRobot { + CALM(Color.GREEN), + HUNGRY(Color.RED), + DEAD(Color.BLACK); + private final Color color; + private static final Random RANDOM = new Random(); + private static final List values = List.of(values()); + + public static TypeRobot randomType() { + return values.get(RANDOM.nextInt(values().length - 2)); + } + + TypeRobot(Color color) { + this.color = color; + } + + + public Color getColor() { + return color; + } +} \ No newline at end of file diff --git a/robots/src/main/java/tools/DrawTools.java b/robots/src/main/java/tools/DrawTools.java new file mode 100644 index 000000000..dae43b4f9 --- /dev/null +++ b/robots/src/main/java/tools/DrawTools.java @@ -0,0 +1,13 @@ +package main.java.tools; + +import java.awt.*; + +public class DrawTools { + public static void fillOval(Graphics g, int centerX, int centerY, int diam1, int diam2) { + g.fillOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); + } + + public static void drawOval(Graphics g, int centerX, int centerY, int diam1, int diam2) { + g.drawOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); + } +} diff --git a/robots/src/main/java/tools/MathTools.java b/robots/src/main/java/tools/MathTools.java new file mode 100644 index 000000000..ffe704340 --- /dev/null +++ b/robots/src/main/java/tools/MathTools.java @@ -0,0 +1,36 @@ +package main.java.tools; + +public class MathTools { + public static double distance(double x1, double y1, double x2, double y2) { + double diffX = x1 - x2; + double diffY = y1 - y2; + return Math.sqrt(diffX * diffX + diffY * diffY); + } + + public static double asNormalizedRadians(double angle) { + while (angle < 0) { + angle += 2 * Math.PI; + } + while (angle >= 2 * Math.PI) { + angle -= 2 * Math.PI; + } + return angle; + } + + public static double angleTo(double fromX, double fromY, double toX, double toY) { + double diffX = toX - fromX; + double diffY = toY - fromY; + + return asNormalizedRadians(Math.atan2(diffY, diffX)); + } + + public static double applyLimits(double value, double min, double max) { + if (value < min) + return min; + return Math.min(value, max); + } + + public static int round(double value) { + return (int) (value + 0.5); + } +} diff --git a/robots/src/main/java/view/GameDrawer.java b/robots/src/main/java/view/GameDrawer.java new file mode 100644 index 000000000..5d8991dcb --- /dev/null +++ b/robots/src/main/java/view/GameDrawer.java @@ -0,0 +1,20 @@ +package main.java.view; + +import model.Entity; + +import java.awt.*; + +public abstract class GameDrawer { + protected static void fillOval(Graphics g, int centerX, int centerY, int diam1, int diam2) { + g.fillOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); + } + + protected static void drawOval(Graphics g, int centerX, int centerY, int diam1, int diam2) { + g.drawOval(centerX - diam1 / 2, centerY - diam2 / 2, diam1, diam2); + } + + public abstract void draw(Graphics2D g, Entity entity); + + + public abstract Class getDrawingType(); +} diff --git a/robots/src/main/java/view/GameView.java b/robots/src/main/java/view/GameView.java new file mode 100644 index 000000000..c53358517 --- /dev/null +++ b/robots/src/main/java/view/GameView.java @@ -0,0 +1,47 @@ +package main.java.view; + +import model.Entity; +import model.Model; +import model.Target; + +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +public class GameView extends JPanel { + private final Model gameModel; + private final Map, GameDrawer> map; + public GameView(Model gameModel) { + this.gameModel = gameModel; + setDoubleBuffered(true); + map = new HashMap<>(); + map.put(new RobotDrawer().getDrawingType(), new RobotDrawer()); + map.put(new TargetDrawer().getDrawingType(), new TargetDrawer()); + this.setPreferredSize(new Dimension(600, 600)); + this.setSize(new Dimension(600, 600)); + this.setBorder(BorderFactory.createLineBorder(Color.RED)); + + } + + public void updateView() { + onRedrawEvent(); + } + + protected void onRedrawEvent() { + EventQueue.invokeLater(this::repaint); + } + + @Override + public void paint(Graphics g) { + super.paint(g); + Graphics2D g2d = (Graphics2D) g; + RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHints(rh); + ArrayList entities = (ArrayList) gameModel.getEntities(); + for (Entity entity : entities) { + map.get(entity.getClass()).draw(g2d, entity); + map.get(Target.class).draw(g2d, entity); + } + } +} \ No newline at end of file diff --git a/robots/src/main/java/view/RobotDrawer.java b/robots/src/main/java/view/RobotDrawer.java new file mode 100644 index 000000000..ca98a56dc --- /dev/null +++ b/robots/src/main/java/view/RobotDrawer.java @@ -0,0 +1,55 @@ +package main.java.view; + +import model.Robot; +import model.Entity; +import model.TypeRobot; +import java.awt.*; +import java.awt.geom.AffineTransform; + +public class RobotDrawer extends GameDrawer { + @Override + public void draw(Graphics2D g, Entity entity) + { + Robot robot = (Robot) entity; + AffineTransform oldTransform = g.getTransform(); + int robotCenterX = (int) (Math.round(robot.getPositionX())); + int robotCenterY = (int) (Math.round(robot.getPositionY())); + AffineTransform l = new AffineTransform(oldTransform); + AffineTransform t = AffineTransform.getRotateInstance(robot.getRobotDirection(), robotCenterX, robotCenterY); + l.concatenate(t); + + g.setTransform(l); + + g.setColor(robot.getType().getColor()); + if (robot.getType().equals(TypeRobot.HUNGRY)) { + fillOval(g, robotCenterX, robotCenterY, 20, 10); + g.setColor(Color.BLACK); + drawOval(g, robotCenterX, robotCenterY, 20, 10); + g.setColor(Color.YELLOW); + } + + if (robot.getType().equals(TypeRobot.CALM)) { + fillOval(g, robotCenterX, robotCenterY, 25, 15); + g.setColor(Color.BLACK); + drawOval(g, robotCenterX, robotCenterY, 25, 15); + g.setColor(Color.WHITE); + } + + if (robot.getType().equals(TypeRobot.DEAD)) { + fillOval(g, robotCenterX, robotCenterY, 20, 10); + g.setColor(Color.WHITE); + drawOval(g, robotCenterX, robotCenterY, 20, 10); + g.setColor(Color.BLACK); + } + + fillOval(g, robotCenterX + 7, robotCenterY, 5, 5); + g.setColor(Color.BLACK); + drawOval(g, robotCenterX + 7, robotCenterY, 5, 5); + g.setTransform(oldTransform); + } + + @Override + public Class getDrawingType() { + return Robot.class; + } +} \ No newline at end of file diff --git a/robots/src/main/java/view/TargetDrawer.java b/robots/src/main/java/view/TargetDrawer.java new file mode 100644 index 000000000..9da29f084 --- /dev/null +++ b/robots/src/main/java/view/TargetDrawer.java @@ -0,0 +1,22 @@ +package main.java.view; + +import model.Entity; +import model.Robot; +import model.Target; + +import java.awt.*; + +public class TargetDrawer extends GameDrawer { + @Override + public void draw(Graphics2D g, Entity entity) { + Target target = ((Robot) entity).getTarget(); + g.setColor(Color.GREEN); + fillOval(g, target.getX(), target.getY(), 5, 5); + g.setColor(Color.BLACK); + drawOval(g, target.getX(), target.getY(), 5, 5); + } + @Override + public Class getDrawingType() { + return Target.class; + } +} diff --git a/robots/src/main/java/view/ViewModel.java b/robots/src/main/java/view/ViewModel.java new file mode 100644 index 000000000..f30db5da5 --- /dev/null +++ b/robots/src/main/java/view/ViewModel.java @@ -0,0 +1,76 @@ +package main.java.view; + +import main.java.gui.GameWindow; +import model.Model; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.Timer; +import java.util.TimerTask; + +public class ViewModel { + private final Model gameModel; + private final GameWindow gameWindow; + private final java.util.Timer timer = initTimer(); + + private static java.util.Timer initTimer() { + return new Timer("events generator", true); + } + + public ViewModel(Model gameModel, GameWindow gameWindow) { + this.gameModel = gameModel; + this.gameWindow = gameWindow; + initListeners(); + } + + private void initListeners() { + timer.schedule(new TimerTask() { + @Override + public void run() { + gameModel.setDimension(gameWindow.getSize()); + getGameView().updateView(); + } + }, 0, 5); + + timer.schedule(new TimerTask() { + @Override + public void run() { + gameModel.updateModel(); + } + }, 0, 5); + gameWindow.getGameView().addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + gameModel.setTarget(e.getPoint()); + getGameView().repaint(); + } + }); + gameWindow.addComponentListener(new ComponentAdapter() { + @Override + public void componentResized(final ComponentEvent e) { + super.componentResized(e); + System.out.println("resize"); + gameModel.setDimension((gameWindow.getSize())); + System.out.println(gameModel.getDimension()); + } + }); + + gameWindow.getGameView().addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + System.out.println(e.getPoint()); + gameModel.setTarget(e.getPoint()); + getGameView().repaint(); + } + }); + } + + public GameView getGameView() { + return gameWindow.getGameView(); + } + + public GameWindow getGameWindow() { + return gameWindow; + } +} \ No newline at end of file