diff --git a/MAVENProject/src/main/java/engine/GameEngineGraphical.java b/MAVENProject/src/main/java/engine/GameEngineGraphical.java index 16a438a5966f058b8bce483678bd20da90d0d508..e9834fedb5aac1025bc4562a37cd21d0d524aac4 100644 --- a/MAVENProject/src/main/java/engine/GameEngineGraphical.java +++ b/MAVENProject/src/main/java/engine/GameEngineGraphical.java @@ -30,8 +30,6 @@ public class GameEngineGraphical { */ private GraphicalInterface gui; - private final static int deltaT = 1; - /** * construit un moteur * @@ -67,13 +65,8 @@ public class GameEngineGraphical { // affiche le game this.gui.paint(); // met en attente - Thread.sleep(deltaT); + Thread.sleep(1); } } - public static int getDeltaT() { // pour modifier le pas de temps librement - return deltaT; - } - - } diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java index c1f3889e78e2e0a35926576aa700d05aadf3f784..df081c623191e86c53e5568ebacfb267b61b0a17 100644 --- a/MAVENProject/src/main/java/entity/Character.java +++ b/MAVENProject/src/main/java/entity/Character.java @@ -19,7 +19,7 @@ public class Character extends Entity{ } @Override public void deplacements(double commandX,double commandZ,int alpha){ // alpha indique si il est au sol ou non, il vaut 0 ou 1 en fonction - double delta = GameEngineGraphical.getDeltaT()*Math.pow(10, -3); // pas de temps remis en secondes + double delta = Math.pow(10, -3); // pas de temps remis en secondes //on actualise les positions double newX,newZ; diff --git a/MAVENProject/src/main/java/environnement/Obstacle.java b/MAVENProject/src/main/java/environnement/Obstacle.java new file mode 100644 index 0000000000000000000000000000000000000000..166306f113dbbc6daf826e5c244a6bd689e7c299 --- /dev/null +++ b/MAVENProject/src/main/java/environnement/Obstacle.java @@ -0,0 +1,22 @@ +package environnement; + +import java.util.HashMap; + +public class Obstacle { + + //private final Coordonnees centre; + private HashMap<String, Coordonnees> extremites; + private int defaultUnit = 10; + + public Obstacle(Coordonnees c){ + HashMap<String, Coordonnees> extremites = new HashMap<String,Coordonnees>(); + extremites.put("DH",new Coordonnees(c.getX()+(double)defaultUnit/2,c.getZ()-(double)defaultUnit/2)); + extremites.put("DB",new Coordonnees(c.getX()+(double)defaultUnit/2,c.getZ()+(double)defaultUnit/2)); + extremites.put("GH",new Coordonnees(c.getX()-(double)defaultUnit/2,c.getZ()-(double)defaultUnit/2)); + extremites.put("GB",new Coordonnees(c.getX()-(double)defaultUnit/2,c.getZ()+(double)defaultUnit/2)); + } + + public int getDefaultUnit() { + return defaultUnit; + } +} diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java index 20f6b5de800c6b413eee834b8849c4723ed90520..9cd11d252edbd4926c9f14514241bbb1ede914ea 100644 --- a/MAVENProject/src/main/java/jeu/Jeu.java +++ b/MAVENProject/src/main/java/jeu/Jeu.java @@ -11,11 +11,8 @@ import entity.Character; public class Jeu implements Game{ - - private static Coordonnees coordSol; //coordonnees du sol (en realite juste Z nous interesse) + private static Coordonnees coordSol = new Coordonnees(200,700); //coordonnees du sol (en realite juste Z nous interesse) static Character charac; - /*private static ArrayList<Double> A; // pour mes tests, ne pas faire attention - int n;*/ // idem public Jeu(String source) { BufferedReader helpReader; @@ -24,7 +21,6 @@ public class Jeu implements Game{ n = 0;*/ charac = new entity.Character(new Coordonnees(200, 300), 1500, 1); - coordSol = charac.getCoord(); try { helpReader = new BufferedReader(new FileReader(source)); String line; diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java index 24fae6c876ae41348073afaf7b07db5509ac01a0..fa86c89e2b8a9436079241977ac9a1244ad0302a 100644 --- a/MAVENProject/src/main/java/jeu/Painter.java +++ b/MAVENProject/src/main/java/jeu/Painter.java @@ -20,7 +20,7 @@ public class Painter implements GamePainter{ crayon.setColor(Color.blue); int x = (int) charac.getCoord().getX(); int y = (int) charac.getCoord().getZ(); - crayon.fillOval(x,y,10,10); + crayon.fillRect(x-15,y-30,30,60); } @Override