From 20ce02860463de46f09fbf80db1208f050d0f9f9 Mon Sep 17 00:00:00 2001
From: Louis MALTERRE <malterre.louis@laposte.net>
Date: Thu, 1 Dec 2022 12:03:11 +0100
Subject: [PATCH] j'ai remis de l'ordre dans entity et character LM (et dans
jeu du coup)
---
.../src/main/java/entity/Character.java | 27 ++------------
MAVENProject/src/main/java/entity/Entity.java | 36 +++++++++----------
.../src/main/java/entity/Monster.java | 12 +++++++
MAVENProject/src/main/java/jeu/Jeu.java | 2 +-
4 files changed, 34 insertions(+), 43 deletions(-)
create mode 100644 MAVENProject/src/main/java/entity/Monster.java
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index e0fc50d..f8b3f6a 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -20,23 +20,19 @@ public class Character extends Entity{
private double vitesseActuX = 0; // vitesse actuelle supposée nulle au départ
private double vitesseActuZ = 0;
private final double impulsionSaut;
- private int nbLifePoints = 3;
private double masse;
private int alpha = 1; // gere les collisions avec le sol
- private final double entityWIDTH = 30; // pour l'instant je les ai renommes, ca peut changer
- private final double entityHEIGHT = 60;
private Map<String,Double> tableCommande; //table des commandes du perso
//private BufferedImage sprite;
- public Character(Coordonnees c, double vitesseMax, double m, double impSaut){
+ public Character(Coordonnees c, double vitesseMax, double m, double impSaut,double width,double height){
- super(c,vitesseMax); // comme tous les entities ont une hitbox, j'ai factorise
+ super(c,vitesseMax,width,height); // comme tous les entities ont une hitbox, j'ai factorise
this.masse = m;
- this.oldCoord = this.getCoord();
this.impulsionSaut = impSaut;
this.setHitBox(new HitBox(c,entityHEIGHT,entityWIDTH));
this.tableCommande = new HashMap<>();
@@ -153,10 +149,6 @@ public class Character extends Entity{
this.setHitBox(new HitBox(this.getCoord(),entityHEIGHT,entityWIDTH)); // mise à jour moins crade pour l'instant
}
- public double getVitesseMax() {
- return vitesseMax;
- }
-
public double getVitesseActuX() {
return vitesseActuX;
}
@@ -171,22 +163,9 @@ public class Character extends Entity{
public double getImpulsionSaut() {
return impulsionSaut;
}
- @Override
- public double getEntityWIDTH() {
- return this.entityWIDTH;
- }
- @Override
- public double getEntityHEIGHT() {
- return this.entityHEIGHT;
- }
+
public int getAlpha() {
return alpha;
}
- public int getNbLifePoints() {
- return nbLifePoints;
- }
- public void setNbLifePoints(int nbLifePoints) {
- this.nbLifePoints = nbLifePoints;
- }
}
diff --git a/MAVENProject/src/main/java/entity/Entity.java b/MAVENProject/src/main/java/entity/Entity.java
index 1b302ba..20f6c57 100644
--- a/MAVENProject/src/main/java/entity/Entity.java
+++ b/MAVENProject/src/main/java/entity/Entity.java
@@ -2,23 +2,30 @@ package entity;
import environnement.Coordonnees;
import environnement.HitBox;
-import jeu.Jeu;
-import map.Obstacle;
+
public abstract class Entity {
private Coordonnees coord;
protected Coordonnees oldCoord;
final double vitesseMax;
protected HitBox hitBox;
- protected Obstacle obstacleNextTo = null;
- private final double entityWIDTH = 10;
- private final double entityHEIGHT = 10;
+ protected int nbLifePoints = 3;
+ protected final double entityWIDTH;
+ protected final double entityHEIGHT;
- protected Obstacle obstacleBeneath = Jeu.getSol();
- public Entity(Coordonnees c,double vitesseMax){
+ public int getNbLifePoints() {
+ return nbLifePoints;
+ }
+ public void setNbLifePoints(int nbLifePoints) {
+ this.nbLifePoints = nbLifePoints;
+ }
+ public Entity(Coordonnees c,double vitesseMax,double width,double height){
this.coord = c;
+ this.oldCoord = this.coord;
this.vitesseMax = vitesseMax;
+ this.entityHEIGHT = height;
+ this.entityWIDTH = width;
this.hitBox = new HitBox(c, entityHEIGHT, entityWIDTH);
}
public void deplacements(){}
@@ -41,21 +48,14 @@ public abstract class Entity {
public HitBox getHitBox() {
return hitBox;
}
- public Obstacle getObstacleBeneath() {
- return obstacleBeneath;
- }
+
public void setHitBox(HitBox hitBox) {
this.hitBox = hitBox;
}
- public void setObstacleBeneath(Obstacle obstacleBeneath) {
- this.obstacleBeneath = obstacleBeneath;
- }
- public Obstacle getObstacleNextTo() {
- return obstacleNextTo;
- }
- public void setObstacleNextTo(Obstacle obstacleNextTo) {
- this.obstacleNextTo = obstacleNextTo;
+ public double getVitesseMax() {
+ return vitesseMax;
}
+
}
diff --git a/MAVENProject/src/main/java/entity/Monster.java b/MAVENProject/src/main/java/entity/Monster.java
new file mode 100644
index 0000000..fb7ce60
--- /dev/null
+++ b/MAVENProject/src/main/java/entity/Monster.java
@@ -0,0 +1,12 @@
+package entity;
+
+import environnement.Coordonnees;
+
+public class Monster extends Entity{
+
+ public Monster(Coordonnees c, double vitesseMax,double width,double height) {
+ super(c, vitesseMax,width,height);
+ //TODO Auto-generated constructor stub
+ }
+
+}
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index c0685f7..926a282 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -70,7 +70,7 @@ public class Jeu implements Game{
characterSkinPath = beginPath + movement + numberOfMovement + ".png"; // path premiere frame
/*A = new ArrayList<Double>();
n = 0;*/
- gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 2000, 1,600000));
+ gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 2000, 1,600000,30,60));
gameCharacter = gameCharacterLoader.getGameCharacter();
try {
helpReader = new BufferedReader(new FileReader(source));
--
GitLab