diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier.sln b/ProjectAircraftCarrier/ProjectAircraftCarrier.sln deleted file mode 100644 index eaafb37..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectAircraftCarrier", "ProjectAircraftCarrier\ProjectAircraftCarrier.csproj", "{A871246D-86F2-4370-B644-24A99BFF6783}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A871246D-86F2-4370-B644-24A99BFF6783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7F4937DC-FEE0-4D3B-8062-6479A5B07CE4} - EndGlobalSection -EndGlobal diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.Designer.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.Designer.cs deleted file mode 100644 index 1e97595..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectAircraftCarrier -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.cs deleted file mode 100644 index f1a07ae..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectAircraftCarrier -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Program.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Program.cs deleted file mode 100644 index 1ba11b2..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ProjectAircraftCarrier -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); - } - } -} \ No newline at end of file diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier.csproj b/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier.csproj deleted file mode 100644 index 663fdb8..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - - - \ No newline at end of file diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier1.csproj b/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier1.csproj deleted file mode 100644 index af03d74..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/ProjectAircraftCarrier1.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - - - - - True - True - Resources.resx - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - \ No newline at end of file diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier1.sln b/ProjectAircraftCarrier/ProjectAircraftCarrier1.sln deleted file mode 100644 index 0eb21b9..0000000 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectAircraftCarrier1", "ProjectAircraftCarrier\ProjectAircraftCarrier1.csproj", "{A871246D-86F2-4370-B644-24A99BFF6783}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A871246D-86F2-4370-B644-24A99BFF6783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A871246D-86F2-4370-B644-24A99BFF6783}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7F4937DC-FEE0-4D3B-8062-6479A5B07CE4} - EndGlobalSection -EndGlobal diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/DrawningAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/DrawningAircraftCarrier.cs deleted file mode 100644 index 064b101..0000000 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/DrawningAircraftCarrier.cs +++ /dev/null @@ -1,248 +0,0 @@ -namespace ProjectAircraftCarrier; - -internal class DrawningAircraftCarrier -{ - /// - /// Класс-сущность - /// - public EntityAircraftCarrier? EntityAircraftCarrier { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки авианосца - /// - private int? _startPosX; - - /// - /// Верхняя координата прорисовки авианосца - /// - private int? _startPosY; - - /// - /// Ширина прорисовки авианосца - /// - private readonly int _drawningAircraftCarrierWidth = 140; - - /// - /// Высота прорисовки авианосца - /// - private readonly int _drawningAircraftCarrierHeight = 50; - - /// - /// Инициализация полей объекта-класса авианосца - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Палуба для взлета самолетов - /// Рубка управления - /// Истребитель - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) - { - EntityAircraftCarrier = new EntityAircraftCarrier(); - EntityAircraftCarrier.Init(speed, weight, bodyColor, additionalColor, deckForAircraftTakeOff, controlCabin, fighterJet); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - // TODO проверка, что объект "влезает" в размеры поля - // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена - if (_drawningAircraftCarrierWidth <= width && _drawningAircraftCarrierHeight <= height) - { - _pictureWidth = width; - _pictureHeight = height; - if (_startPosX.HasValue && _startPosY.HasValue) - { - if (_startPosX + _drawningAircraftCarrierWidth > width) - { - _startPosX = width - _drawningAircraftCarrierWidth; - } - - if (_startPosY + _drawningAircraftCarrierHeight > height) - { - _startPosY = height - _drawningAircraftCarrierHeight; - } - } - return true; - } - return false; - } - - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y) - { - if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - - // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы - // то надо изменить координаты, чтобы он оставался в этих границах - _startPosX = x; - _startPosY = y; - if (x < 0) - { - _startPosX = 0; - } - - if (y < 0) - { - _startPosY = 0; - } - - if (x + _drawningAircraftCarrierWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawningAircraftCarrierWidth; - } - - if (y + _drawningAircraftCarrierHeight > _pictureHeight) - { - _startPosY = _pictureHeight - _drawningAircraftCarrierHeight; - } - } - - public bool MoveTransport(DirectionType direction) - { - if (EntityAircraftCarrier == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - // Влево - case DirectionType.Left: - if (_startPosX.Value - EntityAircraftCarrier.Step > 0) - { - _startPosX -= (int)EntityAircraftCarrier.Step; - } - return true; - // Вверх - case DirectionType.Up: - if (_startPosY.Value - EntityAircraftCarrier.Step > 0) - { - _startPosY -= (int)EntityAircraftCarrier.Step; - } - return true; - // Вправо - case DirectionType.Right: - //TODO прописать логику сдвига в право - if (_startPosX.Value + _drawningAircraftCarrierWidth + EntityAircraftCarrier.Step < _pictureWidth.Value) - { - _startPosX += (int)EntityAircraftCarrier.Step; - } - return true; - // Вниз - case DirectionType.Down: - //TODO прописать логику сдвига в вниз - if (_startPosY.Value + _drawningAircraftCarrierHeight + EntityAircraftCarrier.Step < _pictureHeight.Value) - { - _startPosY += (int)EntityAircraftCarrier.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityAircraftCarrier == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityAircraftCarrier.AdditionalColor); - Pen additionalPen = new(EntityAircraftCarrier.AdditionalColor, 2); - - // Границы авианосца - g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value, 100, 50); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 5, 5, 15); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 30, 5, 15); - - Point[] points = - { - new Point(_startPosX.Value + 105, _startPosY.Value), - new Point(_startPosX.Value + 120, _startPosY.Value + 15), - new Point(_startPosX.Value + 140, _startPosY.Value + 20), - new Point(_startPosX.Value + 140, _startPosY.Value + 30), - new Point(_startPosX.Value + 120, _startPosY.Value + 35), - new Point(_startPosX.Value + 105, _startPosY.Value + 50), - - }; - g.DrawPolygon(pen, points); - - // Палуба - Brush br = new SolidBrush(EntityAircraftCarrier.BodyColor); - Brush brBlack = new SolidBrush(Color.Black); - g.FillRectangle(br, _startPosX.Value + 6, _startPosY.Value + 1, 100, 49); - g.FillPolygon(br, points); - g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 5, 5, 15); - g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 30, 5, 15); - - // Палуба для взлёта самолётов - if (EntityAircraftCarrier.DeckForAircraftTakeOff) - { - Pen penYellow = new(Color.Yellow); - - Point[] addPoints = - { - new Point(_startPosX.Value + 5, _startPosY.Value + 10), - new Point(_startPosX.Value + 105, _startPosY.Value), - new Point(_startPosX.Value + 120, _startPosY.Value + 15), - new Point(_startPosX.Value + 5, _startPosY.Value + 30), - - }; - g.DrawPolygon(pen, addPoints); - g.FillPolygon(additionalBrush, addPoints); - // Разметка - g.DrawLine(penYellow, _startPosX.Value + 10, _startPosY.Value + 20, _startPosX.Value + 105, _startPosY.Value + 8); - } - - // Рубка - if (EntityAircraftCarrier.ControlCabin) - { - g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 35, 30, 10); - g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 35, 30, 10); - } - - // Истребитель - if (EntityAircraftCarrier.FighterJet) - { - g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 27, _startPosX.Value + 95, _startPosY.Value + 47); - g.DrawLine(additionalPen, _startPosX.Value + 85, _startPosY.Value + 42, _startPosX.Value + 95, _startPosY.Value + 32); - g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 32, _startPosX.Value + 105, _startPosY.Value + 42); - g.DrawLine(additionalPen, _startPosX.Value + 90, _startPosY.Value + 46, _startPosX.Value + 95, _startPosY.Value + 41); - g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 41, _startPosX.Value + 100, _startPosY.Value + 46); - } - } -} \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DirectionType.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DirectionType.cs new file mode 100644 index 0000000..8378f93 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DirectionType.cs @@ -0,0 +1,32 @@ +namespace ProjectAircraftCarrier_.Drawnings; + +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Неизвестное направление + /// + Unknow = -1, + + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs new file mode 100644 index 0000000..35de8bf --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs @@ -0,0 +1,74 @@ +using ProjectAircraftCarrier_.Entities; + +namespace ProjectAircraftCarrier_.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningAircraftCarrier : DrawningWarship +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Палуба для взлета самолетов + /// Рубка управления + /// Истребитель + public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50) + { + EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, deckForAircraftTakeOff, controlCabin, fighterJet); + } + + public override void DrawTransport(Graphics g) + { + if (EntityWarship == null || EntityWarship is not EntityAircraftCarrier aircraftCarrier || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(aircraftCarrier.AdditionalColor); + Pen additionalPen = new(aircraftCarrier.AdditionalColor, 2); + + base.DrawTransport(g); + + // Палуба для взлёта самолётов + if (aircraftCarrier.DeckForAircraftTakeOff) + { + Pen penYellow = new(Color.Yellow); + + Point[] addPoints = + { + new Point(_startPosX.Value + 5, _startPosY.Value + 10), + new Point(_startPosX.Value + 105, _startPosY.Value), + new Point(_startPosX.Value + 120, _startPosY.Value + 15), + new Point(_startPosX.Value + 5, _startPosY.Value + 30), + + }; + g.DrawPolygon(pen, addPoints); + g.FillPolygon(additionalBrush, addPoints); + // Разметка + g.DrawLine(penYellow, _startPosX.Value + 10, _startPosY.Value + 20, _startPosX.Value + 105, _startPosY.Value + 8); + } + + // Рубка + if (aircraftCarrier.ControlCabin) + { + g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 35, 30, 10); + g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 35, 30, 10); + } + + // Истребитель + if (aircraftCarrier.FighterJet) + { + g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 27, _startPosX.Value + 95, _startPosY.Value + 47); + g.DrawLine(additionalPen, _startPosX.Value + 85, _startPosY.Value + 42, _startPosX.Value + 95, _startPosY.Value + 32); + g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 32, _startPosX.Value + 105, _startPosY.Value + 42); + g.DrawLine(additionalPen, _startPosX.Value + 90, _startPosY.Value + 46, _startPosX.Value + 95, _startPosY.Value + 41); + g.DrawLine(additionalPen, _startPosX.Value + 95, _startPosY.Value + 41, _startPosX.Value + 100, _startPosY.Value + 46); + } + } +} \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs new file mode 100644 index 0000000..aa2209c --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs @@ -0,0 +1,248 @@ +using ProjectAircraftCarrier_.Entities; + +namespace ProjectAircraftCarrier_.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности +/// +public class DrawningWarship +{ + /// + /// Класс-сущность + /// + public EntityWarship? EntityWarship { get; protected set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки военного корабля + /// + protected int? _startPosX; + + /// + /// Верхняя координата прорисовки военного корабля + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки военного корабля + /// + private readonly int _drawningWarshipWidth = 140; + + /// + /// Высота прорисовки военного корабля + /// + private readonly int _drawningWarshipHeight = 50; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningWarshipWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningWarshipHeight; + + /// + /// Пустой конструктор + /// + private DrawningWarship() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningWarship(int speed, double weight, Color bodyColor) : this() + { + EntityWarship = new EntityWarship(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки военного корабля + /// Высота прорисовки военного корабля + protected DrawningWarship(int drawningCarrierWidth, int drawningCarrierHeight) : this() + { + _drawningWarshipWidth = drawningCarrierWidth; + _drawningWarshipHeight = drawningCarrierHeight; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + if (_drawningWarshipWidth <= width && _drawningWarshipHeight <= height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX.HasValue && _startPosY.HasValue) + { + if (_startPosX + _drawningWarshipWidth > width) + { + _startPosX = width - _drawningWarshipWidth; + } + + if (_startPosY + _drawningWarshipHeight > height) + { + _startPosY = height - _drawningWarshipHeight; + } + } + return true; + } + return false; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + _startPosX = x; + _startPosY = y; + if (x < 0) + { + _startPosX = 0; + } + + if (y < 0) + { + _startPosY = 0; + } + + if (x + _drawningWarshipWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningWarshipWidth; + } + + if (y + _drawningWarshipHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningWarshipHeight; + } + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещене выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + // Влево + case DirectionType.Left: + if (_startPosX.Value - EntityWarship.Step > 0) + { + _startPosX -= (int)EntityWarship.Step; + } + return true; + // Вверх + case DirectionType.Up: + if (_startPosY.Value - EntityWarship.Step > 0) + { + _startPosY -= (int)EntityWarship.Step; + } + return true; + // Вправо + case DirectionType.Right: + if (_startPosX.Value + _drawningWarshipWidth + EntityWarship.Step < _pictureWidth.Value) + { + _startPosX += (int)EntityWarship.Step; + } + return true; + // Вниз + case DirectionType.Down: + if (_startPosY.Value + _drawningWarshipHeight + EntityWarship.Step < _pictureHeight.Value) + { + _startPosY += (int)EntityWarship.Step; + } + return true; + default: + return false; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + + // Границы перевозчика + g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value, 100, 50); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 5, 5, 15); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 30, 5, 15); + + Point[] points = + { + new Point(_startPosX.Value + 105, _startPosY.Value), + new Point(_startPosX.Value + 120, _startPosY.Value + 15), + new Point(_startPosX.Value + 140, _startPosY.Value + 20), + new Point(_startPosX.Value + 140, _startPosY.Value + 30), + new Point(_startPosX.Value + 120, _startPosY.Value + 35), + new Point(_startPosX.Value + 105, _startPosY.Value + 50), + + }; + g.DrawPolygon(pen, points); + + // Палуба + Brush br = new SolidBrush(EntityWarship.BodyColor); + Brush brBlack = new SolidBrush(Color.Black); + g.FillRectangle(br, _startPosX.Value + 6, _startPosY.Value + 1, 100, 49); + g.FillPolygon(br, points); + g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 5, 5, 15); + g.FillRectangle(brBlack, _startPosX.Value, _startPosY.Value + 30, 5, 15); + } + +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/EntityAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs similarity index 63% rename from ProjectAircraftCarrier_/ProjectAircraftCarrier_/EntityAircraftCarrier.cs rename to ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs index d4e84bf..77ed170 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/EntityAircraftCarrier.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs @@ -1,25 +1,10 @@ -namespace ProjectAircraftCarrier; +namespace ProjectAircraftCarrier_.Entities; /// /// Класс-сущность "Авианосец" /// -public class EntityAircraftCarrier +public class EntityAircraftCarrier : EntityWarship { - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - /// /// Дополнительный цвет (для опциональных элементов) /// @@ -40,11 +25,6 @@ public class EntityAircraftCarrier /// public bool FighterJet { get; private set; } - /// - /// Шаг перемещения авианосца - /// - public double Step => Speed * 100 / Weight; - /// /// Инициализация полей объекта-класса авианосца /// @@ -52,14 +32,11 @@ public class EntityAircraftCarrier /// Вес /// Основной цвет /// Дополнительный цвет - /// Признак наличия рубки управления + /// Палуба для взлета самолетов /// Признак наличия рубки управления /// Признак наличия истребителя - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) + public EntityAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; DeckForAircraftTakeOff = deckForAircraftTakeOff; ControlCabin = controlCabin; diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs new file mode 100644 index 0000000..461a100 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs @@ -0,0 +1,41 @@ +namespace ProjectAircraftCarrier_.Entities; + +/// +/// Класс-сущность "Военный корабль" +/// +public class EntityWarship +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Шаг перемещения военного корабля + /// + public double Step => Speed * 100 / Weight; + + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес + /// Основной цвет + public EntityWarship(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } + +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.Designer.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.Designer.cs index 910ee0a..33746be 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.Designer.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.Designer.cs @@ -34,6 +34,9 @@ buttonDown = new Button(); buttonRight = new Button(); buttonUp = new Button(); + buttonCreateWarship = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxAircraftCarrier).BeginInit(); SuspendLayout(); // @@ -51,9 +54,9 @@ buttonCreateAircraftCarrier.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateAircraftCarrier.Location = new Point(12, 601); buttonCreateAircraftCarrier.Name = "buttonCreateAircraftCarrier"; - buttonCreateAircraftCarrier.Size = new Size(131, 40); + buttonCreateAircraftCarrier.Size = new Size(207, 40); buttonCreateAircraftCarrier.TabIndex = 1; - buttonCreateAircraftCarrier.Text = "Создать"; + buttonCreateAircraftCarrier.Text = "Создать авианосец"; buttonCreateAircraftCarrier.UseVisualStyleBackColor = true; buttonCreateAircraftCarrier.Click += ButtonCreateAircraftCarrier_Click; // @@ -105,11 +108,45 @@ buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // buttonCreateWarship + // + buttonCreateWarship.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateWarship.Location = new Point(244, 601); + buttonCreateWarship.Name = "buttonCreateWarship"; + buttonCreateWarship.Size = new Size(273, 40); + buttonCreateWarship.TabIndex = 7; + buttonCreateWarship.Text = "Создать военный корабль"; + buttonCreateWarship.UseVisualStyleBackColor = true; + buttonCreateWarship.Click += ButtonCreateWarship_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(943, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(212, 38); + comboBoxStrategy.TabIndex = 8; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(1024, 56); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(131, 40); + buttonStrategyStep.TabIndex = 9; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormAircraftCarrier // AutoScaleDimensions = new SizeF(12F, 30F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1167, 653); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonCreateWarship); Controls.Add(buttonUp); Controls.Add(buttonRight); Controls.Add(buttonDown); @@ -130,5 +167,8 @@ private Button buttonDown; private Button buttonRight; private Button buttonUp; + private Button buttonCreateWarship; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.cs index df50c97..6b92af0 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormAircraftCarrier.cs @@ -1,97 +1,169 @@ -using ProjectAircraftCarrier; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using ProjectAircraftCarrier_.Drawnings; +using ProjectAircraftCarrier_.MovementStrategy; -namespace ProjectAircraftCarrier_ +namespace ProjectAircraftCarrier_; + +/// +/// Форма работы с объектом "Авианосец" +/// +public partial class FormAircraftCarrier : Form { - public partial class FormAircraftCarrier : Form + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningWarship? _drawningWarship; + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + + /// + /// Конструктор формы + /// + public FormAircraftCarrier() { - /// - /// Поле-объект для прорисовки объекта - /// - private DrawningAircraftCarrier? _drawningAircraftCarrier; - public FormAircraftCarrier() + InitializeComponent(); + _strategy = null; + } + + /// + /// Метод прорисовки машины + /// + private void Draw() + { + if (_drawningWarship == null) { - InitializeComponent(); + return; } - /// - /// Метод прорисовки машины - /// - private void Draw() + Bitmap bmp = new(pictureBoxAircraftCarrier.Width, pictureBoxAircraftCarrier.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningWarship.DrawTransport(gr); + pictureBoxAircraftCarrier.Image = bmp; + } + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + Random random = new(); + switch (type) { - if (_drawningAircraftCarrier == null) - { + case nameof(DrawningWarship): + _drawningWarship = new DrawningWarship(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(DrawningAircraftCarrier): + _drawningWarship = new DrawningAircraftCarrier(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)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: return; - } - - Bitmap bmp = new(pictureBoxAircraftCarrier.Width, pictureBoxAircraftCarrier.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningAircraftCarrier.DrawTransport(gr); - pictureBoxAircraftCarrier.Image = bmp; - } - /// - /// Обработка нажатия кнопки создать - /// - /// - /// - private void ButtonCreateAircraftCarrier_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningAircraftCarrier = new DrawningAircraftCarrier(); - _drawningAircraftCarrier.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)), Convert.ToBoolean(random.Next(0, 2))); - _drawningAircraftCarrier.SetPictureSize(pictureBoxAircraftCarrier.Width, pictureBoxAircraftCarrier.Height); - _drawningAircraftCarrier.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _drawningWarship.SetPictureSize(pictureBoxAircraftCarrier.Width, pictureBoxAircraftCarrier.Height); + _drawningWarship.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; + Draw(); + } + /// + /// Обработка нажатия кнопки "Создать авианосец" + /// + /// + /// + private void ButtonCreateAircraftCarrier_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAircraftCarrier)); + + /// + /// Обработка нажатия кнопки "Создать военный корабль" + /// + /// + /// + private void ButtonCreateWarship_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningWarship)); + + + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningWarship == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningWarship.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningWarship.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningWarship.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningWarship.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { Draw(); } + } - /// - /// Перемещение объекта по форме (нажатие кнопок навигации) - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) + /// + /// + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningWarship == null) { - if (_drawningAircraftCarrier == null) + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) { return; } + _strategy.SetData(new MoveableWarship(_drawningWarship), pictureBoxAircraftCarrier.Width, pictureBoxAircraftCarrier.Height); + } - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningAircraftCarrier.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningAircraftCarrier.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningAircraftCarrier.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningAircraftCarrier.MoveTransport(DirectionType.Right); - break; - } + if (_strategy == null) + { + return; + } - if (result) - { - Draw(); - } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; } } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/AbstractStrategy.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..fb95395 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,135 @@ +namespace ProjectAircraftCarrier_.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 (IsTargetDestinaion()) + { + _state = StrategyStatus.Finish; + return; + } + MoveToTarget(); + } + + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveLeft() => MoveTo(MovementDirection.Left); + + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveRight() => MoveTo(MovementDirection.Right); + + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveUp() => MoveTo(MovementDirection.Up); + + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + 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 IsTargetDestinaion(); + + /// + /// Попытка перемещения в требуемом направлении + /// + /// Направление + /// Результат попытки (true - удалось переместиться, false - неудача) + private bool MoveTo(MovementDirection movementDirection) + { + if (_state != StrategyStatus.InProgress) + { + return false; + } + return _moveableObject?.TryMoveObject(movementDirection) ?? false; + } +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/IMoveableObject.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..f4abc81 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,24 @@ +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Интерфейс для работы с перемещаемым объектом +/// +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToBorder.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..74c4a6a --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,55 @@ +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Стратегия перемещения объекта к краю +/// +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.RightBoarder - GetStep() <= FieldWidth + && objParams.RightBoarder + GetStep() >= FieldWidth && + objParams.DownBoarder - GetStep() <= FieldHeight + && objParams.DownBoarder + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + + int diffX = objParams.RightBoarder - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + + int diffY = objParams.DownBoarder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToCenter.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..9e00036 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,53 @@ +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Стратегия перемещения объекта в центр экрана +/// +public class MoveToCenter : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + 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/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveableWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveableWarship.cs new file mode 100644 index 0000000..079790f --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MoveableWarship.cs @@ -0,0 +1,61 @@ +using ProjectAircraftCarrier_.Drawnings; + +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Класс-реализация IMoveableObject с использованием DrawningWarship +/// +public class MoveableWarship : IMoveableObject +{ + private readonly DrawningWarship? _warship = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningWarship + public MoveableWarship(DrawningWarship warship) + { + _warship = warship; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_warship == null || _warship.EntityWarship == null || !_warship.GetPosX.HasValue || !_warship.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_warship.GetPosX.Value, _warship.GetPosY.Value, _warship.GetWidth, _warship.GetHeight); + } + } + + public int GetStep => (int)(_warship?.EntityWarship?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_warship == null || _warship.EntityWarship == null) + { + return false; + } + return _warship.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/ProjectAircraftCarrier_/ProjectAircraftCarrier_/DirectionType.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MovementDirection.cs similarity index 80% rename from ProjectAircraftCarrier_/ProjectAircraftCarrier_/DirectionType.cs rename to ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MovementDirection.cs index 387517b..cefd0b0 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/DirectionType.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/MovementDirection.cs @@ -1,9 +1,9 @@ -namespace ProjectAircraftCarrier; +namespace ProjectAircraftCarrier_.MovementStrategy; /// /// Направление перемещения /// -public enum DirectionType +public enum MovementDirection { /// /// Вверх @@ -24,4 +24,5 @@ public enum DirectionType /// Вправо /// Right = 4 -} \ No newline at end of file + +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/ObjectParameters.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..02e0fb2 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,72 @@ +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Параметры координаты объекта +/// +public class ObjectParameters +{ + /// + /// Координата X + /// + private readonly int _x; + + /// + /// Координата Y + /// + private readonly int _y; + + /// + /// Ширина объекта + /// + private readonly int _width; + + /// + /// Высота объекта + /// + private readonly int _height; + + /// + /// Левая граница + /// + public int LeftBoarder => _x; + + /// + /// Верхняя граница + /// + public int TopBoarder => _y; + + /// + /// Правая граница + /// + public int RightBoarder => _x + _width; + + /// + /// Нижняя граница + /// + public int DownBoarder => _y + _height; + + /// + /// Середина объекта + /// + public int ObjectMiddleHorizontal => _x + _width / 2; + + /// + /// Середина объекта + /// + public int ObjectMiddleVertical => _y + _height / 2; + + /// + /// Конструктор + /// + /// Координата X + /// Координата Y + /// Ширина объекта + /// Высота объекта + public ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/StrategyStatus.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..13cccf8 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,22 @@ +namespace ProjectAircraftCarrier_.MovementStrategy; + +/// +/// Статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// Всё готово к началу + /// + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +}