From fba8fbe85d764c32adaf1f92e92c3f998da22708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B0=D0=BB=D0=B8=D0=BD=D0=B0=20=D0=A4=D0=B5=D0=B4?= =?UTF-8?q?=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Wed, 20 Dec 2023 14:48:32 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Hydroplane/src/main/java/org/example/DrawingHydroplane.java | 2 -- Hydroplane/src/main/java/org/example/FormPlaneConfig.java | 1 - Hydroplane/src/main/java/org/example/WindowDrawing.java | 2 ++ Hydroplane/src/main/java/org/example/WindowDrawingRect.java | 2 ++ Hydroplane/src/main/java/org/example/WindowDrawingTringle.java | 2 ++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Hydroplane/src/main/java/org/example/DrawingHydroplane.java b/Hydroplane/src/main/java/org/example/DrawingHydroplane.java index 3c26202..cba9d02 100644 --- a/Hydroplane/src/main/java/org/example/DrawingHydroplane.java +++ b/Hydroplane/src/main/java/org/example/DrawingHydroplane.java @@ -51,8 +51,6 @@ public class DrawingHydroplane extends DrawingPlane{ g.drawLine(_startPosX + 125, _startPosY + 55, _startPosX + 125, _startPosY + 70); g.drawLine(_startPosX + 130, _startPosY + 55, _startPosX + 130, _startPosY + 70); -// windowDrawing.Draw(_startPosX, _startPosY, ((EntityHydroplane)_EntityPlane).AdditionalColor, g); - if (((EntityHydroplane)_EntityPlane).Bobber) { g.fillPolygon( new int[]{ _startPosX + 55, _startPosX + 55, _startPosX + 155, _startPosX + 175 }, diff --git a/Hydroplane/src/main/java/org/example/FormPlaneConfig.java b/Hydroplane/src/main/java/org/example/FormPlaneConfig.java index 49d296e..d52c4c9 100644 --- a/Hydroplane/src/main/java/org/example/FormPlaneConfig.java +++ b/Hydroplane/src/main/java/org/example/FormPlaneConfig.java @@ -152,7 +152,6 @@ public class FormPlaneConfig { public void paintComponent (Graphics g){ super.paintComponents (g) ; Graphics2D g2d = (Graphics2D)g; - windowDrawing.setNumWindow(10); // ??? windowDrawing.Draw(-35, -28, Color.black, g2d); super.repaint(); } diff --git a/Hydroplane/src/main/java/org/example/WindowDrawing.java b/Hydroplane/src/main/java/org/example/WindowDrawing.java index dd6144d..d385155 100644 --- a/Hydroplane/src/main/java/org/example/WindowDrawing.java +++ b/Hydroplane/src/main/java/org/example/WindowDrawing.java @@ -30,6 +30,8 @@ public class WindowDrawing implements IWindowDrawing{ public void Draw(int _startPosX, int _startPosY, Color color, Graphics2D g){ g.setColor(color); + if (numWindow == null) + numWindow = NumWindow.tenWindows; switch (numWindow) { case tenWindows -> { for (int i = 0; i < 10; i++) { diff --git a/Hydroplane/src/main/java/org/example/WindowDrawingRect.java b/Hydroplane/src/main/java/org/example/WindowDrawingRect.java index f69d072..5bfe50f 100644 --- a/Hydroplane/src/main/java/org/example/WindowDrawingRect.java +++ b/Hydroplane/src/main/java/org/example/WindowDrawingRect.java @@ -30,6 +30,8 @@ public class WindowDrawingRect implements IWindowDrawing{ public void Draw(int _startPosX, int _startPosY, Color color, Graphics2D g){ g.setColor(color); + if (numWindow == null) + numWindow = NumWindow.tenWindows; switch (numWindow) { case tenWindows -> { for (int i = 0; i < 10; i++) { diff --git a/Hydroplane/src/main/java/org/example/WindowDrawingTringle.java b/Hydroplane/src/main/java/org/example/WindowDrawingTringle.java index d830699..450f6b0 100644 --- a/Hydroplane/src/main/java/org/example/WindowDrawingTringle.java +++ b/Hydroplane/src/main/java/org/example/WindowDrawingTringle.java @@ -30,6 +30,8 @@ public class WindowDrawingTringle implements IWindowDrawing{ public void Draw(int _startPosX, int _startPosY, Color color, Graphics2D g){ g.setColor(color); + if (numWindow == null) + numWindow = NumWindow.tenWindows; switch (numWindow) { case tenWindows -> { for (int i = 0; i < 10; i++) {