Session 2

.gitignore

@@ -0,0 +1,19 @@
+#including all files and folders except src and readme
+*
+!src/
+!README.md
+
+#macos system files
+**/.DS_Store
+
+#eclipse files
+.settings/
+.classpath
+.project
+
+#intellij
+.idea/
+
+#vscode
+.vscode/
+

MiniGameAp2020.iml

@@ -6,7 +6,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="jdk-12.0.2" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

README.md

@@ -0,0 +1,2 @@
+a description on how to import the source files into IDE:
+https://github.com/aeirya/MiniGameAp2020/issues/1

src/Main.java

@@ -0,0 +1,11 @@
+import controller.Administrator;
+
+public class Main implements Runnable {
+    public static void main(String[] args) {
+        new Main().run();
+    }
+
+    public void run() {
+        Administrator.getInstance().start();
+    }
+}

src/channels/GamePanel.java

@@ -0,0 +1,10 @@
+package channels;
+
+public class GamePanel extends Panel {
+
+	public GamePanel() {
+		//this is an empty panel
+	}
+
+	private static final long serialVersionUID = 1L;
+}

src/channels/Panel.java

@@ -0,0 +1,35 @@
+package channels;
+
+import java.awt.Graphics;
+import java.util.List;
+import javax.swing.JPanel;
+
+import controller.Administrator;
+import mvvm.Data;
+import mvvm.ViewModel;
+
+/** 
+ * Wrapper of JPanel, sends data to view model for drawing 
+ * @see ViewModel
+*/
+public class Panel extends JPanel {
+
+	private final transient ViewModel viewModel;
+
+	public Panel() {
+		this.viewModel = ViewModel.getInstance();
+	}
+
+	@Override
+	public void paint(Graphics g) {
+        super.paint(g);
+        sendToViewModel(g);	
+	}	
+
+	private void sendToViewModel(Graphics g) {
+        final List<Data> data = Administrator.getInstance().getData();
+		viewModel.draw(g, data);
+    }
+
+    private static final long serialVersionUID = 1L;
+}

src/controller/Administrator.java

@@ -0,0 +1,115 @@
+package controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import tv.View;
+import logic.GameLogic;
+import model.GameObject;
+import mvvm.Data;
+import net.DataParser;
+import net.DummyNetworkManager;
+import net.INetworkManager;
+
+/** Main controller of the game, 
+ *  responsible for retrieving and keeping data from network,
+ *  and also starting different components of the game
+ */
+
+public class Administrator {
+
+    private final View view;
+    private final GameLogic game;
+    private final DataParser dataParser;
+    private final List<GameObject> gameObjects;
+    private INetworkManager network;
+    private List<Data> data;
+
+    /* lazy instantiation of the singleton Administrator */
+    private static class InstanceHolder {
+        public static final Administrator instance = new Administrator();
+    }
+
+    public static Administrator getInstance() {
+        return InstanceHolder.instance;
+    }
+
+    public Administrator() {
+        data = new ArrayList<>();
+
+        //models
+        gameObjects = new ArrayList<>();
+        //logic
+        game = new GameLogic();
+        //graphics
+        view = new View();
+        //network
+        network = new DummyNetworkManager(); //does nothing!!
+        dataParser = new DataParser();
+    }
+
+    /**
+     * starts main components of the game
+     * @see INetworkManager
+     * @see GameLogic
+     * @see View
+     */
+    public void start() {
+        network.connect();
+        new DataUpdater().start();
+
+        game.start();
+        view.start();
+    }
+
+    public List<Data> getData() {
+        return data;
+    }
+
+    /**
+     * used by the game logic to do calculations
+     * @return game objects
+     * @see GameLogic
+     */
+    public List<GameObject> getGameObjects() {
+        return gameObjects;
+    }
+
+    /**
+     * calls retrieve data on a time basis,
+     * @author it would be better to make a timer instead!
+     */
+    private class DataUpdater {
+
+        private final Runnable update = () -> {
+            while (true) {
+                this.retrieveData();
+                try {
+                    Thread.sleep(32); // sync with view later
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                } 
+            }
+        };
+
+        public void start() {
+            new Thread(this.update).start();
+        }
+
+        /**
+         * recieves data from network
+         * @see Data
+         * @see INetworkManager
+        */
+        private void retrieveData() {
+            final List<Data> retrievedData =  network.retrieveData();
+            if (retrievedData != null) {
+                // this is the part things are prone to bug..
+                // it depennds on our design: either we always send all data or we only send new data from server
+                data = retrievedData;
+                gameObjects.addAll(
+                    dataParser.parse(retrievedData)
+                    );
+            }
+        }
+    }
+}

src/enums/Channels.java

@@ -1,7 +1,8 @@
 package enums;
 
+/**
+ *  different menus of the game
+ *  @apiNote these will be mapped to JPanels */
 public enum Channels {
-
-	game , menu , pause;
-
+    GAME, MENU, PAUSE       
 }

src/enums/DrawType.java

@@ -1,5 +1,6 @@
 package enums;
 
 public enum DrawType {
-
+	REC, OVAL, IMAGE
 }
+

src/enums/ShapeType.java

@@ -0,0 +1,5 @@
+package enums;
+
+public enum ShapeType {
+    CIRCLE
+}

src/listeners/Collidable.java

@@ -0,0 +1,5 @@
+package listeners;
+
+public interface Collidable {
+    boolean collides(Collidable other);
+}

src/listeners/IAnimate.java

@@ -0,0 +1,6 @@
+package listeners;
+
+public interface IAnimate {
+    boolean isAlive();
+    void setAlive(boolean isAlive);
+}

src/listeners/Movable.java

@@ -1,9 +1,17 @@
 package listeners;
 
+import model.Vector;
+
 public interface Movable {
 
-
-	void move() ;
-
-
+	default void move() {
+		this.setLocation(
+            this.getLocation().add(this.getSpeed())
+        );
+	}
+
+	void setLocation(Vector newLocation);
+	void setSpeed(Vector speed);
+	Vector getLocation();
+	Vector getSpeed();
 }