From f78bc58e130238017c45524753d922df07f53bd8 Mon Sep 17 00:00:00 2001 From: SAliulov <146759803+SAliulov@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:52:00 +0300 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 --- .../{ => Drawnings}/DirectionType.cs | 2 +- .../Drawnings/DrawningAirBomber.cs | 75 ++++++++ .../DrawningBomber.cs} | 165 +++++++++--------- .../{ => Entities}/EntityAirBomber.cs | 23 +-- .../ProjectAirBomber/Entities/EntityBomber.cs | 40 +++++ .../FormAirBomber.Designer.cs | 18 +- .../ProjectAirBomber/FormAirBomber.cs | 74 +++++--- 7 files changed, 267 insertions(+), 130 deletions(-) rename ProjectAirBomber/ProjectAirBomber/{ => Drawnings}/DirectionType.cs (90%) create mode 100644 ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs rename ProjectAirBomber/ProjectAirBomber/{DrawningAirBomber.cs => Drawnings/DrawningBomber.cs} (53%) rename ProjectAirBomber/ProjectAirBomber/{ => Entities}/EntityAirBomber.cs (78%) create mode 100644 ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs diff --git a/ProjectAirBomber/ProjectAirBomber/DirectionType.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs similarity index 90% rename from ProjectAirBomber/ProjectAirBomber/DirectionType.cs rename to ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs index bd234d3..83700a7 100644 --- a/ProjectAirBomber/ProjectAirBomber/DirectionType.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ProjectAirBomber; +namespace ProjectAirBomber.Drawnings; /// /// Направление перемещения diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs new file mode 100644 index 0000000..f9fc76c --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs @@ -0,0 +1,75 @@ +using ProjectAirBomber.Entities; + +namespace ProjectAirBomber.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningAirBomber : DrawningBomber +{ + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия дополнительных топливных баков + /// Признак наличия бомб + + + + + //TO DO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + public DrawningAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs, bool v) : base(200, 160) + { + EntityBomber = new EntityAirBomber(speed, weight, bodyColor, additionalColor, fuelTanks, bombs); + } + + + + public override void DrawTransport(Graphics g) + { + if (EntityBomber == null || EntityBomber is not EntityAirBomber airBomber || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(airBomber.AdditionalColor); + + // топливные баки + if (airBomber.FuelTanks) + { + g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 20, 20, 20); + g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 110, 20, 20); + } + + // бомбы + if (airBomber.Bombs) + { + g.FillPolygon(additionalBrush, new Point[] + { + new Point(_startPosX.Value + 110, _startPosY.Value + 42), + new Point(_startPosX.Value + 110, _startPosY.Value + 60), + new Point(_startPosX.Value + 80, _startPosY.Value + 50) + }); + + g.FillPolygon(additionalBrush, new Point[] + { + new Point(_startPosX.Value + 110, _startPosY.Value + 90), + new Point(_startPosX.Value + 110, _startPosY.Value + 108), + new Point(_startPosX.Value + 80, _startPosY.Value + 100) + }); + } + + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + + + } +} \ No newline at end of file diff --git a/ProjectAirBomber/ProjectAirBomber/DrawningAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs similarity index 53% rename from ProjectAirBomber/ProjectAirBomber/DrawningAirBomber.cs rename to ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs index 2aaf914..b7ea6ce 100644 --- a/ProjectAirBomber/ProjectAirBomber/DrawningAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs @@ -1,14 +1,18 @@ -namespace ProjectAirBomber; +using ProjectAirBomber.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningAirBomber +namespace ProjectAirBomber.Drawnings; + +public class DrawningBomber { /// /// Класс-сущность /// - public EntityAirBomber? EntityAirBomber { get; private set; } + public EntityBomber? EntityBomber { get; protected set; } /// /// Ширина окна @@ -23,43 +27,60 @@ public class DrawningAirBomber /// /// Левая координата прорисовки бомбардировщика /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки бомбардировщика /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки бомбардировщика /// - private readonly int _drawningAirBomberWidth = 200; + private readonly int _drawningAirBomberWidth = 190; /// /// Высота прорисовки бомбардировщика /// private readonly int _drawningAirBomberHeight = 160; - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия дополнительных топливных баков - /// Признак наличия бомб - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) + + /// + /// Пустой конструктор + /// + public DrawningBomber() { - EntityAirBomber = new EntityAirBomber(); - EntityAirBomber.Init(speed, weight, bodyColor, additionalColor, fuelTanks, bombs); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + + public DrawningBomber(int speed, double weight, Color bodyColor) : this() + { + EntityBomber = new EntityBomber(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки бомбардировщика + /// Высота прорисовки бомбардировщика + + protected DrawningBomber(int drawningAirBomberWidth, int drawningAirBomberHeight) : this() + { + _drawningAirBomberWidth = drawningAirBomberWidth; + _drawningAirBomberHeight = drawningAirBomberHeight; + } + /// /// Установка границ поля /// @@ -124,7 +145,7 @@ public class DrawningAirBomber /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityAirBomber == null || !_startPosX.HasValue || + if (EntityBomber == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; @@ -137,30 +158,30 @@ public class DrawningAirBomber { //влево case DirectionType.Left: - if (_startPosX.Value - EntityAirBomber.Step > 0) + if (_startPosX.Value - EntityBomber.Step > 0) { - _startPosX -= (int)EntityAirBomber.Step; + _startPosX -= (int)EntityBomber.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityAirBomber.Step > 0) + if (_startPosY.Value - EntityBomber.Step > 0) { - _startPosY -= (int)EntityAirBomber.Step; + _startPosY -= (int)EntityBomber.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityAirBomber.Step < _pictureWidth - _drawningAirBomberWidth) + if (_startPosX.Value + EntityBomber.Step < _pictureWidth - _drawningAirBomberWidth) { - _startPosX += (int)EntityAirBomber.Step; + _startPosX += (int)EntityBomber.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityAirBomber.Step < _pictureHeight - _drawningAirBomberHeight) + if (_startPosY.Value + EntityBomber.Step < _pictureHeight - _drawningAirBomberHeight) { - _startPosY += (int)EntityAirBomber.Step; + _startPosY += (int)EntityBomber.Step; } return true; default: @@ -172,98 +193,68 @@ public class DrawningAirBomber /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityAirBomber == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityBomber == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityAirBomber.AdditionalColor); - - // Топливные баки - if (EntityAirBomber.FuelTanks) - { - g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 20, 20, 20); - g.FillRectangle(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 110, 20, 20); - - } + Brush brBlack = new SolidBrush(Color.Black); //границы бомбардировщика - g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 60, 150, 30); - - //бомбы - if (EntityAirBomber.Bombs) - { - g.FillPolygon(additionalBrush, new Point[] - { - new Point(_startPosX.Value + 110, _startPosY.Value + 42), - new Point(_startPosX.Value + 110, _startPosY.Value + 60), - new Point(_startPosX.Value + 80, _startPosY.Value + 50) - }); - - g.FillPolygon(additionalBrush, new Point[] - { - new Point(_startPosX.Value + 110, _startPosY.Value + 90), - new Point(_startPosX.Value + 110, _startPosY.Value + 108), - new Point(_startPosX.Value + 80, _startPosY.Value + 100) - }); - } + g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 55, 150, 30); //Крылья Brush brGray = new SolidBrush(Color.Gray); - g.FillRectangle(brGray, _startPosX.Value + 105, _startPosY.Value, 20, 160); + g.FillRectangle(brGray, _startPosX.Value + 95, _startPosY.Value, 15, 160); //правое крыло g.FillPolygon(brGray, new Point[] { - new Point(_startPosX.Value + 105, _startPosY.Value), - new Point(_startPosX.Value + 125, _startPosY.Value + 10), - new Point(_startPosX.Value + 135, _startPosY.Value + 90) + new Point(_startPosX.Value + 95, _startPosY.Value), + new Point(_startPosX.Value + 115, _startPosY.Value + 5), + new Point(_startPosX.Value + 125, _startPosY.Value + 85) }); ////левое крыло g.FillPolygon(brGray, new Point[] { - new Point(_startPosX.Value + 105, _startPosY.Value + 90), - new Point(_startPosX.Value + 125, _startPosY.Value + 140), - new Point(_startPosX.Value + 131, _startPosY.Value + 90) + new Point(_startPosX.Value + 95, _startPosY.Value + 85), + new Point(_startPosX.Value + 115, _startPosY.Value + 135), + new Point(_startPosX.Value + 121, _startPosY.Value + 85) }); //задние крылья - g.FillRectangle(additionalBrush, _startPosX.Value + 170, _startPosY.Value + 45, 30, 60); + g.FillRectangle(brGray, _startPosX.Value + 160, _startPosY.Value + 40, 30, 60); - g.FillPolygon(additionalBrush, new Point[] + g.FillPolygon(brGray, new Point[] { - new Point(_startPosX.Value + 170, _startPosY.Value + 45), - new Point(_startPosX.Value + 200, _startPosY.Value + 60), - new Point(_startPosX.Value + 200, _startPosY.Value + 10) + new Point(_startPosX.Value + 160, _startPosY.Value + 40), + new Point(_startPosX.Value + 190, _startPosY.Value + 55), + new Point(_startPosX.Value + 190, _startPosY.Value + 5) }); - g.FillPolygon(additionalBrush, new Point[] + g.FillPolygon(brGray, new Point[] { - new Point(_startPosX.Value + 170, _startPosY.Value + 105), - new Point(_startPosX.Value + 200, _startPosY.Value + 105), - new Point(_startPosX.Value + 200, _startPosY.Value + 145) + new Point(_startPosX.Value + 160, _startPosY.Value + 100), + new Point(_startPosX.Value + 190, _startPosY.Value + 100), + new Point(_startPosX.Value + 190, _startPosY.Value + 140) }); - //фюзеляж - Brush br = new SolidBrush(EntityAirBomber.BodyColor); - g.FillRectangle(br, _startPosX.Value + 50, _startPosY.Value + 60, 150, 30); + Brush br = new SolidBrush(EntityBomber.BodyColor); + g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 55, 150, 30); //передняя часть (треугольник) - g.FillPolygon(additionalBrush, new Point[] + g.FillPolygon(brBlack, new Point[] { - new Point(_startPosX.Value + 50, _startPosY.Value + 60), - new Point(_startPosX.Value + 50, _startPosY.Value + 90), - new Point(_startPosX.Value, _startPosY.Value + 75) + new Point(_startPosX.Value + 40, _startPosY.Value + 55), + new Point(_startPosX.Value + 40, _startPosY.Value + 85), + new Point(_startPosX.Value, _startPosY.Value + 65) }); - - - } -} \ No newline at end of file +} diff --git a/ProjectAirBomber/ProjectAirBomber/EntityAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs similarity index 78% rename from ProjectAirBomber/ProjectAirBomber/EntityAirBomber.cs rename to ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs index 8a832f5..be5688d 100644 --- a/ProjectAirBomber/ProjectAirBomber/EntityAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs @@ -1,24 +1,14 @@ -namespace ProjectAirBomber; +namespace ProjectAirBomber.Entities; /// /// Класс-сущность "Бомбардировщик" /// -public class EntityAirBomber +public class EntityAirBomber : EntityBomber { - /// - /// Скорость - /// - public int Speed { get; private set; } + public EntityAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) : base(speed, weight, bodyColor) + { + } - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) @@ -53,9 +43,6 @@ public class EntityAirBomber /// Признак наличия бомб public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; FuelTanks = fuelTanks; Bombs = bombs; diff --git a/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs b/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs new file mode 100644 index 0000000..7d24cca --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/Entities/EntityBomber.cs @@ -0,0 +1,40 @@ +namespace ProjectAirBomber.Entities; +/// +/// Класс-сущность "Бомбардировщик" +/// +public class EntityBomber +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Шаг перемещения бомбардировщика + /// + public double Step => Speed * 200 / Weight; + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес бомбардировщика + /// Основной цвет + /// + /// TO DO?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + public EntityBomber(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs index 0b2736f..014ef18 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs @@ -34,6 +34,7 @@ buttonDown = new Button(); buttonRight = new Button(); buttonUp = new Button(); + buttonCreateBomber = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxAirBomber).BeginInit(); SuspendLayout(); // @@ -51,9 +52,9 @@ buttonCreateAirBomber.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateAirBomber.Location = new Point(12, 475); buttonCreateAirBomber.Name = "buttonCreateAirBomber"; - buttonCreateAirBomber.Size = new Size(75, 23); + buttonCreateAirBomber.Size = new Size(233, 23); buttonCreateAirBomber.TabIndex = 1; - buttonCreateAirBomber.Text = "Создать"; + buttonCreateAirBomber.Text = "Создать военный самолёт"; buttonCreateAirBomber.UseVisualStyleBackColor = true; buttonCreateAirBomber.Click += ButtonCreateAirBomber_Click; // @@ -105,11 +106,23 @@ buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // buttonCreateBomber + // + buttonCreateBomber.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateBomber.Location = new Point(261, 475); + buttonCreateBomber.Name = "buttonCreateBomber"; + buttonCreateBomber.Size = new Size(233, 23); + buttonCreateBomber.TabIndex = 6; + buttonCreateBomber.Text = "Создать самолёт"; + buttonCreateBomber.UseVisualStyleBackColor = true; + buttonCreateBomber.Click += buttonCreateBomber_Click; + // // FormAirBomber // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(880, 510); + Controls.Add(buttonCreateBomber); Controls.Add(buttonUp); Controls.Add(buttonRight); Controls.Add(buttonDown); @@ -130,5 +143,6 @@ private Button buttonDown; private Button buttonRight; private Button buttonUp; + private Button buttonCreateBomber; } } \ No newline at end of file diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs index b537378..4bc61dd 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs @@ -1,4 +1,6 @@ -namespace ProjectAirBomber; +using ProjectAirBomber.Drawnings; + +namespace ProjectAirBomber; /// /// Форма работы с объектом "Бомбардировщик" @@ -8,7 +10,7 @@ public partial class FormAirBomber : Form /// /// Поле-объект для прорисовки объекта /// - private DrawningAirBomber? _drawningAirBomber; + private DrawningBomber? _drawningBomber; /// /// Конструктор формы @@ -22,34 +24,58 @@ public partial class FormAirBomber : Form /// private void Draw() { - if (_drawningAirBomber == null) + if (_drawningBomber == null) { return; } Bitmap bmp = new(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningAirBomber.DrawTransport(gr); + _drawningBomber.DrawTransport(gr); pictureBoxAirBomber.Image = bmp; } + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningBomber): + _drawningBomber = new DrawningBomber(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(DrawningAirBomber): + _drawningBomber = new DrawningAirBomber(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; + } + + _drawningBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); + _drawningBomber.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + + Draw(); + } + + /// - /// Обработка нажатия кнопки "Создать" + /// Обработка нажатия кнопки "Создать военный самолёт" /// /// /// - private void ButtonCreateAirBomber_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningAirBomber = new DrawningAirBomber(); - _drawningAirBomber.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))); - _drawningAirBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); - _drawningAirBomber.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); - } + private void ButtonCreateAirBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirBomber)); + + /// + /// Обработка нажатия кнопки "Создать самолёт" + /// + /// + /// + + private void buttonCreateBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBomber)); /// /// Перемещение объекта по форме (нажатие кнопок навигации) @@ -58,7 +84,7 @@ public partial class FormAirBomber : Form /// private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningAirBomber == null) + if (_drawningBomber == null) { return; } @@ -68,16 +94,16 @@ public partial class FormAirBomber : Form switch (name) { case "buttonUp": - result = _drawningAirBomber.MoveTransport(DirectionType.Up); + result = _drawningBomber.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningAirBomber.MoveTransport(DirectionType.Down); + result = _drawningBomber.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningAirBomber.MoveTransport(DirectionType.Left); + result = _drawningBomber.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningAirBomber.MoveTransport(DirectionType.Right); + result = _drawningBomber.MoveTransport(DirectionType.Right); break; } @@ -86,4 +112,8 @@ public partial class FormAirBomber : Form Draw(); } } + + + + } \ No newline at end of file -- 2.25.1 From fc86d0a67c1f72eddaff9e55a04030e01b92945b Mon Sep 17 00:00:00 2001 From: LivelyPuer Date: Thu, 11 Apr 2024 13:28:54 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DirectionType.cs | 1 + .../Drawnings/DrawningAirBomber.cs | 2 +- .../Drawnings/DrawningBomber.cs | 29 ++++- .../Entities/EntityAirBomber.cs | 6 +- .../FormAirBomber.Designer.cs | 122 ++++++++++------- .../ProjectAirBomber/FormAirBomber.cs | 105 ++++++++++----- .../MovementStrategy/AbstractStrategy.cs | 123 ++++++++++++++++++ .../MovementStrategy/IMoveableObject.cs | 22 ++++ .../MovementStrategy/MoveToBorder.cs | 52 ++++++++ .../MovementStrategy/MoveToCenter.cs | 50 +++++++ .../MovementStrategy/MoveableTrans.cs | 60 +++++++++ .../MovementStrategy/MovementDirection.cs | 21 +++ .../MovementStrategy/ObjectParameters.cs | 60 +++++++++ .../MovementStrategy/StrategyStatus.cs | 17 +++ 14 files changed, 577 insertions(+), 93 deletions(-) create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/AbstractStrategy.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/IMoveableObject.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/MovementDirection.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/ObjectParameters.cs create mode 100644 ProjectAirBomber/ProjectAirBomber/MovementStrategy/StrategyStatus.cs diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs index 83700a7..df80ecf 100644 --- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DirectionType.cs @@ -5,6 +5,7 @@ /// public enum DirectionType { + Unknow = -1, /// /// Вверх /// diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs index f9fc76c..5d0e8c3 100644 --- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningAirBomber.cs @@ -22,7 +22,7 @@ public class DrawningAirBomber : DrawningBomber //TO DO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - public DrawningAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs, bool v) : base(200, 160) + public DrawningAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) : base(200, 160) { EntityBomber = new EntityAirBomber(speed, weight, bodyColor, additionalColor, fuelTanks, bombs); } diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs index b7ea6ce..5bc6542 100644 --- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs @@ -44,7 +44,22 @@ public class DrawningBomber /// private readonly int _drawningAirBomberHeight = 160; - + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _drawningAirBomberWidth; + /// + /// Высота объекта + /// + public int GetHeight => _drawningAirBomberHeight; /// /// Пустой конструктор @@ -189,7 +204,7 @@ public class DrawningBomber } } - /// + /// /// Прорисовка объекта /// /// @@ -214,16 +229,16 @@ public class DrawningBomber g.FillPolygon(brGray, new Point[] { new Point(_startPosX.Value + 95, _startPosY.Value), - new Point(_startPosX.Value + 115, _startPosY.Value + 5), - new Point(_startPosX.Value + 125, _startPosY.Value + 85) + new Point(_startPosX.Value + 110, _startPosY.Value + 5), + new Point(_startPosX.Value + 118, _startPosY.Value + 85) }); ////левое крыло g.FillPolygon(brGray, new Point[] { new Point(_startPosX.Value + 95, _startPosY.Value + 85), - new Point(_startPosX.Value + 115, _startPosY.Value + 135), - new Point(_startPosX.Value + 121, _startPosY.Value + 85) + new Point(_startPosX.Value + 110, _startPosY.Value + 135), + new Point(_startPosX.Value + 115, _startPosY.Value + 85) }); //задние крылья @@ -257,4 +272,4 @@ public class DrawningBomber new Point(_startPosX.Value, _startPosY.Value + 65) }); } -} +} \ No newline at end of file diff --git a/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs index be5688d..d26052c 100644 --- a/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/Entities/EntityAirBomber.cs @@ -5,9 +5,7 @@ /// public class EntityAirBomber : EntityBomber { - public EntityAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) : base(speed, weight, bodyColor) - { - } + /// @@ -41,7 +39,7 @@ public class EntityAirBomber : EntityBomber /// Дополнительный цвет /// Признак наличия дополнительных топливных баков /// Признак наличия бомб - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs) + public EntityAirBomber(int speed, double weight, Color bodyColor, Color additionalColor, bool fuelTanks, bool bombs): base(speed, weight, bodyColor) { AdditionalColor = additionalColor; FuelTanks = fuelTanks; diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs index 014ef18..815856a 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs @@ -1,11 +1,15 @@ -namespace ProjectAirBomber +using static System.Net.Mime.MediaTypeNames; +using System.Windows.Forms; +using System.Xml.Linq; + +namespace ProjectAirBomber { partial class FormAirBomber { /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; /// /// Clean up any resources being used. @@ -31,30 +35,32 @@ pictureBoxAirBomber = new PictureBox(); buttonCreateAirBomber = new Button(); buttonLeft = new Button(); + buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); - buttonUp = new Button(); - buttonCreateBomber = new Button(); + buttonCreateCar = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxAirBomber).BeginInit(); SuspendLayout(); // - // pictureBoxAirBomber + // pictureBoxElectroTrans // pictureBoxAirBomber.Dock = DockStyle.Fill; pictureBoxAirBomber.Location = new Point(0, 0); - pictureBoxAirBomber.Name = "pictureBoxAirBomber"; - pictureBoxAirBomber.Size = new Size(880, 510); + pictureBoxAirBomber.Name = "pictureBoxElectroTrans"; + pictureBoxAirBomber.Size = new Size(923, 597); pictureBoxAirBomber.TabIndex = 0; pictureBoxAirBomber.TabStop = false; // - // buttonCreateAirBomber + // buttonCreateElectroTrans // buttonCreateAirBomber.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateAirBomber.Location = new Point(12, 475); + buttonCreateAirBomber.Location = new Point(12, 562); buttonCreateAirBomber.Name = "buttonCreateAirBomber"; - buttonCreateAirBomber.Size = new Size(233, 23); + buttonCreateAirBomber.Size = new Size(223, 23); buttonCreateAirBomber.TabIndex = 1; - buttonCreateAirBomber.Text = "Создать военный самолёт"; + buttonCreateAirBomber.Text = "Создать бомбардировщик"; buttonCreateAirBomber.UseVisualStyleBackColor = true; buttonCreateAirBomber.Click += ButtonCreateAirBomber_Click; // @@ -63,22 +69,34 @@ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; - buttonLeft.Location = new Point(750, 469); + buttonLeft.Location = new Point(787, 550); buttonLeft.Name = "buttonLeft"; buttonLeft.Size = new Size(35, 35); buttonLeft.TabIndex = 2; buttonLeft.UseVisualStyleBackColor = true; buttonLeft.Click += ButtonMove_Click; // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.arrowUp; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(828, 509); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // // buttonDown // buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonDown.BackgroundImage = Properties.Resources.arrowDown; buttonDown.BackgroundImageLayout = ImageLayout.Stretch; - buttonDown.Location = new Point(786, 469); + buttonDown.Location = new Point(828, 550); buttonDown.Name = "buttonDown"; buttonDown.Size = new Size(35, 35); - buttonDown.TabIndex = 3; + buttonDown.TabIndex = 4; buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // @@ -87,50 +105,60 @@ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonRight.BackgroundImage = Properties.Resources.arrowRight; buttonRight.BackgroundImageLayout = ImageLayout.Stretch; - buttonRight.Location = new Point(822, 469); + buttonRight.Location = new Point(869, 550); buttonRight.Name = "buttonRight"; buttonRight.Size = new Size(35, 35); - buttonRight.TabIndex = 4; + buttonRight.TabIndex = 5; buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // - // buttonUp + // buttonCreateCar // - buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonUp.BackgroundImage = Properties.Resources.arrowUp; - buttonUp.BackgroundImageLayout = ImageLayout.Stretch; - buttonUp.Location = new Point(786, 433); - buttonUp.Name = "buttonUp"; - buttonUp.Size = new Size(35, 35); - buttonUp.TabIndex = 5; - buttonUp.UseVisualStyleBackColor = true; - buttonUp.Click += ButtonMove_Click; + buttonCreateCar.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateCar.Location = new Point(250, 562); + buttonCreateCar.Name = "buttonCreateTrans"; + buttonCreateCar.Size = new Size(223, 23); + buttonCreateCar.TabIndex = 6; + buttonCreateCar.Text = "Создать военный самолет"; + buttonCreateCar.UseVisualStyleBackColor = true; + buttonCreateCar.Click += ButtonCreateBomber_Click; // - // buttonCreateBomber + // comboBoxStrategy // - buttonCreateBomber.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateBomber.Location = new Point(261, 475); - buttonCreateBomber.Name = "buttonCreateBomber"; - buttonCreateBomber.Size = new Size(233, 23); - buttonCreateBomber.TabIndex = 6; - buttonCreateBomber.Text = "Создать самолёт"; - buttonCreateBomber.UseVisualStyleBackColor = true; - buttonCreateBomber.Click += buttonCreateBomber_Click; + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(790, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 7; // - // FormAirBomber + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(836, 41); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(75, 23); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // + // FormElectroTrans // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(880, 510); - Controls.Add(buttonCreateBomber); - Controls.Add(buttonUp); + ClientSize = new Size(923, 597); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonCreateCar); Controls.Add(buttonRight); Controls.Add(buttonDown); + Controls.Add(buttonUp); Controls.Add(buttonLeft); Controls.Add(buttonCreateAirBomber); Controls.Add(pictureBoxAirBomber); - Name = "FormAirBomber"; - Text = "Бомбардировщик"; + Name = "FormElectroTrans"; + Text = "Электропоезд"; ((System.ComponentModel.ISupportInitialize)pictureBoxAirBomber).EndInit(); ResumeLayout(false); } @@ -140,9 +168,11 @@ private PictureBox pictureBoxAirBomber; private Button buttonCreateAirBomber; private Button buttonLeft; + private Button buttonUp; private Button buttonDown; private Button buttonRight; - private Button buttonUp; - private Button buttonCreateBomber; + private Button buttonCreateCar; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } -} \ No newline at end of file +} diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs index 4bc61dd..bcdbd7b 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs @@ -1,90 +1,87 @@ using ProjectAirBomber.Drawnings; +using ProjectAirBomber.MovementStrategy; namespace ProjectAirBomber; -/// -/// Форма работы с объектом "Бомбардировщик" -/// public partial class FormAirBomber : Form { /// - /// Поле-объект для прорисовки объекта + /// Ïîëå-îáúåêò äëÿ ïðîðèñîâêè îáúåêòà /// - private DrawningBomber? _drawningBomber; + private DrawningBomber? _drawingBomber; /// - /// Конструктор формы + /// Ñòðàòåãèÿ ïåðåìåùåíèÿ /// + private AbstractStrategy? _strategy; + public FormAirBomber() { InitializeComponent(); + _strategy = null; } + /// - /// Метод прорисовки бомбардировщика + /// Ìåòîä ïðîðèñîâêè ìàøèíû /// private void Draw() { - if (_drawningBomber == null) + if (_drawingBomber == null) { return; } Bitmap bmp = new(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningBomber.DrawTransport(gr); + _drawingBomber.DrawTransport(gr); pictureBoxAirBomber.Image = bmp; } - private void CreateObject(string type) { Random random = new(); switch (type) { case nameof(DrawningBomber): - _drawningBomber = new DrawningBomber(random.Next(100, 300), random.Next(1000, 3000), + _drawingBomber = new DrawningBomber(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(DrawningAirBomber): - _drawningBomber = new DrawningAirBomber(random.Next(100, 300), random.Next(1000, 3000), + _drawingBomber = new DrawningAirBomber(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))); + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; default: return; } - _drawningBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); - _drawningBomber.SetPosition(random.Next(10, 100), random.Next(10, 100)); - - + _drawingBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); + _drawingBomber.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } - - /// - /// Обработка нажатия кнопки "Создать военный самолёт" + /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü ñïîðòèâíûé àâòîìîáèëü" /// /// /// private void ButtonCreateAirBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirBomber)); /// - /// Обработка нажатия кнопки "Создать самолёт" + /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü àâòîìîáèëü" /// /// /// - - private void buttonCreateBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBomber)); - + private void ButtonCreateBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBomber)); /// - /// Перемещение объекта по форме (нажатие кнопок навигации) - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) + /// Ïåðåìåùåíèå îáúåêòà ïî ôîðìå (íàæàòèå êíîïîê íàâèãàöèè) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningBomber == null) + if (_drawingBomber == null) { return; } @@ -94,16 +91,16 @@ public partial class FormAirBomber : Form switch (name) { case "buttonUp": - result = _drawningBomber.MoveTransport(DirectionType.Up); + result = _drawingBomber.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningBomber.MoveTransport(DirectionType.Down); + result = _drawingBomber.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningBomber.MoveTransport(DirectionType.Left); + result = _drawingBomber.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningBomber.MoveTransport(DirectionType.Right); + result = _drawingBomber.MoveTransport(DirectionType.Right); break; } @@ -112,8 +109,46 @@ public partial class FormAirBomber : Form Draw(); } } + /// + /// Îáðàáîòêà íàæàòèÿ êíîïêè "Øàã" + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawingBomber == null) + { + return; + } - + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableTrans(_drawingBomber), pictureBoxAirBomber.Width, pictureBoxAirBomber.Height); + } + if (_strategy == null) + { + return; + } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } } \ No newline at end of file diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/AbstractStrategy.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..937f9a0 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,123 @@ + +namespace ProjectAirBomber.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/ProjectAirBomber/ProjectAirBomber/MovementStrategy/IMoveableObject.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..1dfe070 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,22 @@ + + +namespace ProjectAirBomber.MovementStrategy; + +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно +bool TryMoveObject(MovementDirection direction); +} + diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..d3c61f8 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,52 @@ +using ProjectAirBomber.MovementStrategy; + +namespace ProjectAirBomber.MovementStrategy; + +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth + && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth && + objParams.ObjectMiddleVertical - GetStep() <= FieldHeight + && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + int diffX = objParams.ObjectMiddleHorizontal - FieldWidth - 5; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + int diffY = objParams.ObjectMiddleVertical - FieldHeight - 5; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} \ No newline at end of file diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..6966932 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,50 @@ + +namespace ProjectAirBomber.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/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs new file mode 100644 index 0000000..e3ebfd3 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MoveableTrans.cs @@ -0,0 +1,60 @@ +using ProjectAirBomber.Drawnings; + + +namespace ProjectAirBomber.MovementStrategy; +public class MoveableTrans : IMoveableObject +{ + /// + /// Поле-объект класса DrawningTrans или его наследника + /// + private readonly DrawningBomber? _bomber = null; + /// + /// Конструктор + /// + /// Объект класса DrawningTrans + public MoveableTrans(DrawningBomber bomber) + { + _bomber = bomber; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_bomber == null || _bomber.EntityBomber == null || + !_bomber.GetPosX.HasValue || !_bomber.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_bomber.GetPosX.Value, + _bomber.GetPosY.Value, _bomber.GetWidth, _bomber.GetHeight); + } + } + public int GetStep => (int)(_bomber?.EntityBomber?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_bomber == null || _bomber.EntityBomber == null) + { + return false; + } + return _bomber.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/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MovementDirection.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..e562c1c --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/MovementDirection.cs @@ -0,0 +1,21 @@ +namespace ProjectAirBomber.MovementStrategy; + +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 +} diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/ObjectParameters.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..e8af281 --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,60 @@ +namespace ProjectAirBomber.MovementStrategy; + +public class ObjectParameters +{ + /// + /// Координата X + /// + private readonly int _x; + /// + /// Координата Y + /// + 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; + /// + /// Конструктор + /// + /// Координата X + /// Координата Y + /// Ширина объекта + /// Высота объекта + public ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } + +} diff --git a/ProjectAirBomber/ProjectAirBomber/MovementStrategy/StrategyStatus.cs b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..9dc71cb --- /dev/null +++ b/ProjectAirBomber/ProjectAirBomber/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,17 @@ +namespace ProjectAirBomber.MovementStrategy; + +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + /// + /// Выполняется + /// + InProgress, + /// + /// Завершено + /// + Finish +} -- 2.25.1