stiti/SAE31_2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Amélioration du code -> Suppression de code inutile

Browse Source
This commit is contained in:
Moncef STITI
2024-11-23 23:02:33 +01:00
parent 35bb9dfec4
commit 3d7fe42bd4
20 changed files with 25 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TestV2/src/fr/monkhanny/dorfromantik/Main.java
View File

@@ -43,7 +43,9 @@ public class Main {
MusicPlayer.loadMusic(Musics.MAIN_MENU_MUSIC);
MusicPlayer.playMusic();
MainMenu mainMenu = new MainMenu();
@SuppressWarnings("unused")
MainMenuResizeController MainMenuResizeController = new MainMenuResizeController(mainMenu);
@SuppressWarnings("unused")
MainMenuButtonController MainMenuButtonController = new MainMenuButtonController(mainMenu,settingsFrame,howToPlayFrame,gameModeFrame,gameFrame);

2
TestV2/src/fr/monkhanny/dorfromantik/controller/ButtonHoverAnimationListener.java
View File

@@ -1,4 +1,4 @@
package fr.monkhanny.dorfromantik.gui;
package fr.monkhanny.dorfromantik.controller;
import fr.monkhanny.dorfromantik.Options;

10
TestV2/src/fr/monkhanny/dorfromantik/controller/GameModeController.java
View File

@@ -10,7 +10,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JFrame;
import java.sql.SQLException;
import java.sql.*;
import java.awt.Dimension;
import java.awt.Point;
@@ -66,15 +65,6 @@ public class GameModeController implements ActionListener {
}
}
private long getSeedFromDatabase(long seriesId) {
try {
return this.database.getSeedBySeriesId(seriesId);
} catch (SQLException e) {
e.printStackTrace();
return -1; // Retourner une valeur par défaut si une erreur survient
}
}
private long getSeedFromDatabaseByName(String modeName) {
try {
return this.database.getSeedByName(modeName);

10
TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuButtonController.java
View File

@@ -1,10 +1,8 @@
package fr.monkhanny.dorfromantik.controller;
import fr.monkhanny.dorfromantik.Options;
import fr.monkhanny.dorfromantik.gui.SettingsPanel;
import fr.monkhanny.dorfromantik.gui.MainMenu;
import fr.monkhanny.dorfromantik.gui.ButtonPanel;
import fr.monkhanny.dorfromantik.listeners.CloseWindowListener;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -35,21 +33,21 @@ public class MainMenuButtonController implements ActionListener {
// Paramètrage de la fenêtre des paramètres
this.settingsFrame = settingsFrame;
configureFrame(settingsFrame);
configureFrame(this.settingsFrame);
// Paramètrage de la fenêtre du tutoriel
this.howToPlayFrame = howToPlayFrame;
configureFrame(howToPlayFrame);
configureFrame(this.howToPlayFrame);
// Paramètrage de la fenêtre du jeu
this.gameModeFrame = gameModeFrame;
configureFrame(gameModeFrame);
configureFrame(this.gameModeFrame);
// Paramètrage de la fenêtre du jeu
this.gameFrame = gameFrame;
configureFrame(gameFrame);
configureFrame(this.gameFrame);
}

2
TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuMouseController.java
View File

@@ -4,8 +4,6 @@ import fr.monkhanny.dorfromantik.gui.ButtonPanel;
import fr.monkhanny.dorfromantik.gui.ButtonHoverAnimator;
import javax.swing.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class MainMenuMouseController {

1
TestV2/src/fr/monkhanny/dorfromantik/controller/MainMenuResizeHandler.java
View File

@@ -6,7 +6,6 @@ import fr.monkhanny.dorfromantik.gui.ButtonHoverAnimator;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import javax.swing.JButton;
public class MainMenuResizeHandler extends ComponentAdapter {

2
TestV2/src/fr/monkhanny/dorfromantik/controller/TutorialController.java
View File

@@ -25,7 +25,7 @@ public class TutorialController {
steps.add(new Step("Étape n°3", "Explication de la troisième étape ici.", Images.TUTORIAL_GIF3.getImagePath()));
steps.add(new Step("Étape n°4", "Explication de la quatrième étape ici.", Images.TUTORIAL_GIF4.getImagePath()));
tutorialPanel = new TutorialPanel(steps, mainMenu, tutorialFrame);
tutorialPanel = new TutorialPanel(steps, this.mainMenu, this.tutorialFrame);
}
public JPanel getTutorialPanel() {

2
TestV2/src/fr/monkhanny/dorfromantik/enums/Fonts.java
View File

@@ -1,7 +1,5 @@
package fr.monkhanny.dorfromantik.enums;
import java.awt.Color;
public enum Fonts {
TITLE, BUTTON;

25
TestV2/src/fr/monkhanny/dorfromantik/game/Board.java
View File

@@ -20,7 +20,6 @@ import java.awt.Graphics2D;
// TEMPORAIRE :
import java.awt.event.MouseMotionAdapter; // Import pour MouseMotionAdapter
import java.awt.event.MouseEvent; // Import pour MouseEvent
import java.awt.AlphaComposite;
@@ -149,28 +148,6 @@ public class Board extends JPanel{
}
private void adjustZoomAndPosition() {
// Calculer la largeur et la hauteur totales des tuiles (en fonction du nombre de tuiles)
int totalWidth = 0;
int totalHeight = 0;
// Trouver la plus grande étendue de tuiles sur l'axe X et Y
for (Tile tile : tiles) {
totalWidth = Math.max(totalWidth, tile.getXCoord() + tile.getRadius());
totalHeight = Math.max(totalHeight, tile.getYCoord() + tile.getRadius());
}
// Définir l'offset pour centrer les tuiles sur le plateau après le dézoom
int targetOffsetX = (int) ((getWidth() - totalWidth * zoomFactor) / 2);
int targetOffsetY = (int) ((getHeight() - totalHeight * zoomFactor) / 2);
// Appliquer ces nouveaux offsets
setOffsetX(targetOffsetX);
setOffsetY(targetOffsetY);
}
public void handleMouseClick(java.awt.event.MouseEvent e) {
// Récupérer les coordonnées du clic
Point clickedPoint = e.getPoint();
@@ -306,7 +283,7 @@ public class Board extends JPanel{
int targetOffsetX = (int) ((getWidth() - newlyPlacedTile.getRadius() * 2) / 2 - newlyPlacedTileX);
int targetOffsetY = (int) ((getHeight() - newlyPlacedTile.getRadius() * 2) / 2 - newlyPlacedTileY);
TilePanningTransition panningTransition = new TilePanningTransition(this, targetOffsetX, targetOffsetY, 50, 15);
TilePanningTransition panningTransition = new TilePanningTransition(this, targetOffsetX, targetOffsetY, 15);
panningTransition.start();
}
}

7
TestV2/src/fr/monkhanny/dorfromantik/game/TilePanningTransition.java
View File

@@ -2,25 +2,22 @@ package fr.monkhanny.dorfromantik.game;
import fr.monkhanny.dorfromantik.listeners.TilePanningActionListener;
import javax.swing.Timer;
public class TilePanningTransition {
private Board board;
private int targetOffsetX, targetOffsetY;
private int speed;
private int steps;
public TilePanningTransition(Board board, int targetOffsetX, int targetOffsetY, int speed, int steps) {
public TilePanningTransition(Board board, int targetOffsetX, int targetOffsetY, int steps) {
this.board = board;
this.targetOffsetX = targetOffsetX;
this.targetOffsetY = targetOffsetY;
this.speed = speed;
this.steps = steps;
}
public void start() {
// Créer un listener d'animation
TilePanningActionListener listener = new TilePanningActionListener(board, targetOffsetX, targetOffsetY, speed, steps);
TilePanningActionListener listener = new TilePanningActionListener(board, targetOffsetX, targetOffsetY, steps);
// Démarrer l'animation si aucune n'est en cours
listener.startAnimation();

6
TestV2/src/fr/monkhanny/dorfromantik/gui/ButtonHoverAnimator.java
View File

@@ -1,11 +1,10 @@
package fr.monkhanny.dorfromantik.gui;
import fr.monkhanny.dorfromantik.Options;
import fr.monkhanny.dorfromantik.controller.ButtonHoverAnimationListener;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class ButtonHoverAnimator {
@@ -13,12 +12,11 @@ public class ButtonHoverAnimator {
private final Color originalColor;
private static Font originalFont;
private Timer animationTimer;
private float currentScale = 1.0f;
public ButtonHoverAnimator(JButton button) {
this.button = button;
this.originalColor = button.getForeground();
this.originalFont = button.getFont();
ButtonHoverAnimator.originalFont = button.getFont();
}
public void startAnimation(boolean entering) {

2
TestV2/src/fr/monkhanny/dorfromantik/gui/ButtonPanel.java
View File

@@ -5,7 +5,6 @@ import fr.monkhanny.dorfromantik.components.Button;
import fr.monkhanny.dorfromantik.controller.MainMenuMouseController;
import javax.swing.*;
import java.awt.*;
import java.util.List;
import java.util.Arrays;
@@ -48,6 +47,7 @@ public class ButtonPanel extends JPanel {
// Espacement extensible pour maintenir les icônes en bas
this.add(Box.createVerticalGlue());
@SuppressWarnings("unused")
MainMenuMouseController gestionSouris = new MainMenuMouseController(this);
}

1
TestV2/src/fr/monkhanny/dorfromantik/gui/LeaderboardBarChartPanel.java
View File

@@ -15,7 +15,6 @@ public class LeaderboardBarChartPanel extends JPanel {
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
int barWidth = 30; // Largeur des barres
int spacing = 10; // Espacement entre les barres
int barHeight = 20; // Hauteur de la barre
int totalBars = 10; // Nombre de tranches

3
TestV2/src/fr/monkhanny/dorfromantik/gui/MainMenu.java
View File

@@ -5,11 +5,10 @@ import fr.monkhanny.dorfromantik.utils.ImageLoader;
import fr.monkhanny.dorfromantik.enums.Fonts;
import fr.monkhanny.dorfromantik.components.Title;
import fr.monkhanny.dorfromantik.Options;
import fr.monkhanny.dorfromantik.listeners.LeaderboardToggleActionListener;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class MainMenu extends JFrame {

1
TestV2/src/fr/monkhanny/dorfromantik/gui/SettingsPanel.java
View File

@@ -3,7 +3,6 @@ package fr.monkhanny.dorfromantik.gui;
import fr.monkhanny.dorfromantik.Options;
import fr.monkhanny.dorfromantik.components.Title;
import fr.monkhanny.dorfromantik.listeners.*;
import fr.monkhanny.dorfromantik.utils.MusicPlayer;
import fr.monkhanny.dorfromantik.enums.Images;
import javax.swing.*;

2
TestV2/src/fr/monkhanny/dorfromantik/gui/TutorialPanel.java
View File

@@ -1,8 +1,6 @@
package fr.monkhanny.dorfromantik.gui;
import fr.monkhanny.dorfromantik.components.Title;
import fr.monkhanny.dorfromantik.gui.Step;
import fr.monkhanny.dorfromantik.gui.MainMenu;
import fr.monkhanny.dorfromantik.listeners.CloseButtonListener;
import fr.monkhanny.dorfromantik.listeners.TutorialButtonHoverListener;
import fr.monkhanny.dorfromantik.enums.Images;

1
TestV2/src/fr/monkhanny/dorfromantik/listeners/GameMouseClickListener.java
View File

@@ -3,7 +3,6 @@ package fr.monkhanny.dorfromantik.listeners;
import fr.monkhanny.dorfromantik.game.Board;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.Point;
public class GameMouseClickListener extends MouseAdapter {
private Board board;

3
TestV2/src/fr/monkhanny/dorfromantik/listeners/GameSpaceKeyListener.java
View File

@@ -2,9 +2,6 @@ package fr.monkhanny.dorfromantik.listeners;
import fr.monkhanny.dorfromantik.game.Board;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
public class GameSpaceKeyListener extends java.awt.event.KeyAdapter {
private Board board;

6
TestV2/src/fr/monkhanny/dorfromantik/listeners/LeaderboardToggleActionListener.java
View File

@@ -1,4 +1,8 @@
package fr.monkhanny.dorfromantik.gui;
package fr.monkhanny.dorfromantik.listeners;
import fr.monkhanny.dorfromantik.gui.Leaderboard;
import fr.monkhanny.dorfromantik.gui.LeaderboardByTier;
import fr.monkhanny.dorfromantik.gui.LeaderboardWorldWide;
import javax.swing.*;
import java.awt.event.ActionEvent;

4
TestV2/src/fr/monkhanny/dorfromantik/listeners/TilePanningActionListener.java
View File

@@ -9,7 +9,6 @@ import java.awt.event.ActionListener;
public class TilePanningActionListener implements ActionListener {
private Board board;
private int targetOffsetX, targetOffsetY;
private int speed; // Vitesse de la transition
private int steps; // Nombre d'étapes pour l'animation
private Timer timer;
@@ -19,11 +18,10 @@ public class TilePanningActionListener implements ActionListener {
// Variables pour suivre l'état de l'animation
private int currentStep = 0;
public TilePanningActionListener(Board board, int targetOffsetX, int targetOffsetY, int speed, int steps) {
public TilePanningActionListener(Board board, int targetOffsetX, int targetOffsetY, int steps) {
this.board = board;
this.targetOffsetX = targetOffsetX;
this.targetOffsetY = targetOffsetY;
this.speed = speed;
this.steps = steps;
}