Skip to content
Snippets Groups Projects
Commit 20ce0286 authored by Louis MALTERRE's avatar Louis MALTERRE
Browse files

j'ai remis de l'ordre dans entity et character LM (et dans jeu du coup)

parent 86f72cb5
No related branches found
No related tags found
No related merge requests found
...@@ -20,23 +20,19 @@ public class Character extends Entity{ ...@@ -20,23 +20,19 @@ public class Character extends Entity{
private double vitesseActuX = 0; // vitesse actuelle supposée nulle au départ private double vitesseActuX = 0; // vitesse actuelle supposée nulle au départ
private double vitesseActuZ = 0; private double vitesseActuZ = 0;
private final double impulsionSaut; private final double impulsionSaut;
private int nbLifePoints = 3;
private double masse; private double masse;
private int alpha = 1; // gere les collisions avec le sol 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 Map<String,Double> tableCommande; //table des commandes du perso
//private BufferedImage sprite; //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.masse = m;
this.oldCoord = this.getCoord();
this.impulsionSaut = impSaut; this.impulsionSaut = impSaut;
this.setHitBox(new HitBox(c,entityHEIGHT,entityWIDTH)); this.setHitBox(new HitBox(c,entityHEIGHT,entityWIDTH));
this.tableCommande = new HashMap<>(); this.tableCommande = new HashMap<>();
...@@ -153,10 +149,6 @@ public class Character extends Entity{ ...@@ -153,10 +149,6 @@ public class Character extends Entity{
this.setHitBox(new HitBox(this.getCoord(),entityHEIGHT,entityWIDTH)); // mise à jour moins crade pour l'instant this.setHitBox(new HitBox(this.getCoord(),entityHEIGHT,entityWIDTH)); // mise à jour moins crade pour l'instant
} }
public double getVitesseMax() {
return vitesseMax;
}
public double getVitesseActuX() { public double getVitesseActuX() {
return vitesseActuX; return vitesseActuX;
} }
...@@ -171,22 +163,9 @@ public class Character extends Entity{ ...@@ -171,22 +163,9 @@ public class Character extends Entity{
public double getImpulsionSaut() { public double getImpulsionSaut() {
return impulsionSaut; return impulsionSaut;
} }
@Override
public double getEntityWIDTH() {
return this.entityWIDTH;
}
@Override
public double getEntityHEIGHT() {
return this.entityHEIGHT;
}
public int getAlpha() { public int getAlpha() {
return alpha; return alpha;
} }
public int getNbLifePoints() {
return nbLifePoints;
}
public void setNbLifePoints(int nbLifePoints) {
this.nbLifePoints = nbLifePoints;
}
} }
...@@ -2,23 +2,30 @@ package entity; ...@@ -2,23 +2,30 @@ package entity;
import environnement.Coordonnees; import environnement.Coordonnees;
import environnement.HitBox; import environnement.HitBox;
import jeu.Jeu;
import map.Obstacle;
public abstract class Entity { public abstract class Entity {
private Coordonnees coord; private Coordonnees coord;
protected Coordonnees oldCoord; protected Coordonnees oldCoord;
final double vitesseMax; final double vitesseMax;
protected HitBox hitBox; protected HitBox hitBox;
protected Obstacle obstacleNextTo = null; protected int nbLifePoints = 3;
private final double entityWIDTH = 10; protected final double entityWIDTH;
private final double entityHEIGHT = 10; 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.coord = c;
this.oldCoord = this.coord;
this.vitesseMax = vitesseMax; this.vitesseMax = vitesseMax;
this.entityHEIGHT = height;
this.entityWIDTH = width;
this.hitBox = new HitBox(c, entityHEIGHT, entityWIDTH); this.hitBox = new HitBox(c, entityHEIGHT, entityWIDTH);
} }
public void deplacements(){} public void deplacements(){}
...@@ -41,21 +48,14 @@ public abstract class Entity { ...@@ -41,21 +48,14 @@ public abstract class Entity {
public HitBox getHitBox() { public HitBox getHitBox() {
return hitBox; return hitBox;
} }
public Obstacle getObstacleBeneath() {
return obstacleBeneath;
}
public void setHitBox(HitBox hitBox) { public void setHitBox(HitBox hitBox) {
this.hitBox = hitBox; this.hitBox = hitBox;
} }
public void setObstacleBeneath(Obstacle obstacleBeneath) { public double getVitesseMax() {
this.obstacleBeneath = obstacleBeneath; return vitesseMax;
}
public Obstacle getObstacleNextTo() {
return obstacleNextTo;
}
public void setObstacleNextTo(Obstacle obstacleNextTo) {
this.obstacleNextTo = obstacleNextTo;
} }
} }
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
}
}
...@@ -70,7 +70,7 @@ public class Jeu implements Game{ ...@@ -70,7 +70,7 @@ public class Jeu implements Game{
characterSkinPath = beginPath + movement + numberOfMovement + ".png"; // path premiere frame characterSkinPath = beginPath + movement + numberOfMovement + ".png"; // path premiere frame
/*A = new ArrayList<Double>(); /*A = new ArrayList<Double>();
n = 0;*/ 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(); gameCharacter = gameCharacterLoader.getGameCharacter();
try { try {
helpReader = new BufferedReader(new FileReader(source)); helpReader = new BufferedReader(new FileReader(source));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment