Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/engine/Kernel.java
#	src/main/java/engine/physic/PhysicEngine.java
#	src/main/java/pong/PongApp.java

src/main/java/engine/graphic/GraphicEngine.java

@@ -40,8 +40,9 @@ public class GraphicEngine extends JFrame implements Engine {
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-
         }
+        repaint();
+        revalidate();
     }
 
 

src/main/java/engine/physic/Entity.java

@@ -78,4 +78,7 @@ public interface Entity {
      */
     public void halt();
 
+    int getWidth();
+
+    int getHeight();
 }

src/main/java/engine/physic/Movable.java

@@ -97,4 +97,14 @@ public class Movable implements Entity {
         }
 
     }
+
+    @Override
+    public int getWidth() {
+        return width;
+    }
+
+    @Override
+    public int getHeight() {
+        return height;
+    }
 }

src/main/java/engine/physic/NotMovable.java

@@ -68,4 +68,14 @@ public class NotMovable implements Entity {
 
     }
 
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+
 }

src/main/java/engine/physic/PhysicEngine.java

@@ -9,6 +9,8 @@ import java.util.HashMap;
 
 public class PhysicEngine implements Engine {
     public HashMap<PongObject, Entity> pongObjectEntityHashMap = new HashMap<>();
+
+    private HashMap<Coordinates2D, PongObject> positions = new HashMap<>();
     public PhysicEngine(){
         for (PongObject pongObject: Kernel.gameObjects) {
             Coordinates2D speed = new Coordinates2D(0, 0);
@@ -17,20 +19,21 @@ public class PhysicEngine implements Engine {
             }
             //Coordinates2D speed = new Coordinates2D(random.nextInt(2) - 1, random.nextInt(2) - 1);
             pongObjectEntityHashMap.put(pongObject, new Movable(1, pongObject.getPosition(), speed, new Coordinates2D(0, 0), pongObject.getWidth(), pongObject.getHeight()));
-            /*if(pongObject.getName().equals("Left racket")){
-                pongObjectEntityHashMap.put(pongObject, new Movable(1, pongObject.getPosition(), new Coordinates2D(0,1), new Coordinates2D(0, 0), pongObject.getWidth(), pongObject.getHeight()));
-            }
+            positions.put(pongObject.getPosition(), pongObject);
 
-            if(pongObject.getName().equals("Right racket")){
-                pongObjectEntityHashMap.put(pongObject, new Movable(1, pongObject.getPosition(), new Coordinates2D(0,1), new Coordinates2D(0, 0), pongObject.getWidth(), pongObject.getHeight()));
-            }*/
         }
     }
     @Override
     public void update(){
         for (PongObject pongObject: Kernel.gameObjects) {
             pongObjectEntityHashMap.get(pongObject).updatePosition(); // Updating of the associated movable position
+            //checkCollision();
             pongObject.setPosition(pongObjectEntityHashMap.get(pongObject).getPosition()); // Updating of the pong object position
         }
     }
+
+    public void checkCollision(Entity firstObject, Entity secondObject){
+        //TODO: check collision between two objects
+    }
+
 }

src/main/java/pong/PongApp.java

@@ -5,8 +5,6 @@ import engine.Kernel;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
 
 public class PongApp {
 
@@ -32,15 +30,14 @@ public class PongApp {
         Kernel kernel = new Kernel("Pong", width, height, components);
         //kernel.setGameObject(components);
 
-        Timer timer = new Timer();
-        int delay = 0; // Délai initial avant la première exécution (en millisecondes)
-        int interval = 1; // Intervalle entre les exécutions (en millisecondes)
 
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
+        while(true){
+            try {
                 kernel.update();
+                Thread.sleep(1);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
-        }, delay, interval);
     }
 }