From cb9068a06d1256659cd46a6edcc6fcc95e6d795a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?=
=?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?=
<116575516+LAYT73@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:05:49 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?=
=?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?=
=?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?=
=?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{ => Drawings}/DirectionType.cs | 2 +-
.../DrawingPlane.cs} | 138 +++++++-----------
.../Drawings/DrawingSeaplane.cs | 68 +++++++++
.../ProjectSeaplane/Entities/EntityPlane.cs | 27 ++++
.../Entities/EntitySeaplane.cs | 23 +++
.../ProjectSeaplane/EntitySeaplane.cs | 34 -----
.../ProjectSeaplane/FormSeaplane.Designer.cs | 36 +++--
.../ProjectSeaplane/FormSeaplane.cs | 50 ++++---
8 files changed, 231 insertions(+), 147 deletions(-)
rename ProjectSeaplane/ProjectSeaplane/{ => Drawings}/DirectionType.cs (85%)
rename ProjectSeaplane/ProjectSeaplane/{DrawingSeaplane.cs => Drawings/DrawingPlane.cs} (55%)
create mode 100644 ProjectSeaplane/ProjectSeaplane/Drawings/DrawingSeaplane.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs
delete mode 100644 ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs
diff --git a/ProjectSeaplane/ProjectSeaplane/DirectionType.cs b/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
similarity index 85%
rename from ProjectSeaplane/ProjectSeaplane/DirectionType.cs
rename to ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
index 7efa146..503408f 100644
--- a/ProjectSeaplane/ProjectSeaplane/DirectionType.cs
+++ b/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace ProjectSeaplane;
+namespace ProjectSeaplane.Drawings;
public enum DirectionType
{
diff --git a/ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
similarity index 55%
rename from ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs
rename to ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
index f5ea121..6fc5af4 100644
--- a/ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs
+++ b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
@@ -3,34 +3,44 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using ProjectSeaplane.Entities;
-namespace ProjectSeaplane;
-public class DrawingSeaplane
+namespace ProjectSeaplane.Drawings;
+public class DrawingPlane
{
- public EntitySeaplane? EntitySeaplane {get;private set;}
-
- private int? _pictureWidth;
-
- private int? _pictureHeight;
-
- private int? _startPosX;
-
- private int? _startPosY;
-
- private readonly int _drawingSeaplaneWidth = 190;
-
- private readonly int _drawingSeaplaneHeight = 85;
+ public EntityPlane? EntityPlane { get; protected set; }
- public void Init (int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool inflatableBoat)
+ private int? _pictureWidth;
+
+ private int? _pictureHeight;
+
+ protected int? _startPosX;
+
+ protected int? _startPosY;
+
+ private readonly int _drawingSeaplaneWidth = 190;
+
+ private readonly int _drawingSeaplaneHeight = 70;
+
+ private DrawingPlane()
{
- EntitySeaplane = new EntitySeaplane();
- EntitySeaplane.Init(speed, weight, bodyColor, additionalColor, floats, inflatableBoat);
_pictureHeight = null;
_pictureWidth = null;
_startPosX = null;
_startPosY = null;
}
+ public DrawingPlane(int speed, double weight, Color bodyColor) : this()
+ {
+ EntityPlane = new EntityPlane(speed, weight, bodyColor);
+ }
+
+ protected DrawingPlane(int drawingSeaplaneWidth, int drawingSeaplaneHeight) : this()
+ {
+ _drawingSeaplaneWidth = drawingSeaplaneWidth;
+ _drawingSeaplaneHeight = drawingSeaplaneHeight;
+ }
+
public bool SetPictureSize(int width, int height)
{
if (_drawingSeaplaneWidth > width || _drawingSeaplaneHeight > height)
@@ -88,7 +98,7 @@ public class DrawingSeaplane
public bool MoveTransport(DirectionType direction)
{
- if (EntitySeaplane == null || !_startPosX.HasValue || !_startPosY.HasValue || !_pictureWidth.HasValue || !_pictureHeight.HasValue)
+ if (EntityPlane == null || !_startPosX.HasValue || !_startPosY.HasValue || !_pictureWidth.HasValue || !_pictureHeight.HasValue)
{
return false;
}
@@ -97,30 +107,30 @@ public class DrawingSeaplane
{
//влево
case DirectionType.Left:
- if (_startPosX.Value - EntitySeaplane.Step >= 0)
+ if (_startPosX.Value - EntityPlane.Step >= 0)
{
- _startPosX -= (int)EntitySeaplane.Step;
+ _startPosX -= (int)EntityPlane.Step;
}
return true;
//вверх
case DirectionType.Up:
- if (_startPosY.Value - EntitySeaplane.Step >= 0)
+ if (_startPosY.Value - EntityPlane.Step >= 0)
{
- _startPosY -= (int)EntitySeaplane.Step;
+ _startPosY -= (int)EntityPlane.Step;
}
return true;
// вправо
case DirectionType.Right:
- if (_startPosX.Value + EntitySeaplane.Step <= _pictureWidth.Value - _drawingSeaplaneWidth)
+ if (_startPosX.Value + EntityPlane.Step <= _pictureWidth.Value - _drawingSeaplaneWidth)
{
- _startPosX += (int)EntitySeaplane.Step;
+ _startPosX += (int)EntityPlane.Step;
}
return true;
//вниз
case DirectionType.Down:
- if (_startPosY.Value + EntitySeaplane.Step <= _pictureHeight.Value - _drawingSeaplaneHeight)
+ if (_startPosY.Value + EntityPlane.Step <= _pictureHeight.Value - _drawingSeaplaneHeight)
{
- _startPosY += (int)EntitySeaplane.Step;
+ _startPosY += (int)EntityPlane.Step;
}
return true;
default:
@@ -128,18 +138,16 @@ public class DrawingSeaplane
}
}
- public void DrawTransport(Graphics g)
+ public virtual void DrawTransport(Graphics g)
{
- if (EntitySeaplane == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityPlane == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
return;
}
Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(EntitySeaplane.AdditionalColor);
- Brush bodyBrush = new SolidBrush(EntitySeaplane.BodyColor);
+ Brush bodyBrush = new SolidBrush(EntityPlane.BodyColor);
Brush brBlack = new SolidBrush(Color.Black);
- Brush brRed = new SolidBrush(Color.Red);
//границы самолета
g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 34, 20, 20);
@@ -149,9 +157,9 @@ public class DrawingSeaplane
g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 34, 160, 30);
Point[] pointsFaceTop = {
- new Point(_startPosX.Value + 170, _startPosY.Value+30),
- new Point(_startPosX.Value + 170, _startPosY.Value + 50),
- new Point(_startPosX.Value + 190, _startPosY.Value + 50)
+ new Point(_startPosX.Value + 170, _startPosY.Value + 30),
+ new Point(_startPosX.Value + 170, _startPosY.Value + 50),
+ new Point(_startPosX.Value + 190, _startPosY.Value + 50)
};
g.DrawPolygon(pen, pointsFaceTop);
@@ -161,34 +169,18 @@ public class DrawingSeaplane
new Point(_startPosX.Value + 190, _startPosY.Value + 50)
};
g.DrawPolygon(pen, pointsFaceBottom);
-
+
Point[] pointsKeel = {
new Point(_startPosX.Value + 10, _startPosY.Value),
- new Point(_startPosX.Value + 10, _startPosY.Value+35),
- new Point(_startPosX.Value + 50, _startPosY.Value+35)
+ new Point(_startPosX.Value + 10, _startPosY.Value + 35),
+ new Point(_startPosX.Value + 50, _startPosY.Value + 35)
};
g.DrawPolygon(pen, pointsKeel);
- if (!EntitySeaplane.Floats)
- {
- // Рисуем переднее шасси с одним колесом
- g.DrawEllipse(pen, _startPosX.Value + 140, _startPosY.Value + 75, 10, 10);
-
- // Рисуем задние шасси с двумя колесами
- g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 75, 10, 10);
- g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 75, 10, 10);
-
- // Рисуем ногу переднего шасси
- g.DrawLine(pen, _startPosX.Value + 145, _startPosY.Value + 65, _startPosX.Value + 145, _startPosY.Value + 80);
-
- // Рисуем ноги заднего шасси
- g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 65, _startPosX.Value + 30, _startPosY.Value + 80);
- }
-
// Рисуем триммера
- g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value+30, 10, 10);
- g.DrawEllipse(pen, _startPosX.Value+30, _startPosY.Value+30, 10, 10);
- g.DrawRectangle(pen, _startPosX.Value+5, _startPosY.Value+30, 30, 10);
+ g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 30, 10, 10);
+ g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 30, 10, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 30, 30, 10);
// Рисуем крыло
g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value + 45, 6, 6);
@@ -196,9 +188,9 @@ public class DrawingSeaplane
g.DrawRectangle(pen, _startPosX.Value + 75, _startPosY.Value + 45, 60, 6);
// Закрашиваем носовую часть и киль
- g.FillPolygon(additionalBrush, pointsFaceBottom);
- g.FillPolygon(additionalBrush, pointsFaceTop);
- g.FillPolygon(additionalBrush, pointsKeel);
+ g.FillPolygon(bodyBrush, pointsFaceBottom);
+ g.FillPolygon(bodyBrush, pointsFaceTop);
+ g.FillPolygon(bodyBrush, pointsKeel);
// Закрашиваем корпус
g.FillEllipse(bodyBrush, _startPosX.Value, _startPosY.Value + 34, 20, 20);
@@ -207,34 +199,14 @@ public class DrawingSeaplane
g.FillRectangle(bodyBrush, _startPosX.Value + 10, _startPosY.Value + 34, 160, 30);
// Закрашиваем триммера
- g.FillEllipse(brBlack, _startPosX.Value, _startPosY.Value+30, 10, 10);
- g.FillEllipse(brBlack, _startPosX.Value + 30, _startPosY.Value+30, 10, 10);
- g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value+30, 30, 10);
+ g.FillEllipse(brBlack, _startPosX.Value, _startPosY.Value + 30, 10, 10);
+ g.FillEllipse(brBlack, _startPosX.Value + 30, _startPosY.Value + 30, 10, 10);
+ g.FillRectangle(brBlack, _startPosX.Value + 5, _startPosY.Value + 30, 30, 10);
// Закрашиваем крыло
g.FillEllipse(brBlack, _startPosX.Value + 70, _startPosY.Value + 44, 6, 6);
g.FillEllipse(brBlack, _startPosX.Value + 130, _startPosY.Value + 44, 6, 6);
g.FillRectangle(brBlack, _startPosX.Value + 75, _startPosY.Value + 45, 60, 5);
-
- // Поплавки
- if (EntitySeaplane.Floats)
- {
- g.DrawLine(pen, _startPosX.Value + 125, _startPosY.Value + 65, _startPosX.Value + 125, _startPosY.Value + 80);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 65, _startPosX.Value + 50, _startPosY.Value + 80);
- g.FillEllipse(brBlack, _startPosX.Value + 40, _startPosY.Value + 75, 10, 10);
- g.FillEllipse(brBlack, _startPosX.Value + 125, _startPosY.Value + 75, 10, 10);
- g.FillRectangle(brBlack, _startPosX.Value + 45, _startPosY.Value + 75, 85, 10);
-
- }
-
- // Надувная лодка
- if (EntitySeaplane.InflatableBoat)
- {
- g.FillEllipse(brRed, _startPosX.Value, _startPosY.Value + 60, 8, 8);
- g.FillEllipse(brRed, _startPosX.Value + 165, _startPosY.Value + 60, 8, 8);
- g.FillRectangle(brRed, _startPosX.Value + 4, _startPosY.Value + 60, 165, 8);
- }
}
-
}
diff --git a/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingSeaplane.cs
new file mode 100644
index 0000000..915b8bc
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingSeaplane.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectSeaplane.Entities;
+
+namespace ProjectSeaplane.Drawings;
+public class DrawingSeaplane : DrawingPlane
+{
+ public DrawingSeaplane(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool inflatableBoat) : base(190, 85)
+ {
+ EntityPlane = new EntitySeaplane(speed, weight, bodyColor, additionalColor, floats, inflatableBoat);
+ }
+
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityPlane == null || EntityPlane is not EntitySeaplane seaplane || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new SolidBrush(seaplane.AdditionalColor);
+ Brush brBlack = new SolidBrush(Color.Black);
+ Brush brRed = new SolidBrush(Color.Red);
+
+ if (!seaplane.Floats)
+ {
+ // Рисуем переднее шасси с одним колесом
+ g.DrawEllipse(pen, _startPosX.Value + 140, _startPosY.Value + 75, 10, 10);
+
+ // Рисуем задние шасси с двумя колесами
+ g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 75, 10, 10);
+ g.DrawEllipse(pen, _startPosX.Value + 30, _startPosY.Value + 75, 10, 10);
+
+ // Рисуем ногу переднего шасси
+ g.DrawLine(pen, _startPosX.Value + 145, _startPosY.Value + 65, _startPosX.Value + 145, _startPosY.Value + 80);
+
+ // Рисуем ноги заднего шасси
+ g.DrawLine(pen, _startPosX.Value + 30, _startPosY.Value + 65, _startPosX.Value + 30, _startPosY.Value + 80);
+ }
+
+ base.DrawTransport(g);
+
+ // Поплавки
+ if (seaplane.Floats)
+ {
+ g.DrawLine(pen, _startPosX.Value + 125, _startPosY.Value + 65, _startPosX.Value + 125, _startPosY.Value + 80);
+ g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 65, _startPosX.Value + 50, _startPosY.Value + 80);
+ g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 75, 10, 10);
+ g.FillEllipse(additionalBrush, _startPosX.Value + 125, _startPosY.Value + 75, 10, 10);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 75, 85, 10);
+
+ }
+
+ // Надувная лодка
+ if (seaplane.InflatableBoat)
+ {
+ g.FillEllipse(brRed, _startPosX.Value, _startPosY.Value + 60, 8, 8);
+ g.FillEllipse(brRed, _startPosX.Value + 165, _startPosY.Value + 60, 8, 8);
+ g.FillRectangle(brRed, _startPosX.Value + 4, _startPosY.Value + 60, 165, 8);
+ }
+
+ }
+}
+
diff --git a/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs b/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs
new file mode 100644
index 0000000..d7d0d27
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.Entities;
+
+public class EntityPlane
+{
+ public int Speed { get; set; }
+
+ public double Weight { get; set; }
+
+ public Color BodyColor { get; private set; }
+
+ public double Step => Speed * 100 / Weight;
+
+ public EntityPlane(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ }
+}
+
diff --git a/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs b/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs
new file mode 100644
index 0000000..7a7996c
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.Entities;
+public class EntitySeaplane : EntityPlane
+{
+ public Color AdditionalColor { get; private set; }
+
+ public bool Floats { get; private set; }
+
+ public bool InflatableBoat { get; private set; }
+
+ public EntitySeaplane(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool inflatableBoat) : base(speed, weight, bodyColor)
+ {
+ AdditionalColor = additionalColor;
+ Floats = floats;
+ InflatableBoat = inflatableBoat;
+ }
+}
+
diff --git a/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs b/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs
deleted file mode 100644
index 87b19a4..0000000
--- a/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectSeaplane;
-public class EntitySeaplane
-{
- public int Speed { get; set; }
-
- public double Weight { get; set; }
-
- public Color BodyColor { get; private set; }
-
- public Color AdditionalColor { get; private set; }
-
- public double Step => Speed * 100 / Weight;
-
- public bool Floats { get; private set; }
-
- public bool InflatableBoat { get; private set; }
-
- public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool inflatableBoat)
- {
- Speed = speed;
- Weight = weight;
- BodyColor = bodyColor;
- AdditionalColor = additionalColor;
- Floats = floats;
- InflatableBoat = inflatableBoat;
- }
-}
-
diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
index d88a9de..f9b1add 100644
--- a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
+++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
@@ -29,11 +29,12 @@
private void InitializeComponent()
{
pictureBoxSeaplane = new PictureBox();
- buttonCreate = new Button();
+ buttonCreateSeaplane = new Button();
buttonLeft = new Button();
buttonRight = new Button();
buttonDown = new Button();
buttonUp = new Button();
+ buttonCreatePlane = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxSeaplane).BeginInit();
SuspendLayout();
//
@@ -48,14 +49,14 @@
//
// buttonCreate
//
- buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreate.Location = new Point(12, 511);
- buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(75, 23);
- buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Создать";
- buttonCreate.UseVisualStyleBackColor = true;
- buttonCreate.Click += buttonCreate_Click;
+ buttonCreateSeaplane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreateSeaplane.Location = new Point(12, 511);
+ buttonCreateSeaplane.Name = "buttonCreate";
+ buttonCreateSeaplane.Size = new Size(205, 23);
+ buttonCreateSeaplane.TabIndex = 1;
+ buttonCreateSeaplane.Text = "Создать Seaplane";
+ buttonCreateSeaplane.UseVisualStyleBackColor = true;
+ buttonCreateSeaplane.Click += buttonCreateSeaplane_Click;
//
// buttonLeft
//
@@ -105,16 +106,28 @@
buttonUp.UseVisualStyleBackColor = true;
buttonUp.Click += ButtonMove_Click;
//
+ // buttonCreatePlane
+ //
+ buttonCreatePlane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreatePlane.Location = new Point(223, 511);
+ buttonCreatePlane.Name = "buttonCreatePlane";
+ buttonCreatePlane.Size = new Size(205, 23);
+ buttonCreatePlane.TabIndex = 6;
+ buttonCreatePlane.Text = "Создать Plane";
+ buttonCreatePlane.UseVisualStyleBackColor = true;
+ buttonCreatePlane.Click += buttonCreatePlane_Click;
+ //
// FormSeaplane
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(817, 546);
+ Controls.Add(buttonCreatePlane);
Controls.Add(buttonUp);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreate);
+ Controls.Add(buttonCreateSeaplane);
Controls.Add(pictureBoxSeaplane);
Name = "FormSeaplane";
Text = "FormSeaplane";
@@ -125,10 +138,11 @@
#endregion
private PictureBox pictureBoxSeaplane;
- private Button buttonCreate;
+ private Button buttonCreateSeaplane;
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
private Button buttonUp;
+ private Button buttonCreatePlane;
}
}
\ No newline at end of file
diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
index 3e9e366..7b83156 100644
--- a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
+++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
@@ -7,13 +7,14 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using ProjectSeaplane.Drawings;
namespace ProjectSeaplane
{
public partial class FormSeaplane : Form
{
- private DrawingSeaplane? _drawingSeaplane;
-
+ private DrawingPlane? _drawingPlane;
+
public FormSeaplane()
{
InitializeComponent();
@@ -21,35 +22,48 @@ namespace ProjectSeaplane
private void Draw()
{
- if (_drawingSeaplane == null)
+ if (_drawingPlane == null)
{
return;
}
Bitmap bmp = new(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawingSeaplane.DrawTransport(gr);
+ _drawingPlane.DrawTransport(gr);
pictureBoxSeaplane.Image = bmp;
}
- private void buttonCreate_Click(object sender, EventArgs e)
+ private void CreateObject(string type)
{
Random random = new();
- _drawingSeaplane = new DrawingSeaplane();
- _drawingSeaplane.Init(random.Next(100, 300), random.Next(1000, 3000),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Convert.ToBoolean(random.Next(0,2)), Convert.ToBoolean(random.Next(0, 2))
- );
- _drawingSeaplane.SetPictureSize(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height);
- _drawingSeaplane.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ switch (type)
+ {
+ case nameof(DrawingPlane):
+ _drawingPlane = new DrawingPlane(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
+ break;
+ case nameof(DrawingSeaplane):
+ _drawingPlane = new DrawingSeaplane(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+ _drawingPlane.SetPictureSize(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height);
+ _drawingPlane.SetPosition(random.Next(10, 100), random.Next(10, 100));
Draw();
}
+ private void buttonCreateSeaplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingSeaplane));
+
+ private void buttonCreatePlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingPlane));
+
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawingSeaplane == null)
+ if (_drawingPlane == null)
{
return;
}
@@ -59,16 +73,16 @@ namespace ProjectSeaplane
switch (name)
{
case "buttonUp":
- result = _drawingSeaplane.MoveTransport(DirectionType.Up);
+ result = _drawingPlane.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
- result = _drawingSeaplane.MoveTransport(DirectionType.Down);
+ result = _drawingPlane.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
- result = _drawingSeaplane.MoveTransport(DirectionType.Left);
+ result = _drawingPlane.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
- result = _drawingSeaplane.MoveTransport(DirectionType.Right);
+ result = _drawingPlane.MoveTransport(DirectionType.Right);
break;
}
--
2.25.1
From b54f5e39f8b07e2d082d1f232c3bf9edb1f390b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?=
=?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?=
<116575516+LAYT73@users.noreply.github.com>
Date: Mon, 18 Mar 2024 06:44:27 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?=
=?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProjectSeaplane/Drawings/DirectionType.cs | 2 +
.../ProjectSeaplane/Drawings/DrawingPlane.cs | 38 +++++----
.../ProjectSeaplane/FormSeaplane.Designer.cs | 30 ++++++-
.../ProjectSeaplane/FormSeaplane.cs | 49 ++++++++++-
.../MovementStrategy/AbstractStrategy.cs | 83 +++++++++++++++++++
.../MovementStrategy/IMoveableObject.cs | 16 ++++
.../MovementStrategy/MoveToBorder.cs | 57 +++++++++++++
.../MovementStrategy/MoveToCenter.cs | 57 +++++++++++++
.../MovementStrategy/MoveablePlane.cs | 59 +++++++++++++
.../MovementStrategy/MovementDirection.cs | 19 +++++
.../MovementStrategy/ObjectParameters.cs | 37 +++++++++
.../MovementStrategy/StrategyStatus.cs | 16 ++++
12 files changed, 445 insertions(+), 18 deletions(-)
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/AbstractStrategy.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/IMoveableObject.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToBorder.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToCenter.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveablePlane.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/MovementDirection.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/ObjectParameters.cs
create mode 100644 ProjectSeaplane/ProjectSeaplane/MovementStrategy/StrategyStatus.cs
diff --git a/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs b/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
index 503408f..806db97 100644
--- a/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
+++ b/ProjectSeaplane/ProjectSeaplane/Drawings/DirectionType.cs
@@ -15,5 +15,7 @@ public enum DirectionType
Left = 3,
Right = 4,
+
+ Unknow = -1,
}
diff --git a/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
index 6fc5af4..19b754d 100644
--- a/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
+++ b/ProjectSeaplane/ProjectSeaplane/Drawings/DrawingPlane.cs
@@ -18,10 +18,18 @@ public class DrawingPlane
protected int? _startPosY;
- private readonly int _drawingSeaplaneWidth = 190;
+ private readonly int _drawingPlaneWidth = 190;
- private readonly int _drawingSeaplaneHeight = 70;
+ private readonly int _drawingPlaneHeight = 70;
+ public int? GetPosX => _startPosX;
+
+ public int? GetPosY => _startPosY;
+
+ public int GetWidth => _drawingPlaneWidth;
+
+ public int GetHeight => _drawingPlaneHeight;
+
private DrawingPlane()
{
_pictureHeight = null;
@@ -37,13 +45,13 @@ public class DrawingPlane
protected DrawingPlane(int drawingSeaplaneWidth, int drawingSeaplaneHeight) : this()
{
- _drawingSeaplaneWidth = drawingSeaplaneWidth;
- _drawingSeaplaneHeight = drawingSeaplaneHeight;
+ _drawingPlaneWidth = drawingSeaplaneWidth;
+ _drawingPlaneHeight = drawingSeaplaneHeight;
}
public bool SetPictureSize(int width, int height)
{
- if (_drawingSeaplaneWidth > width || _drawingSeaplaneHeight > height)
+ if (_drawingPlaneWidth > width || _drawingPlaneHeight > height)
{
return false;
}
@@ -53,14 +61,14 @@ public class DrawingPlane
if (_startPosX.HasValue || _startPosY.HasValue)
{
- if (_startPosX + _drawingSeaplaneWidth > _pictureWidth)
+ if (_startPosX + _drawingPlaneWidth > _pictureWidth)
{
- _startPosX = _pictureWidth - _drawingSeaplaneWidth;
+ _startPosX = _pictureWidth - _drawingPlaneWidth;
}
else if (_startPosX < 0) _startPosX = 0;
- if (_startPosY + _drawingSeaplaneHeight > _pictureHeight)
+ if (_startPosY + _drawingPlaneHeight > _pictureHeight)
{
- _startPosY = _pictureHeight - _drawingSeaplaneHeight;
+ _startPosY = _pictureHeight - _drawingPlaneHeight;
}
else if (_startPosY < 0) _startPosY = 0;
}
@@ -78,18 +86,18 @@ public class DrawingPlane
{
x = 0;
}
- else if (x - _drawingSeaplaneWidth >= _pictureWidth.Value)
+ else if (x - _drawingPlaneWidth >= _pictureWidth.Value)
{
- x = _pictureWidth.Value - _drawingSeaplaneWidth - _drawingSeaplaneWidth;
+ x = _pictureWidth.Value - _drawingPlaneWidth - _drawingPlaneWidth;
}
if (y < 0)
{
y = 0;
}
- else if (y - _drawingSeaplaneHeight >= _pictureHeight)
+ else if (y - _drawingPlaneHeight >= _pictureHeight)
{
- y = _pictureHeight.Value - _drawingSeaplaneHeight - _drawingSeaplaneHeight;
+ y = _pictureHeight.Value - _drawingPlaneHeight - _drawingPlaneHeight;
}
_startPosY = y;
@@ -121,14 +129,14 @@ public class DrawingPlane
return true;
// вправо
case DirectionType.Right:
- if (_startPosX.Value + EntityPlane.Step <= _pictureWidth.Value - _drawingSeaplaneWidth)
+ if (_startPosX.Value + EntityPlane.Step <= _pictureWidth.Value - _drawingPlaneWidth)
{
_startPosX += (int)EntityPlane.Step;
}
return true;
//вниз
case DirectionType.Down:
- if (_startPosY.Value + EntityPlane.Step <= _pictureHeight.Value - _drawingSeaplaneHeight)
+ if (_startPosY.Value + EntityPlane.Step <= _pictureHeight.Value - _drawingPlaneHeight)
{
_startPosY += (int)EntityPlane.Step;
}
diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
index f9b1add..bcace8f 100644
--- a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
+++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs
@@ -35,6 +35,8 @@
buttonDown = new Button();
buttonUp = new Button();
buttonCreatePlane = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxSeaplane).BeginInit();
SuspendLayout();
//
@@ -47,11 +49,11 @@
pictureBoxSeaplane.TabIndex = 0;
pictureBoxSeaplane.TabStop = false;
//
- // buttonCreate
+ // buttonCreateSeaplane
//
buttonCreateSeaplane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
buttonCreateSeaplane.Location = new Point(12, 511);
- buttonCreateSeaplane.Name = "buttonCreate";
+ buttonCreateSeaplane.Name = "buttonCreateSeaplane";
buttonCreateSeaplane.Size = new Size(205, 23);
buttonCreateSeaplane.TabIndex = 1;
buttonCreateSeaplane.Text = "Создать Seaplane";
@@ -117,11 +119,33 @@
buttonCreatePlane.UseVisualStyleBackColor = true;
buttonCreatePlane.Click += buttonCreatePlane_Click;
//
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(684, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(121, 23);
+ comboBoxStrategy.TabIndex = 7;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(684, 41);
+ buttonStrategyStep.Name = "buttonStrategyStep";
+ buttonStrategyStep.Size = new Size(121, 23);
+ buttonStrategyStep.TabIndex = 8;
+ buttonStrategyStep.Text = "Шаг";
+ buttonStrategyStep.UseVisualStyleBackColor = true;
+ buttonStrategyStep.Click += buttonStrategyStep_Click;
+ //
// FormSeaplane
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(817, 546);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
Controls.Add(buttonCreatePlane);
Controls.Add(buttonUp);
Controls.Add(buttonDown);
@@ -144,5 +168,7 @@
private Button buttonDown;
private Button buttonUp;
private Button buttonCreatePlane;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
}
}
\ No newline at end of file
diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
index 7b83156..9946e60 100644
--- a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
+++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs
@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ProjectSeaplane.Drawings;
+using ProjectSeaplane.MovementStrategy;
namespace ProjectSeaplane
{
@@ -15,9 +16,15 @@ namespace ProjectSeaplane
{
private DrawingPlane? _drawingPlane;
+ private AbstractStrategy? _strategy;
+
+ ///
+ /// Конструктор формы
+ ///
public FormSeaplane()
{
InitializeComponent();
+ _strategy = null;
}
private void Draw()
@@ -51,9 +58,11 @@ namespace ProjectSeaplane
default:
return;
}
-
_drawingPlane.SetPictureSize(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height);
_drawingPlane.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+ comboBoxStrategy.Enabled = true;
+
Draw();
}
@@ -91,5 +100,43 @@ namespace ProjectSeaplane
Draw();
}
}
+
+ private void buttonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawingPlane == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveablePlane(_drawingPlane), pictureBoxSeaplane.Width, pictureBoxSeaplane.Height);
+ }
+
+ if (_strategy == null)
+ {
+ return;
+ }
+
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+
+ if (_strategy.GetStatus() == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ }
+ }
}
}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/AbstractStrategy.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..06660d1
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+ private IMoveableObject? _moveableObject;
+
+ private StrategyStatus _state = StrategyStatus.NotInit;
+
+ protected int FieldWidth { get; private set; }
+
+ protected int FieldHeight { get; private set; }
+
+ public StrategyStatus GetStatus() { return _state; }
+
+ public void SetData(IMoveableObject moveableObject, int width, int height)
+ {
+ if (moveableObject == null)
+ {
+ _state = StrategyStatus.NotInit;
+ return;
+ }
+
+ _state = StrategyStatus.InProgress;
+ _moveableObject = moveableObject;
+ FieldWidth = width;
+ FieldHeight = height;
+ }
+
+ public void MakeStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return;
+ }
+
+ if (IsTargetDestination())
+ {
+ _state = StrategyStatus.Finish;
+ return;
+ }
+
+ MoveToTarget();
+ }
+
+ protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+ protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+ protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+ protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+ protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+ protected int? GetStep()
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return null;
+ }
+ return _moveableObject?.GetStep;
+ }
+
+ protected abstract void MoveToTarget();
+
+ protected abstract bool IsTargetDestination();
+
+ private bool MoveTo(MovementDirection movementDirection)
+ {
+ if (_state != StrategyStatus.InProgress)
+ {
+ return false;
+ }
+
+ return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+ }
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/IMoveableObject.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/IMoveableObject.cs
new file mode 100644
index 0000000..68e6ac9
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/IMoveableObject.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public interface IMoveableObject
+{
+ ObjectParameters? GetObjectPosition { get; }
+
+ int GetStep { get; }
+
+ bool TryMoveObject(MovementDirection direction);
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToBorder.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..7a88dd5
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestination()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+
+ return objParams.RightBorder - GetStep() <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+ objParams.DownBorder - GetStep() <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
+ }
+
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+
+ int diffX = objParams.RightBorder - FieldWidth;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+
+ int diffY = objParams.DownBorder - FieldHeight;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToCenter.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..9b92946
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+ protected override bool IsTargetDestination()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+
+ return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+ objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+ }
+
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+
+ int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+
+ int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveablePlane.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveablePlane.cs
new file mode 100644
index 0000000..3d24aad
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MoveablePlane.cs
@@ -0,0 +1,59 @@
+using ProjectSeaplane.Drawings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public class MoveablePlane : IMoveableObject
+{
+ private readonly DrawingPlane? _plane = null;
+
+ public MoveablePlane(DrawingPlane plane)
+ {
+ _plane = plane;
+ }
+
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_plane == null || _plane.EntityPlane == null || !_plane.GetPosX.HasValue || !_plane.GetPosY.HasValue)
+ {
+ return null;
+ }
+ return new ObjectParameters(_plane.GetPosX.Value, _plane.GetPosY.Value, _plane.GetWidth, _plane.GetHeight);
+ }
+ }
+
+ public int GetStep => (int)(_plane?.EntityPlane?.Step ?? 0);
+
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_plane == null || _plane.EntityPlane == null)
+ {
+ return false;
+ }
+
+ return _plane.MoveTransport(GetDirectionType(direction));
+ }
+
+ ///
+ /// Конвертация из MovementDirection в DirectionType
+ ///
+ /// MovementDirection
+ /// DirectionType
+ private static DirectionType GetDirectionType(MovementDirection direction)
+ {
+ return direction switch
+ {
+ MovementDirection.Left => DirectionType.Left,
+ MovementDirection.Right => DirectionType.Right,
+ MovementDirection.Up => DirectionType.Up,
+ MovementDirection.Down => DirectionType.Down,
+ _ => DirectionType.Unknow,
+ };
+ }
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MovementDirection.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..abb11ad
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public enum MovementDirection
+{
+ Up = 1,
+
+ Down = 2,
+
+ Left = 3,
+
+ Right = 4,
+}
+
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/ObjectParameters.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..ab9b01e
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public class ObjectParameters
+{
+ private readonly int _x;
+
+ private readonly int _y;
+
+ private readonly int _width;
+
+ private readonly int _height;
+ public int LeftBorder => _x;
+
+ public int TopBorder => _y;
+
+ public int RightBorder => _x + _width;
+
+ public int DownBorder => _y + _height;
+
+ public int ObjectMiddleHorizontal => _x + _width / 2;
+
+ public int ObjectMiddleVertical => _y + _height / 2;
+
+ public ObjectParameters (int x, int y, int width, int height)
+ {
+ _x = x;
+ _y = y;
+ _width = width;
+ _height = height;
+ }
+}
diff --git a/ProjectSeaplane/ProjectSeaplane/MovementStrategy/StrategyStatus.cs b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..5f8e9a4
--- /dev/null
+++ b/ProjectSeaplane/ProjectSeaplane/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectSeaplane.MovementStrategy;
+
+public enum StrategyStatus
+{
+ NotInit,
+
+ InProgress,
+
+ Finish
+}
--
2.25.1