From 6d8e6e519b5a64a0b7bdc127bb3f6ce373c6e8fe Mon Sep 17 00:00:00 2001
From: h4ckx0r <natanagoor@gmail.com>
Date: Thu, 6 Feb 2025 20:30:28 +0100
Subject: [PATCH] Mejor uso del Singleton

---
 src/main/java/net/h4ckx0r/Arkanoid.java         | 9 +--------
 src/main/java/net/h4ckx0r/actores/Jugador.java  | 4 ++--
 src/main/java/net/h4ckx0r/actores/Ladrillo.java | 4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/h4ckx0r/Arkanoid.java b/src/main/java/net/h4ckx0r/Arkanoid.java
index 792b0a1..9ba4fcb 100644
--- a/src/main/java/net/h4ckx0r/Arkanoid.java
+++ b/src/main/java/net/h4ckx0r/Arkanoid.java
@@ -119,7 +119,7 @@ public class Arkanoid {
 
         for (int i = 0; i < Ladrillo.colores.length; i++) {
             for (int j = 0; j < numLadrillosPorLinea; j++) {
-                actores.add(new Ladrillo(anchoLadrillos, 10, i, j, separacionBloques));
+                actores.add(new Ladrillo(anchoLadrillos, 10, i, j, separacionBloques, altoVentana/12));
             }
         }
 
@@ -175,11 +175,4 @@ public class Arkanoid {
         return canvas;
     }
 
-    public static int getAltoVentana() {
-        return altoVentana;
-    }
-
-    public static int getAnchoVentana() {
-        return anchoVentana;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/h4ckx0r/actores/Jugador.java b/src/main/java/net/h4ckx0r/actores/Jugador.java
index ae8243a..5f0b10f 100644
--- a/src/main/java/net/h4ckx0r/actores/Jugador.java
+++ b/src/main/java/net/h4ckx0r/actores/Jugador.java
@@ -27,13 +27,13 @@ public class Jugador extends Actor {
     @Override
     public void actua() {
         if (movIzq && this.x > 0) this.x -= velocidadX;
-        if (movDer && this.x + this.ancho < Arkanoid.getAnchoVentana()) this.x += velocidadX;
+        if (movDer && this.x + this.ancho < Arkanoid.getInstance().getCanvas().getWidth()) this.x += velocidadX;
     }
 
     public void movimientoRaton(int x, int y) {
         x = (x - ancho / 2);
 
-        if (x > 0 && x < Arkanoid.getAnchoVentana() - this.ancho) this.x = x;
+        if (x > 0 && x < Arkanoid.getInstance().getCanvas().getWidth() - this.ancho) this.x = x;
     }
 
     public void movimientoTecladoDerecha(boolean derecha) {
diff --git a/src/main/java/net/h4ckx0r/actores/Ladrillo.java b/src/main/java/net/h4ckx0r/actores/Ladrillo.java
index 91d633f..881439b 100644
--- a/src/main/java/net/h4ckx0r/actores/Ladrillo.java
+++ b/src/main/java/net/h4ckx0r/actores/Ladrillo.java
@@ -10,13 +10,13 @@ public class Ladrillo extends Actor {
 
     int fila;
 
-    public Ladrillo(int ancho, int alto, int fila, int columna, int separacion) {
+    public Ladrillo(int ancho, int alto, int fila, int columna, int separacion, int separacionSuperior) {
         this.setAncho(ancho);
         this.setAlto(alto);
         this.fila = fila;
 
         this.x = separacion + (columna * ancho) + (separacion * columna);
-        this.y = separacion + (fila * alto) + (separacion * fila) + (Arkanoid.getAltoVentana()/12);
+        this.y = separacion + (fila * alto) + (separacion * fila) + separacionSuperior;
     }
 
     @Override