diff --git a/Stormtrooper/Stormtrooper/DirectionType.cs b/Stormtrooper/Stormtrooper/DirectionType.cs
deleted file mode 100644
index cf5dd7d..0000000
--- a/Stormtrooper/Stormtrooper/DirectionType.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Stormtrooper
-{
- public enum DirectionType
- {
- Up = 1,
-
- Down = 2,
-
- Left = 3,
-
- Right = 4,
-
- }
-}
diff --git a/Stormtrooper/Stormtrooper/Drawnings/DirectionType.cs b/Stormtrooper/Stormtrooper/Drawnings/DirectionType.cs
new file mode 100644
index 0000000..7d90484
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/Drawnings/DirectionType.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.Drawnings;
+
+public enum DirectionType
+{
+ // Неизвестное направление
+ Unknow = -1,
+
+ // Вверх
+
+ Up = 1,
+
+ // Вниз
+
+ Down = 2,
+
+ // Влево
+
+ Left = 3,
+
+ // Вправо
+
+ Right = 4,
+
+}
diff --git a/Stormtrooper/Stormtrooper/DrawningStormtrooper.cs b/Stormtrooper/Stormtrooper/Drawnings/DrawningAircraft.cs
similarity index 54%
rename from Stormtrooper/Stormtrooper/DrawningStormtrooper.cs
rename to Stormtrooper/Stormtrooper/Drawnings/DrawningAircraft.cs
index 937731a..3127ca7 100644
--- a/Stormtrooper/Stormtrooper/DrawningStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/Drawnings/DrawningAircraft.cs
@@ -1,18 +1,16 @@
-using System;
+using Stormtrooper.Entities;
+using System;
using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
-using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
-using System.Windows.Forms;
-namespace Stormtrooper;
-public class DrawningStormtrooper
+namespace Stormtrooper.Drawnings;
+
+public class DrawningAircraft
{
// Класс-сущность
- public EntityStormtrooper? EntityStormtrooper { get; private set; } // объявление
+ public EntityAircraft? EntityAircraft { get; protected set; } // объявление 1
// Ширина окна
@@ -24,46 +22,70 @@ public class DrawningStormtrooper
// Левая координата прорисовки штурмовика
- public int? _startPosX;
+ protected int? _startPosX;
// Верхняя координата прорисовки автомобиля
- public int? _startPosY;
+ protected int? _startPosY;
// Ширина прорисовки штурмовика
- private readonly int _drawningStormtrooperWidth = 140;
+ private readonly int _drawningAircraftWidth = 140;
// Высота прорисовки штурмовика
- private readonly int _drawningStormtrooperHeight = 150;
+ private readonly int _drawningAircraftHeight = 135;
+ public int? GetPosX => _startPosX;
+ ///
+ /// Координата Y объекта
+ ///
+ public int? GetPosY => _startPosY;
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidth => _drawningAircraftWidth;
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _drawningAircraftHeight;
- // Инициализация свойств
-
- /// Скорость
- /// Вес
- /// Основной цвет
- /// Дополнительный цвет
- /// Признак наличия ракет
- /// Признак наличия бомбы
- /// Признак наличия крыла
- public void Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool rocket, bool bomb, bool wing)
+ // Пустой конструктор
+ private DrawningAircraft()
{
- EntityStormtrooper = new EntityStormtrooper(); // инициализация
- EntityStormtrooper.Init(speed, weight, bodyColor, additionalColor,rocket, bomb, wing);
_pictureWidth = null;
_pictureHeight = null;
_startPosX = null;
_startPosY = null;
}
- // Установка границ поля
+ // Конструктор
+
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ public DrawningAircraft(int speed, double weight, Color bodyColor) : this()
+ {
+ EntityAircraft = new EntityAircraft(speed, weight, bodyColor);
+ }
+
+ // Конструктор для наследников
+
+ /// Ширина прорисовки штурмовика
+ /// Высота прорисовки штурмовика
+ protected DrawningAircraft(int drawningAircraftWidth, int drawningAircraftHeight) : this()
+ {
+ _drawningAircraftWidth = drawningAircraftWidth;
+ _pictureHeight = drawningAircraftHeight;
+ }
+
+ /// Прорисовка объекта
+ ///
+ /// // Установка границ поля
/// Ширина поля
/// Высота поля
public bool SetPictureSize(int width, int height)
{
- if (_drawningStormtrooperHeight > height || _drawningStormtrooperWidth > width)
+ if (_drawningAircraftHeight > height || _drawningAircraftWidth > width)
{
return false;
}
@@ -89,18 +111,18 @@ public class DrawningStormtrooper
return;
}
- if (x < 0 || x + _drawningStormtrooperWidth > _pictureWidth)
+ if (x < 0 || x + _drawningAircraftWidth > _pictureWidth)
{
- _startPosX = _pictureWidth - _drawningStormtrooperWidth;
+ _startPosX = _pictureWidth - _drawningAircraftWidth;
}
else
{
_startPosX = x;
}
- if (y < 0 || y + _drawningStormtrooperHeight > _pictureHeight)
+ if (y < 0 || y + _drawningAircraftHeight > _pictureHeight)
{
- _startPosY = _pictureHeight - _drawningStormtrooperHeight;
+ _startPosY = _pictureHeight - _drawningAircraftHeight;
}
else
{
@@ -111,7 +133,7 @@ public class DrawningStormtrooper
// Изменение направления перемещения
public bool MoveTransport(DirectionType direction)
{
- if (EntityStormtrooper == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityAircraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
return false;
}
@@ -119,49 +141,46 @@ public class DrawningStormtrooper
{
//влево
case DirectionType.Left:
- if (_startPosX.Value - EntityStormtrooper.Step > 0)
+ if (_startPosX.Value - EntityAircraft.Step > 0)
{
- _startPosX -= (int)EntityStormtrooper.Step;
+ _startPosX -= (int)EntityAircraft.Step;
}
return true;
//вверх
case DirectionType.Up:
- if (_startPosY.Value - EntityStormtrooper.Step > 0)
+ if (_startPosY.Value - EntityAircraft.Step > 0)
{
- _startPosY -= (int)EntityStormtrooper.Step;
+ _startPosY -= (int)EntityAircraft.Step;
}
return true;
// вправо
case DirectionType.Right:
- if (_startPosX.Value + EntityStormtrooper.Step + _drawningStormtrooperWidth < _pictureWidth)
+ if (_startPosX.Value + EntityAircraft.Step + _drawningAircraftWidth < _pictureWidth)
{
- _startPosX += (int)EntityStormtrooper.Step;
+ _startPosX += (int)EntityAircraft.Step;
return true;
}
return true;
//вниз
case DirectionType.Down:
- if (_startPosY.Value + EntityStormtrooper.Step + _drawningStormtrooperHeight < _pictureHeight)
+ if (_startPosY.Value + EntityAircraft.Step + _drawningAircraftHeight < _pictureHeight)
{
- _startPosY += (int)EntityStormtrooper.Step;
+ _startPosY += (int)EntityAircraft.Step;
}
return true;
default:
return false;
}
}
- /// Прорисовка объекта
- ///
- public void DrawTransport(Graphics g)
+ public virtual void DrawTransport(Graphics g)
{
- if (EntityStormtrooper == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ if (EntityAircraft == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
return;
}
Pen pen = new(Color.Black);
- Brush bodyColorBrush = new SolidBrush(EntityStormtrooper.BodyColor);
- Brush additionalBrush = new SolidBrush(EntityStormtrooper.AdditionalColor);
+ Brush bodyColorBrush = new SolidBrush(EntityAircraft.BodyColor);
//нос штурмовика
Brush brBlack = new SolidBrush(Color.Black);
@@ -206,44 +225,7 @@ public class DrawningStormtrooper
frontwings2[3].X = _startPosX.Value + 80; frontwings2[3].Y = _startPosY.Value + 80;
g.FillPolygon(bodyColorBrush, frontwings2);
g.DrawPolygon(pen, frontwings2);
+
-
- //Ракеты штурмовика
-
-
-
- if (EntityStormtrooper.Rocket)
- {
- Point[] rockets = new Point[3];
- rockets[0].X = _startPosX.Value + 45; rockets[0].Y = _startPosY.Value + 20;
- rockets[1].X = _startPosX.Value + 37; rockets[1].Y = _startPosY.Value + 22;
- rockets[2].X = _startPosX.Value + 45; rockets[2].Y = _startPosY.Value + 25;
-
- Point[] rockets2 = new Point[3];
- rockets2[0].X = _startPosX.Value + 45; rockets2[0].Y = _startPosY.Value + 110;
- rockets2[1].X = _startPosX.Value + 37; rockets2[1].Y = _startPosY.Value + 112;
- rockets2[2].X = _startPosX.Value + 45; rockets2[2].Y = _startPosY.Value + 115;
- g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
- g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
- g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
- g.FillPolygon(bodyColorBrush, rockets);
- g.DrawPolygon(pen, rockets);
- g.FillPolygon(bodyColorBrush, rockets2);
- g.DrawPolygon(pen, rockets2);
-
-
- }
- //Бомбы бомбардировщика
-
-
- if (EntityStormtrooper.Bomb)
- {
- g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
- g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
- g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
- g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
-
- }
}
-}
\ No newline at end of file
+}
diff --git a/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs b/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs
new file mode 100644
index 0000000..21d7fab
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/Drawnings/DrawningStormtrooper.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Stormtrooper.Entities;
+
+namespace Stormtrooper.Drawnings;
+public class DrawningStormtrooper : DrawningAircraft
+{
+ // Конструктор
+
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия ракет
+ /// Признак наличия бомбы
+ /// Признак наличия крыла
+ public DrawningStormtrooper(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool rocket, bool bomb, bool wing) : base(140,135)
+ {
+ EntityAircraft = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, rocket, bomb, wing);
+
+ }
+
+ public override void DrawTransport(Graphics g)
+ {
+ if (EntityAircraft == null || EntityAircraft is not EntityStormtrooper entityStormtrooper|| !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return;
+ }
+ Pen pen = new(Color.Black);
+ Brush bodyColorBrush = new SolidBrush(entityStormtrooper.BodyColor);
+ Brush additionalBrush = new SolidBrush(entityStormtrooper.AdditionalColor);
+
+ base.DrawTransport(g);
+
+ //Ракеты штурмовика
+ if (entityStormtrooper.Rocket)
+ {
+ Point[] rockets = new Point[3];
+ rockets[0].X = _startPosX.Value + 45; rockets[0].Y = _startPosY.Value + 20;
+ rockets[1].X = _startPosX.Value + 37; rockets[1].Y = _startPosY.Value + 22;
+ rockets[2].X = _startPosX.Value + 45; rockets[2].Y = _startPosY.Value + 25;
+
+ Point[] rockets2 = new Point[3];
+ rockets2[0].X = _startPosX.Value + 45; rockets2[0].Y = _startPosY.Value + 110;
+ rockets2[1].X = _startPosX.Value + 37; rockets2[1].Y = _startPosY.Value + 112;
+ rockets2[2].X = _startPosX.Value + 45; rockets2[2].Y = _startPosY.Value + 115;
+ g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 20, 15, 5);
+ g.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 110, 15, 5);
+ g.FillPolygon(bodyColorBrush, rockets);
+ g.DrawPolygon(pen, rockets);
+ g.FillPolygon(bodyColorBrush, rockets2);
+ g.DrawPolygon(pen, rockets2);
+
+
+ }
+ //Бомбы бомбардировщика
+
+
+ if (entityStormtrooper.Bomb)
+ {
+ g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 40, 10, 10);
+ g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 90, 10, 10);
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs b/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs
new file mode 100644
index 0000000..c81d626
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/Entities/EntityAircraft.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.Entities;
+
+// Класс-сущность "самолет"
+public class EntityAircraft
+{
+ 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 EntityAircraft(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+
+ }
+}
diff --git a/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs b/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs
new file mode 100644
index 0000000..bbc70c5
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/Entities/EntityStormtrooper.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.Entities;
+
+public class EntityStormtrooper : EntityAircraft
+{
+ public int Speed { get; private set; }
+ // скорость
+ public double Weight { get; private set; }
+ // вес
+ public Color BodyColor { get; private set; }
+ // цвет
+ public Color AdditionalColor { get; private set; }
+ // дополнительные цвета
+ public bool Rocket { get; private set; }
+ // ракета
+ public bool Bomb { get; private set; }
+ // бомба
+ public bool Wing { get; private set; }
+ // крыло
+
+ /// Инициализация полей объекта-класса штурмовика
+
+ /// Скорость
+ /// Вес штурмовика
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия ракет
+ /// Признак наличия бомб
+ /// Признак наличия крыла а
+
+ public EntityStormtrooper(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool rocket, bool bomb, bool wing) : base(speed, weight, bodyColor)
+ {
+ AdditionalColor = additionalColor;
+ Rocket = rocket;
+ Bomb = bomb;
+ Wing = wing;
+ }
+}
diff --git a/Stormtrooper/Stormtrooper/EntityStormtrooper.cs b/Stormtrooper/Stormtrooper/EntityStormtrooper.cs
deleted file mode 100644
index 3a6e4cf..0000000
--- a/Stormtrooper/Stormtrooper/EntityStormtrooper.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Stormtrooper
-{
- public class EntityStormtrooper
- {
- public int Speed { get; private set; }
- // скорость
- public double Weight { get; private set; }
- // вес
- public Color BodyColor { get; private set; }
- // цвет
- public Color AdditionalColor { get; private set; }
- // дополнительные цвета
- public bool Rocket { get; private set; }
- // ракета
- public bool Bomb { get; private set; }
- // бомба
- public bool Wing { get; private set; }
- // крыло
- public double Step => Speed * 100 / Weight;
- // шаг в поле
-
- /// Инициализация полей объекта-класса штурмовика
-
- /// Скорость
- /// Вес штурмовика
- /// Основной цвет
- /// Дополнительный цвет
- /// Признак наличия ракет
- /// Признак наличия бомб
- /// Признак наличия крыла а
-
- public void Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool rocket, bool bomb, bool wing)
- {
- Speed = speed;
- Weight = weight;
- BodyColor = bodyColor;
- AdditionalColor = additionalColor;
- Rocket = rocket;
- Bomb = bomb;
- Wing = wing;
- }
- }
-}
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooper.Designer.cs b/Stormtrooper/Stormtrooper/FormStormtrooper.Designer.cs
index 3561ad3..3be5a11 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooper.Designer.cs
+++ b/Stormtrooper/Stormtrooper/FormStormtrooper.Designer.cs
@@ -34,6 +34,9 @@
buttonDown = new Button();
buttonLeft = new Button();
buttonRight = new Button();
+ buttonCreateAircraft = new Button();
+ comboBoxStrategy = new ComboBox();
+ buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).BeginInit();
SuspendLayout();
//
@@ -50,11 +53,11 @@
// buttonCreate
//
buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreate.Location = new Point(12, 398);
+ buttonCreate.Location = new Point(12, 395);
buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(94, 29);
+ buttonCreate.Size = new Size(205, 32);
buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Создать";
+ buttonCreate.Text = "Создать штурмовик";
buttonCreate.UseVisualStyleBackColor = true;
buttonCreate.Click += ButtonCreate_Click;
//
@@ -106,11 +109,46 @@
buttonRight.UseVisualStyleBackColor = true;
buttonRight.Click += ButtonMove_Click;
//
+ // buttonCreateAircraft
+ //
+ buttonCreateAircraft.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreateAircraft.Location = new Point(239, 395);
+ buttonCreateAircraft.Name = "buttonCreateAircraft";
+ buttonCreateAircraft.Size = new Size(205, 32);
+ buttonCreateAircraft.TabIndex = 7;
+ buttonCreateAircraft.Text = "Создать самолет";
+ buttonCreateAircraft.UseVisualStyleBackColor = true;
+ buttonCreateAircraft.Click += buttonCreateAircraft_Click;
+ //
+ // comboBoxStrategy
+ //
+ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+ comboBoxStrategy.Location = new Point(610, 12);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(151, 28);
+ comboBoxStrategy.TabIndex = 8;
+ comboBoxStrategy.SelectedIndexChanged += comboBox1_SelectedIndexChanged;
+ //
+ // buttonStrategyStep
+ //
+ buttonStrategyStep.Location = new Point(667, 46);
+ buttonStrategyStep.Name = "buttonStrategyStep";
+ buttonStrategyStep.Size = new Size(94, 29);
+ buttonStrategyStep.TabIndex = 9;
+ buttonStrategyStep.Text = "Шаг";
+ buttonStrategyStep.UseVisualStyleBackColor = true;
+ buttonStrategyStep.Click += buttonStrategyStep_Click;
+ //
// FormStormtrooper
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(773, 439);
+ Controls.Add(buttonStrategyStep);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonCreateAircraft);
Controls.Add(buttonRight);
Controls.Add(buttonLeft);
Controls.Add(buttonDown);
@@ -133,5 +171,8 @@
private Button buttonDown;
private Button buttonLeft;
private Button buttonRight;
+ private Button buttonCreateAircraft;
+ private ComboBox comboBoxStrategy;
+ private Button buttonStrategyStep;
}
}
\ No newline at end of file
diff --git a/Stormtrooper/Stormtrooper/FormStormtrooper.cs b/Stormtrooper/Stormtrooper/FormStormtrooper.cs
index 00bc307..236594e 100644
--- a/Stormtrooper/Stormtrooper/FormStormtrooper.cs
+++ b/Stormtrooper/Stormtrooper/FormStormtrooper.cs
@@ -7,89 +7,158 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using Aircraft.MovementStrategy;
+using Stormtrooper.Drawnings;
+using Stormtrooper.MovementStrategy;
-namespace Stormtrooper
+namespace Stormtrooper;
+
+public partial class FormStormtrooper : Form
{
- public partial class FormStormtrooper : Form
+ // Поле объект для прорисовки объекта
+ public DrawningAircraft? _drawningAircraft;
+
+ // Стратегия перемещения
+
+ private AbstractStrategy? _strategy;
+
+ // Конструктор формы
+ public FormStormtrooper()
{
- // Поле объект для прорисовки объекта
- public DrawningStormtrooper? _drawningStormtrooper;
- // Конструктор формы
- public FormStormtrooper()
- {
- InitializeComponent();
- }
+ InitializeComponent();
+ _strategy = null;
+ }
- // Метод прорисовки машины
- private void FormStormtrooper_Load(object sender, EventArgs e)
- {
+ // Метод прорисовки машины
+ private void FormStormtrooper_Load(object sender, EventArgs e)
+ {
- }
-
- // Обработка нажатия кнопки Создать
- private void ButtonCreate_Click(object sender, EventArgs e)
+ }
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ Random random = new();
+ switch (type)
{
- Random random = new();
- _drawningStormtrooper = new DrawningStormtrooper();
- _drawningStormtrooper.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)));
- _drawningStormtrooper.SetPictureSize(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
- _drawningStormtrooper.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
- Bitmap bmp = new(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
- Graphics gr = Graphics.FromImage(bmp);
- _drawningStormtrooper.DrawTransport(gr);
- pictureBoxStormtrooper.Image = bmp;
- }
- private void Draw()
- {
- if (_drawningStormtrooper == null)
- {
+ case nameof(DrawningAircraft):
+ _drawningAircraft = new DrawningAircraft(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(DrawningStormtrooper):
+ _drawningAircraft = new DrawningStormtrooper(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(pictureBoxStormtrooper.Width,
- pictureBoxStormtrooper.Height);
- Graphics gr = Graphics.FromImage(bmp);
- _drawningStormtrooper.DrawTransport(gr);
- pictureBoxStormtrooper.Image = bmp;
}
- private void ButtonMove_Click(object sender, EventArgs e)
+ _drawningAircraft.SetPictureSize(pictureBoxStormtrooper.Width,
+ pictureBoxStormtrooper.Height);
+ _drawningAircraft.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+
+ Draw();
+ }
+
+ // Обработка нажатия кнопки Создать штурмовик
+ private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningStormtrooper));
+ // Обработка нажатия кнопки Создать самолет
+ private void buttonCreateAircraft_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAircraft));
+ // Прорисовка
+ private void Draw()
+ {
+ if (_drawningAircraft == null)
{
- if (_drawningStormtrooper == null)
- {
- return;
- }
-
- string name = ((Button)sender)?.Name ?? string.Empty;
- bool result = false;
- switch (name)
- {
- case "buttonUp":
- result = _drawningStormtrooper.MoveTransport(DirectionType.Up);
- break;
- case "buttonDown":
- result = _drawningStormtrooper.MoveTransport(DirectionType.Down);
- break;
- case "buttonLeft":
- result = _drawningStormtrooper.MoveTransport(DirectionType.Left);
- break;
- case "buttonRight":
- result = _drawningStormtrooper.MoveTransport(DirectionType.Right);
- break;
- }
- if (result)
- {
- Draw();
- }
-
-
+ return;
+ }
+ Bitmap bmp = new(pictureBoxStormtrooper.Width,
+ pictureBoxStormtrooper.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _drawningAircraft.DrawTransport(gr);
+ pictureBoxStormtrooper.Image = bmp;
+ }
+ // Перемещение объекта по форме
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ if (_drawningAircraft == null)
+ {
+ return;
}
- private void pictureBoxStormtrooper_Click(object sender, EventArgs e)
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ bool result = false;
+ switch (name)
{
-
+ case "buttonUp":
+ result = _drawningAircraft.MoveTransport(DirectionType.Up);
+ break;
+ case "buttonDown":
+ result = _drawningAircraft.MoveTransport(DirectionType.Down);
+ break;
+ case "buttonLeft":
+ result = _drawningAircraft.MoveTransport(DirectionType.Left);
+ break;
+ case "buttonRight":
+ result = _drawningAircraft.MoveTransport(DirectionType.Right);
+ break;
+ }
+ if (result)
+ {
+ Draw();
}
}
+
+ private void pictureBoxStormtrooper_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+ private void buttonStrategyStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningAircraft == null)
+ {
+ return;
+ }
+
+ if (comboBoxStrategy.Enabled)
+ {
+ _strategy = comboBoxStrategy.SelectedIndex switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+
+ if (_strategy == null)
+ {
+ return;
+ }
+ _strategy.SetData(new MoveableAircraft(_drawningAircraft), pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ }
+
+ if (_strategy == null)
+ {
+ return;
+ }
+
+ comboBoxStrategy.Enabled = false;
+ _strategy.MakeStep();
+ Draw();
+
+ if (_strategy.GetStatus() == StrategyStatus.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ }
+
+ }
}
diff --git a/Stormtrooper/Stormtrooper/MovementStrategy/AbstractStrategy.cs b/Stormtrooper/Stormtrooper/MovementStrategy/AbstractStrategy.cs
new file mode 100644
index 0000000..991bb44
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/AbstractStrategy.cs
@@ -0,0 +1,121 @@
+namespace Stormtrooper.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/Stormtrooper/Stormtrooper/MovementStrategy/IMoveableObject.cs b/Stormtrooper/Stormtrooper/MovementStrategy/IMoveableObject.cs
new file mode 100644
index 0000000..d2283dd
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/IMoveableObject.cs
@@ -0,0 +1,22 @@
+namespace Stormtrooper.MovementStrategy;
+
+///
+/// Интерфейс для работы с перемещаемым объектом
+///
+public interface IMoveableObject
+{
+ ///
+ /// Получение координаты объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+ ///
+ /// Попытка переместить объект в указанном направлении
+ ///
+ /// Направление
+ /// true - объект перемещен, false - перемещение невозможно
+ bool TryMoveObject(MovementDirection direction);
+}
diff --git a/Stormtrooper/Stormtrooper/MovementStrategy/MoveToBorder.cs b/Stormtrooper/Stormtrooper/MovementStrategy/MoveToBorder.cs
new file mode 100644
index 0000000..82bf242
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/MoveToBorder.cs
@@ -0,0 +1,52 @@
+namespace Stormtrooper.MovementStrategy;
+
+///
+/// Стратегия перемещения объекта к краю экрана
+///
+internal class MoveToBorder : AbstractStrategy
+{
+ protected override bool IsTargetDestinaion()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.RightBorder - GetStep() <= FieldWidth
+ && objParams.RightBorder + GetStep() >= FieldWidth &&
+ objParams.DownBorder - GetStep() <= FieldHeight
+ && objParams.DownBorder + GetStep() >= FieldHeight;
+ }
+ protected override void MoveToTarget()
+ {
+ ObjectParameters? objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ int diffX = objParams.RightBorder - FieldWidth;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+ int diffY = objParams.DownBorder - FieldHeight;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+}
diff --git a/Stormtrooper/Stormtrooper/MovementStrategy/MoveToCenter.cs b/Stormtrooper/Stormtrooper/MovementStrategy/MoveToCenter.cs
new file mode 100644
index 0000000..8c6659a
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/MoveToCenter.cs
@@ -0,0 +1,52 @@
+namespace Stormtrooper.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/Stormtrooper/Stormtrooper/MovementStrategy/MoveableAircraft.cs b/Stormtrooper/Stormtrooper/MovementStrategy/MoveableAircraft.cs
new file mode 100644
index 0000000..0ec0904
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/MoveableAircraft.cs
@@ -0,0 +1,62 @@
+using Stormtrooper.Drawnings;
+using Stormtrooper.MovementStrategy;
+
+namespace Aircraft.MovementStrategy;
+
+///
+/// класс реализация для IMoveableObject с использованием DrawningAircraft
+///
+public class MoveableAircraft : IMoveableObject
+{
+ ///
+ /// Поле-объект класса DrawningAircraft или его наследника
+ ///
+ private readonly DrawningAircraft? _cruiser = null;
+ ///
+ /// Конструктор
+ ///
+ /// Объект класса DrawningAircraft
+ public MoveableAircraft(DrawningAircraft cruiser)
+ {
+ _cruiser = cruiser;
+ }
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_cruiser == null || _cruiser.EntityAircraft == null ||
+ !_cruiser.GetPosX.HasValue || !_cruiser.GetPosY.HasValue)
+ {
+ return null;
+ }
+ return new ObjectParameters(_cruiser.GetPosX.Value,
+ _cruiser.GetPosY.Value, _cruiser.GetWidth, _cruiser.GetHeight);
+ }
+ }
+ public int GetStep => (int)(_cruiser?.EntityAircraft?.Step ?? 0);
+ public bool TryMoveObject(MovementDirection direction)
+ {
+ if (_cruiser == null || _cruiser.EntityAircraft == null)
+ {
+ return false;
+ }
+ return _cruiser.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/Stormtrooper/Stormtrooper/MovementStrategy/MovementDirection.cs b/Stormtrooper/Stormtrooper/MovementStrategy/MovementDirection.cs
new file mode 100644
index 0000000..6815322
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/MovementDirection.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.MovementStrategy;
+
+public enum MovementDirection
+{
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+ ///
+ /// Влево
+ ///
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+ Right = 4
+}
diff --git a/Stormtrooper/Stormtrooper/MovementStrategy/ObjectParameters.cs b/Stormtrooper/Stormtrooper/MovementStrategy/ObjectParameters.cs
new file mode 100644
index 0000000..d76ffd7
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/ObjectParameters.cs
@@ -0,0 +1,64 @@
+namespace Stormtrooper.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/Stormtrooper/Stormtrooper/MovementStrategy/StrategyStatus.cs b/Stormtrooper/Stormtrooper/MovementStrategy/StrategyStatus.cs
new file mode 100644
index 0000000..85ceccb
--- /dev/null
+++ b/Stormtrooper/Stormtrooper/MovementStrategy/StrategyStatus.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stormtrooper.MovementStrategy;
+
+public enum StrategyStatus
+{
+ ///
+ /// Все готово к началу
+ ///
+ NotInit,
+ ///
+ /// Выполняется
+ ///
+ InProgress,
+ ///
+ /// Завершено
+ ///
+ Finish
+}