Commit 56da09bf authored by erreiip's avatar erreiip
Browse files

[REFACTO] refacto

parent 5f8ec17e

livraison/jeuAssemblage/output.png

+58 B (572 B)
Loading image diff...

livraison/jeuAssemblage/src/model/PlayBoard.java

+0 −18
Changes for livraison/jeuAssemblage/src/model/PlayBoard.java: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -74,14 +74,11 @@ public class PlayBoard extends AbstractListenableHM implements Listener, Compara 
		final int MAX_ITERATIONS = 100;

		int iteration = 0;

		Random randomPlacement = new Random(seedPlacement + piecesMap.size() + 1);

		// TODO: y'a des beugs

		do {



			int x = randomPlacement.nextInt(this.board[0].length - piece.getWidth() + 1);

			int y = randomPlacement.nextInt(this.board.length - piece.getHeight() + 1);



			// System.out.println("Trying to place piece at: " + x + ", " + y);



			if (placePiece(x, y, piece)) {



				return true;
@@ -97,19 +94,6 @@ public class PlayBoard extends AbstractListenableHM implements Listener, Compara 
	boolean randomlyPlacePiece(Piece piece) {



		return randomlyPlacePiece(piece, this.seed);



		// for (int i = 0; i < board.length; i++) {



		// for (int j = 0; j < board[i].length; j++) {



		// System.out.println("Trying to place piece at: " + j + ", " + i);



		// if (placePiece(j, i, piece)) {



		// return;

		// }

		// }

		// }

	}



	private boolean placePiece(int x, int y, Piece piece) {
@@ -566,8 +550,6 @@ public class PlayBoard extends AbstractListenableHM implements Listener, Compara 
			Piece piece = pieceFactory.createPiece(0);



			playBoard.randomlyPlacePiece(piece, seedPlacement);



			// TODO: REFAIRE CETTE MERDE

		}



		return playBoard;

livraison/jeuAssemblage/src/view/screen/MainScreen.java

+0 −1
Changes for livraison/jeuAssemblage/src/view/screen/MainScreen.java: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ public class MainScreen extends JPanel { 
        add(Box.createVerticalGlue());



        // LISTENERS

        //



        btnSolo.addActionListener(e -> {

livraison/jeuAssemblage/src/view/screen/SoloGameCreation.java

+0 −3
Changes for livraison/jeuAssemblage/src/view/screen/SoloGameCreation.java: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ public class SoloGameCreation extends JPanel { 


        // LISTENERS



		// ResizeListener resizeListener = new ResizeListener(createResizeCallback(this));

		// this.addComponentListener(resizeListener);



		btnCancel.putClientProperty( "JButton.buttonType", "roundRect" );

        btnCancel.addActionListener(e -> mainFrame.setContentPane(new MainScreen(mainFrame)));

livraison/jeuAssemblage/src/view/utils/PieceRenderUtils.java

+0 −22
Changes for livraison/jeuAssemblage/src/view/utils/PieceRenderUtils.java: 0 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public final class PieceRenderUtils { 
		}



		// Register image plz

		// fdp ?

		try {

			File output = new File("output.png");

			ImageIO.write(image, "png", output);
@@ -155,27 +154,6 @@ public final class PieceRenderUtils { 
		g.fillRect(0, height * CELL_PIXEL_SIZE - 2, width * CELL_PIXEL_SIZE, 2);

		g.fillRect(width * CELL_PIXEL_SIZE - 2, 0, 2, height * CELL_PIXEL_SIZE);



		try {

			File output = new File("test.png");

			ImageIO.write(image, "png", output);

		} catch (Exception e) {

			e.printStackTrace();

		}



		return image;

	}



	// public static void main(String[] args) {

		

	// 	int[][] piece = PieceFactory.createPieceT().getBounds();



	// 	BufferedImage image = createPieceImage(piece, new Color(0xfa8d12));



	// 	try {

    //         File output = new File("output.png");

    //         ImageIO.write(image, "png", output);

    //     } catch (Exception e) {

    //         e.printStackTrace();

    //     }

	// }

}