Skip to content
Snippets Groups Projects
Commit f996b97f authored by Yanis O's avatar Yanis O
Browse files

Correction des images pour ajouter un fond blanc

parent 6e8ad12d
No related branches found
No related tags found
No related merge requests found
Pipeline #41506 passed
...@@ -13,15 +13,15 @@ import javafx.stage.Stage; ...@@ -13,15 +13,15 @@ import javafx.stage.Stage;
public class SimulatorApplication extends javafx.application.Application { public class SimulatorApplication extends javafx.application.Application {
private static final String VIEW_RESOURCE_PATH = "/view/view.fxml"; private static final String VIEW_RESOURCE_PATH = "/view/view.fxml";
private static final String APP_NAME = "Firefighter simulator"; private static final String APP_NAME = "Firefighter simulator";
private static final int ROW_COUNT = 50; private static final int ROW_COUNT = 40;
private static final int COLUMN_COUNT = 50; private static final int COLUMN_COUNT = 40;
private static final int BOX_WIDTH = 15; private static final int BOX_WIDTH = 15;
private static final int BOX_HEIGHT = 15; private static final int BOX_HEIGHT = 15;
public static final int INITIAL_FIRE_COUNT = 8; public static final int INITIAL_FIRE_COUNT = 8;
public static final int INITIAL_FIREFIGHTER_COUNT = 6; public static final int INITIAL_FIREFIGHTER_COUNT = 12;
public static final int INITIAL_MOTORIZED_FIREFIGHTER_COUNT = 8; public static final int INITIAL_MOTORIZED_FIREFIGHTER_COUNT = 8;
public static final int INITIAL_CLOUD_COUNT = 20; public static final int INITIAL_CLOUD_COUNT = 8;
public static final int INITIAL_MOUNTAIN_COUNT= 20; public static final int INITIAL_MOUNTAIN_COUNT= 6;
public static final int TURNS_FOR_SPAWNING_AIRTANKER = 10; public static final int TURNS_FOR_SPAWNING_AIRTANKER = 10;
private Stage primaryStage; private Stage primaryStage;
......
...@@ -25,10 +25,13 @@ import model.Entity; ...@@ -25,10 +25,13 @@ import model.Entity;
import model.EntityFactory; import model.EntityFactory;
import model.Model; import model.Model;
import model.Square; import model.Square;
import model.doctorviruspatient.Doctor; import model.firefighterscenario.Cloud;
import model.doctorviruspatient.DoctorVirusPatientScenario; import model.firefighterscenario.Fire;
import model.doctorviruspatient.Patient; import model.firefighterscenario.FireFighter;
import model.doctorviruspatient.Virus; import model.firefighterscenario.FireFighterScenario;
import model.firefighterscenario.MotorizedFireFighter;
import model.firefighterscenario.Mountain;
import model.firefighterscenario.Rockery;
import util.Position; import util.Position;
import view.Grid; import view.Grid;
import view.ViewElement; import view.ViewElement;
...@@ -129,6 +132,7 @@ public class Controller { ...@@ -129,6 +132,7 @@ public class Controller {
public void restartButtonAction() { public void restartButtonAction() {
this.pause(); this.pause();
board.reset(); board.reset();
System.gc();
pauseToggleButton.setSelected(true); pauseToggleButton.setSelected(true);
repaintGrid(); repaintGrid();
} }
...@@ -138,14 +142,14 @@ public class Controller { ...@@ -138,14 +142,14 @@ public class Controller {
grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight); grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight);
Map<EntityFactory, Integer> entityCounts = new HashMap<EntityFactory, Integer>(); Map<EntityFactory, Integer> entityCounts = new HashMap<EntityFactory, Integer>();
/*
entityCounts.put((pos, b) -> new Fire(pos), initialFireCount); entityCounts.put((pos, b) -> new Fire(pos), initialFireCount);
entityCounts.put((pos, b) -> new FireFighter(pos,b), initialFirefighterCount); entityCounts.put((pos, b) -> new FireFighter(pos,b), initialFirefighterCount);
entityCounts.put((pos, b) -> new MotorizedFireFighter(pos, b), initialMotorizedFirefightersCount); entityCounts.put((pos, b) -> new MotorizedFireFighter(pos, b), initialMotorizedFirefightersCount);
entityCounts.put((pos, b) -> new Cloud(pos, b), initialcloudCount); entityCounts.put((pos, b) -> new Cloud(pos, b), initialcloudCount);
entityCounts.put((pos, b) -> new Mountain(pos), initialmountaincount); entityCounts.put((pos, b) -> new Mountain(pos), initialmountaincount);
entityCounts.put((pos, b) -> new Rockery(pos), 3); entityCounts.put((pos, b) -> new Rockery(pos), 3);
*/
/* /*
entityCounts.put((pos, b) -> new Rock(pos), 10); entityCounts.put((pos, b) -> new Rock(pos), 10);
...@@ -153,12 +157,12 @@ public class Controller { ...@@ -153,12 +157,12 @@ public class Controller {
entityCounts.put((pos, b) -> new Paper(pos), 10); entityCounts.put((pos, b) -> new Paper(pos), 10);
*/ */
/*
entityCounts.put((pos, b) -> new Patient(pos), 70); entityCounts.put((pos, b) -> new Patient(pos), 70);
entityCounts.put((pos, b) -> new Virus(pos), 6); entityCounts.put((pos, b) -> new Virus(pos), 6);
entityCounts.put((pos, b) -> new Doctor(pos), 3); entityCounts.put((pos, b) -> new Doctor(pos), 3);
*/
Model model = new DoctorVirusPatientScenario(columnCount, rowCount, entityCounts); Model model = new FireFighterScenario(columnCount, rowCount, entityCounts);
this.setModel(model); this.setModel(model);
repaintGrid(); repaintGrid();
} }
......
...@@ -23,7 +23,6 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ ...@@ -23,7 +23,6 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
Image image = element.getImage(); Image image = element.getImage();
getGraphicsContext2D().drawImage(image, position.y() * boxWidth, position.x() * boxHeight, boxWidth, boxHeight); getGraphicsContext2D().drawImage(image, position.y() * boxWidth, position.x() * boxHeight, boxWidth, boxHeight);
} else { } else {
// Sinon, utilise une couleur
paintBox(position.x(), position.y(), element.getColor()); paintBox(position.x(), position.y(), element.getColor());
} }
} }
......
src/main/resources/view/icons/fire/avion.png

