From 58c0a1968917a35ded8c5d50e30361753fc076e0 Mon Sep 17 00:00:00 2001
From: Azurlors <florianrichard2001@gmail.com>
Date: Mon, 28 Nov 2022 12:44:43 +0100
Subject: [PATCH] Raloum
---
MAVENProject/src/main/java/jeu/Jeu.java | 4 ++++
MAVENProject/src/main/java/jeu/Painter.java | 11 +++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 7ad7b95..37ed3fa 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -12,6 +12,8 @@ import java.util.Map;
import entity.Character;
import engine.Game;
import environnement.Coordonnees;
+import environnement.HitBox;
+import environnement.Obstacle;
import loaders.CharacterLoader;
@@ -30,6 +32,8 @@ public class Jeu implements Game{
int nbBeforeFramechgt = nbIterationPerFrame;
//private boolean characterNotMoving = true;
private boolean characterAttacking = false; //boolean necessaire pour rendre l'animation d'attaque prioritaire
+
+ public static Obstacle sol = new Obstacle(new HitBox(new Coordonnees(200,700),1,1000000));
public Jeu(String source) {
diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java
index dbf49de..a017ac7 100644
--- a/MAVENProject/src/main/java/jeu/Painter.java
+++ b/MAVENProject/src/main/java/jeu/Painter.java
@@ -11,9 +11,8 @@ import java.awt.image.BufferedImage;
import java.util.HashMap;
import static environnement.HitBox.collision;
-import static jeu.Jeu.gameCharacter;
-import static jeu.Jeu.gameCharacterLoader;
-import static jeu.Jeu.getCoordSol;
+import static jeu.Jeu.*;
+
public class Painter implements GamePainter{
@@ -30,8 +29,8 @@ public class Painter implements GamePainter{
public void draw(BufferedImage im) {
Graphics2D crayon = (Graphics2D) im.getGraphics();
crayon.setColor(Color.blue);
- drawCharacter(crayon, gameCharacter,gameCharacterLoader.getImageCharacter());
- drawSol(crayon);
+ drawCharacter(crayon,gameCharacterLoader.getImageCharacter());
+ drawObstacle(crayon, sol);
if (!collision(gameCharacter.getHitBox(), test.getHitbox())){
crayon.setColor(Color.blue);
}
@@ -53,7 +52,7 @@ public class Painter implements GamePainter{
return HEIGHT;
}
- private void drawCharacter(Graphics2D crayon, Character charac,Image imageCharac){
+ private void drawCharacter(Graphics2D crayon,Image imageCharac){
int x = (int) gameCharacter.getCoord().getX();
int y = (int) gameCharacter.getCoord().getZ();
//crayon.fillRect(x-15,y-30, (int) gameCharacter.getEntityWIDTH(),(int) gameCharacter.getEntityHEIGHT());
--
GitLab