maxime.lobietti
/
OOP_F2_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of 

https://gitarero.ecam.fr/maxime.lobietti/OOP_F2_Project.git

Conflicts:
	src/backend/Grid.java
This commit is contained in:
sebas 2024-05-31 16:39:01 +02:00
parent 056568a855 1172072971
commit df9cec1421
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.java
View File

@ -8,4 +8,4 @@ public class Main {
mjf.setVisible(true); mjf.setVisible(true);
} }
} }

8
src/backend/Grid.java
View File

@ -4,7 +4,7 @@ import java.util.Random;
/** /**
* The Grid class represents a 2D grid of integers. * The Grid class represents a 2D grid of integers.
*/ */
public class Grid { public class Grid {
private final int width; private final int width;
private final int height; private final int height;
private final int[][] grid; private final int[][] grid;
@ -15,7 +15,7 @@ public class Grid {
* *
* @param width the width of the grid * @param width the width of the grid
* @param height the height of the grid * @param height the height of the grid
*/ */
public Grid(int width, int height) { public Grid(int width, int height) {
this.width = width; this.width = width;
this.height = height; this.height = height;
@ -63,8 +63,8 @@ public class Grid {
public void fillRandom(float randomness) { public void fillRandom(float randomness) {
for (int y = 0; y < height; y++) { for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
int rando = rand.nextInt(100); int rando = rand.nextInt(100);
int r = (int) (randomness * 100); int r = (int) (randomness * 100);
if (rando < r) { if (rando < r) {
grid[y][x] = 1; grid[y][x] = 1;
} else { } else {