23.6 KiB | W: | H:

src/main/resources/view/icons/fire/avion.png

26.4 KiB | W: | H:

src/main/resources/view/icons/fire/avion.png
src/main/resources/view/icons/fire/avion.png
src/main/resources/view/icons/fire/avion.png
src/main/resources/view/icons/fire/avion.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/camion.png

23.6 KiB | W: | H:

src/main/resources/view/icons/fire/camion.png

24.6 KiB | W: | H:

src/main/resources/view/icons/fire/camion.png
src/main/resources/view/icons/fire/camion.png
src/main/resources/view/icons/fire/camion.png
src/main/resources/view/icons/fire/camion.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/flamme.png

18.6 KiB | W: | H:

src/main/resources/view/icons/fire/flamme.png

19.2 KiB | W: | H:

src/main/resources/view/icons/fire/flamme.png
src/main/resources/view/icons/fire/flamme.png
src/main/resources/view/icons/fire/flamme.png
src/main/resources/view/icons/fire/flamme.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/montagne.png

37.1 KiB | W: | H:

src/main/resources/view/icons/fire/montagne.png

37.8 KiB | W: | H:

src/main/resources/view/icons/fire/montagne.png
src/main/resources/view/icons/fire/montagne.png
src/main/resources/view/icons/fire/montagne.png
src/main/resources/view/icons/fire/montagne.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/nuage.png

64.3 KiB | W: | H:

src/main/resources/view/icons/fire/nuage.png

66.7 KiB | W: | H:

src/main/resources/view/icons/fire/nuage.png
src/main/resources/view/icons/fire/nuage.png
src/main/resources/view/icons/fire/nuage.png
src/main/resources/view/icons/fire/nuage.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/rochers.png

43 KiB | W: | H:

src/main/resources/view/icons/fire/rochers.png

46.3 KiB | W: | H:

src/main/resources/view/icons/fire/rochers.png
src/main/resources/view/icons/fire/rochers.png
src/main/resources/view/icons/fire/rochers.png
src/main/resources/view/icons/fire/rochers.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/view/icons/fire/sapeur-pompier.png

26.2 KiB | W: | H:

src/main/resources/view/icons/fire/sapeur-pompier.png

26.9 KiB | W: | H:

src/main/resources/view/icons/fire/sapeur-pompier.png
src/main/resources/view/icons/fire/sapeur-pompier.png
src/main/resources/view/icons/fire/sapeur-pompier.png
src/main/resources/view/icons/fire/sapeur-pompier.png
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment