diff --git a/ProjectBus/ProjectBus/DirectionType.cs b/ProjectBus/ProjectBus/DirectionType.cs deleted file mode 100644 index 7ef6996..0000000 --- a/ProjectBus/ProjectBus/DirectionType.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace ProjectBoat; -/// -/// Направление перемещения -/// -public enum DirectionType -{ - /// - /// Вверх - /// - Up = 1, - /// - /// Вниз - /// - Down = 2, - /// - /// Влево - /// - Left = 3, - /// - /// Вправо - /// - Right = 4 -} diff --git a/ProjectBus/ProjectBus/Drawnings/DirectionType.cs b/ProjectBus/ProjectBus/Drawnings/DirectionType.cs new file mode 100644 index 0000000..28c5f96 --- /dev/null +++ b/ProjectBus/ProjectBus/Drawnings/DirectionType.cs @@ -0,0 +1,27 @@ +namespace ProjectBoat.Drawnings; +/// +/// +/// +public enum DirectionType +{ + /// + /// + /// + Unknow = -1, + /// + /// + /// + Up = 1, + /// + /// + /// + Down = 2, + /// + /// + /// + Left = 3, + /// + /// + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectBus/ProjectBus/DrawningBoat.cs b/ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs similarity index 73% rename from ProjectBus/ProjectBus/DrawningBoat.cs rename to ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs index 49b69d1..984a0fc 100644 --- a/ProjectBus/ProjectBus/DrawningBoat.cs +++ b/ProjectBus/ProjectBus/Drawnings/DrawningBoat.cs @@ -1,8 +1,7 @@ -using ProjectBoat; +using ProjectBoat.Entities; using System.Drawing.Drawing2D; -using System.Security.Cryptography.Xml; -namespace ProjectBoat; +namespace ProjectBoat.Drawnings; /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// @@ -11,7 +10,7 @@ public class DrawningBoat /// /// Класс-сущность /// - public EntityBoat? EntityBoat { get; private set; } + public EntityBoat? EntityBoat { get; protected set; } /// /// Ширина окна /// @@ -23,11 +22,11 @@ public class DrawningBoat /// /// Левая координата прорисовки автомобиля /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки автомобиля /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки крейсера @@ -38,28 +37,56 @@ public class DrawningBoat /// private readonly int _drawningBoatHeight = 50; private readonly int _drawningEnginesWidth = 3; - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия вертолетной площадки - /// Признак наличия шлюпок - /// Признак наличия пушки - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool motor, bool boat, bool glass) + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _drawningBoatWidth; + /// + /// Высота объекта + /// + public int GetHeight => _drawningBoatHeight; + + /// + /// Пустой онструктор + /// + private DrawningBoat() { - EntityBoat = new EntityBoat(); - EntityBoat.Init(speed, weight, bodyColor, additionalColor, - motor, boat, glass); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningBoat(int speed, double weight, Color bodyColor) : this() + { + EntityBoat = new EntityBoat(speed, weight, bodyColor); + } + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawningBoat(int drawningCarWidth, int drawningCarHeight) : this() + { + _drawningBoatWidth = drawningCarWidth; + _pictureHeight = drawningCarHeight; + } + /// /// Установка границ поля /// @@ -161,7 +188,7 @@ public class DrawningBoat /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue) @@ -171,9 +198,7 @@ public class DrawningBoat Pen pen = new(EntityBoat.BodyColor, 2); Brush motorBrush = new SolidBrush(Color.Black); Brush glassBrush = new SolidBrush(Color.Blue); - Brush glassBrush2 = new SolidBrush(EntityBoat.AdditionalColor); - Brush oarsBrush = new HatchBrush(HatchStyle.ZigZag, EntityBoat.AdditionalColor, Color.FromArgb(163, 163, 163)); - Brush additionalBrush = new SolidBrush(EntityBoat.AdditionalColor); + //границы круисера g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value + 105, _startPosY.Value); @@ -185,35 +210,9 @@ public class DrawningBoat g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value, _startPosY.Value + 49); //внутренности круисера - + g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30); - g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30); - - - - - if (EntityBoat.Motor) - { - g.FillRectangle(motorBrush, _startPosX.Value - 3, _startPosY.Value + 15, 20, 17); - - } - - if (EntityBoat.Oars) - { - g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13); - g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13); - g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value - 1 , 2, 20); - - g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13); - g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13); - g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value + 30, 2, 20); - } - - if (EntityBoat.Glass) - { - g.FillRectangle(glassBrush, _startPosX.Value + 100, _startPosY.Value + 7, 10, 36); - - - } + } } + \ No newline at end of file diff --git a/ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs b/ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs new file mode 100644 index 0000000..c3a4281 --- /dev/null +++ b/ProjectBus/ProjectBus/Drawnings/DrawningMBoat.cs @@ -0,0 +1,67 @@ +using System.Drawing.Drawing2D; +using ProjectBoat.Entities; + +namespace ProjectBoat.Drawnings +{ + public class DrawningMBoat : DrawningBoat + { + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия вертолетной площадки + /// Признак наличия шлюпок + /// Признак наличия пушки + + public DrawningMBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool motor, bool oars, bool glass) + : base(150, 50) + { + EntityBoat = new EntityMBoat(speed, weight, bodyColor, additionalColor, motor, oars, glass); + } + + public override void DrawTransport(Graphics g) + { + if (EntityBoat == null || EntityBoat is not EntityMBoat entityMBoat || !_startPosX.HasValue || + !_startPosY.HasValue) + { + return; + } + + Pen pen = new(EntityBoat.BodyColor, 2); + Brush motorBrush = new SolidBrush(Color.Black); + Brush glassBrush = new SolidBrush(Color.Blue); + Brush oarsBrush = new HatchBrush(HatchStyle.ZigZag, Color.FromArgb(163, 163, 163)); + + + base.DrawTransport(g); + + if (entityMBoat.Motor) + { + g.FillRectangle(motorBrush, _startPosX.Value - 3, _startPosY.Value + 15, 20, 17); + + } + + if (entityMBoat.Oars) + { + g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13); + g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13); + g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value - 1, 2, 20); + + g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13); + g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13); + g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value + 30, 2, 20); + } + + if (entityMBoat.Glass) + { + g.FillRectangle(glassBrush, _startPosX.Value + 100, _startPosY.Value + 7, 10, 36); + + + } + } + } +} diff --git a/ProjectBus/ProjectBus/Entities/EntityBoat.cs b/ProjectBus/ProjectBus/Entities/EntityBoat.cs new file mode 100644 index 0000000..fb9c284 --- /dev/null +++ b/ProjectBus/ProjectBus/Entities/EntityBoat.cs @@ -0,0 +1,38 @@ +namespace ProjectBoat.Entities; + +/// +/// Класс-сущность "крейсер" +/// +public class EntityBoat +{ + //свойства + /// + /// Скорость + /// + 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 EntityBoat(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectBus/ProjectBus/Entities/EntityMBoat.cs b/ProjectBus/ProjectBus/Entities/EntityMBoat.cs new file mode 100644 index 0000000..6db1ff3 --- /dev/null +++ b/ProjectBus/ProjectBus/Entities/EntityMBoat.cs @@ -0,0 +1,30 @@ +namespace ProjectBoat.Entities +{ + internal class EntityMBoat : EntityBoat + { + /// + /// Признак (опция) наличие вертолетной площадки + /// + public bool Motor { get; private set; } + /// + /// Признак (опция) наличие шлюпок + /// + public bool Oars { get; private set; } + /// + /// Признак (опция) наличие пушки + /// + public bool Glass { get; private set; } + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + public EntityMBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool motor, bool oars, bool glass) : base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + Motor = motor; + Oars = oars; + Glass = glass; + } + } +} diff --git a/ProjectBus/ProjectBus/EntityBoat.cs b/ProjectBus/ProjectBus/EntityBoat.cs deleted file mode 100644 index 17649ab..0000000 --- a/ProjectBus/ProjectBus/EntityBoat.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace ProjectBoat; -/// -/// Класс-сущность "автобус" -/// -public class EntityBoat -{ - //свойства - /// - /// Скорость - /// - 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 Motor { get; private set; } - /// - /// Признак (опция) наличие лестницы - /// - public bool Oars { get; private set; } - /// - /// Признак (опция) наличие фар - /// - public bool Glass { get; private set; } - //поле класса - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - /// - /// Инициализация полей объекта-класса крейсера - /// - /// скорость - /// вес - /// основной цвет - /// дополнительный цвет - /// второй этаж - /// лестница - /// наличие фар - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool motor, bool oars, bool glass) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Motor = motor; - Oars = oars; - Glass = glass; - } -} diff --git a/ProjectBus/ProjectBus/FormBoat.Designer.cs b/ProjectBus/ProjectBus/FormBoat.Designer.cs index a3f9cb9..af4e227 100644 --- a/ProjectBus/ProjectBus/FormBoat.Designer.cs +++ b/ProjectBus/ProjectBus/FormBoat.Designer.cs @@ -1,5 +1,4 @@ - -namespace ProjectBoat +namespace ProjectBoat { partial class FormBoat { @@ -30,25 +29,29 @@ namespace ProjectBoat private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBoat)); - pictureBox1 = new PictureBox(); + pictureBoxBoat = new PictureBox(); button1 = new Button(); buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); buttonLeft = new Button(); - ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); + comboBoxStrategy = new ComboBox(); + buttonCretaeBoat = new Button(); + buttonStrategyStep = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).BeginInit(); SuspendLayout(); // - // pictureBox1 + // pictureBoxBoat // - pictureBox1.Dock = DockStyle.Fill; - pictureBox1.Location = new Point(0, 0); - pictureBox1.Margin = new Padding(3, 2, 3, 2); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new Size(700, 338); - pictureBox1.SizeMode = PictureBoxSizeMode.AutoSize; - pictureBox1.TabIndex = 0; - pictureBox1.TabStop = false; + pictureBoxBoat.Dock = DockStyle.Fill; + pictureBoxBoat.Location = new Point(0, 0); + pictureBoxBoat.Margin = new Padding(3, 2, 3, 2); + pictureBoxBoat.Name = "pictureBoxBoat"; + pictureBoxBoat.Size = new Size(700, 338); + pictureBoxBoat.SizeMode = PictureBoxSizeMode.AutoSize; + pictureBoxBoat.TabIndex = 0; + pictureBoxBoat.TabStop = false; + pictureBoxBoat.Click += pictureBoxBoat_Click; // // button1 // @@ -56,9 +59,9 @@ namespace ProjectBoat button1.Location = new Point(10, 307); button1.Margin = new Padding(3, 2, 3, 2); button1.Name = "button1"; - button1.Size = new Size(82, 22); + button1.Size = new Size(186, 22); button1.TabIndex = 1; - button1.Text = "создать"; + button1.Text = "создать катер"; button1.UseVisualStyleBackColor = true; button1.Click += ButtonCreateBoat_Click; // @@ -114,34 +117,75 @@ namespace ProjectBoat buttonLeft.UseVisualStyleBackColor = true; buttonLeft.Click += ButtonMove_Click; // + // comboBoxStrategy + // + comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right; + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "к центру", "к краю" }); + comboBoxStrategy.Location = new Point(557, 9); + comboBoxStrategy.Margin = new Padding(3, 2, 3, 2); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(133, 23); + comboBoxStrategy.TabIndex = 6; + // + // buttonCretaeBoat + // + buttonCretaeBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCretaeBoat.Location = new Point(210, 308); + buttonCretaeBoat.Margin = new Padding(3, 2, 3, 2); + buttonCretaeBoat.Name = "buttonCretaeBoat"; + buttonCretaeBoat.Size = new Size(186, 22); + buttonCretaeBoat.TabIndex = 7; + buttonCretaeBoat.Text = "создать лодку"; + buttonCretaeBoat.UseVisualStyleBackColor = true; + buttonCretaeBoat.Click += buttonCretaeBoat_Click; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(607, 34); + buttonStrategyStep.Margin = new Padding(3, 2, 3, 2); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(82, 22); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormBoat // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(700, 338); + Controls.Add(buttonStrategyStep); + Controls.Add(buttonCretaeBoat); + Controls.Add(comboBoxStrategy); Controls.Add(buttonLeft); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(button1); - Controls.Add(pictureBox1); + Controls.Add(pictureBoxBoat); Margin = new Padding(3, 2, 3, 2); Name = "FormBoat"; Text = "FormBoat"; - //Load += this.FormBoat_Load_1; + Load += FormBoat_Load; Click += ButtonMove_Click; - ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit(); ResumeLayout(false); PerformLayout(); } #endregion - private PictureBox pictureBox1; + private PictureBox pictureBoxBoat; private Button button1; private Button buttonUp; private Button buttonDown; private Button buttonRight; private Button buttonLeft; + private ComboBox comboBoxStrategy; + private Button buttonCretaeBoat; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectBus/ProjectBus/FormBoat.cs b/ProjectBus/ProjectBus/FormBoat.cs index 0d6b189..938d77b 100644 --- a/ProjectBus/ProjectBus/FormBoat.cs +++ b/ProjectBus/ProjectBus/FormBoat.cs @@ -1,4 +1,7 @@ -namespace ProjectBoat +using ProjectBoat.Drawnings; +using ProjectBoat.MovementStrategy; + +namespace ProjectBoat { public partial class FormBoat : Form { @@ -6,10 +9,16 @@ /// Поле-объект для прорисовки объекта /// private DrawningBoat? _drawningBoat; + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + public FormBoat() { InitializeComponent(); - + _strategy = null; } /// @@ -21,35 +30,64 @@ { return; } - Bitmap bmp = new(pictureBox1.Width, - pictureBox1.Height); + Bitmap bmp = new(pictureBoxBoat.Width, + pictureBoxBoat.Height); Graphics gr = Graphics.FromImage(bmp); _drawningBoat.DrawTransport(gr); - pictureBox1.Image = bmp; + pictureBoxBoat.Image = bmp; } + /// - /// Обработка нажатия кнопки "Создать" + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningBoat): + _drawningBoat = new DrawningBoat(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(DrawningMBoat): + _drawningBoat = new DrawningMBoat(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; + } + _drawningBoat.SetPictureSize(pictureBoxBoat.Width, + pictureBoxBoat.Height); + _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; + Draw(); + } + + /// + /// Обработка нажатия кнопки "Создать военный крейсер" /// /// /// - private void ButtonCreateBoat_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningBoat = new DrawningBoat(); - _drawningBoat.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))); - _drawningBoat.SetPictureSize(pictureBox1.Width, - pictureBox1.Height); + private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMBoat)); + + /// + /// Обработка нажатия кнопки "Создать крейсер" + /// + /// + /// + private void buttonCretaeBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat)); + - //начальное положение круисера - _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); - } /// /// Перемещение объекта по форме (нажатие кнопок навигации) /// @@ -87,5 +125,59 @@ Draw(); } } + + /// + /// обработка нажатия кнопки шаг + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningBoat == null) + { + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableBoat(_drawningBoat), pictureBoxBoat.Width, pictureBoxBoat.Height); + } + + if (_strategy == null) + { + return; + } + + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } + + private void FormBoat_Load(object sender, EventArgs e) + { + + } + + private void pictureBoxBoat_Click(object sender, EventArgs e) + { + + } } } diff --git a/ProjectBus/ProjectBus/FormBoat.resx b/ProjectBus/ProjectBus/FormBoat.resx index ead51ca..8a26dc4 100644 --- a/ProjectBus/ProjectBus/FormBoat.resx +++ b/ProjectBus/ProjectBus/FormBoat.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAABGsAAAZACAYAAADO3c9BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAVu1JREFUeF7s3XHE5XXe//HcstZKkiRJMpIkSZIkSZJkJUmSlSRZK1lJxkokK0mS + vAAADrwBlbxySQAAVu1JREFUeF7s3XHE5XXe//HcstZKkiRJMpIkSZIkSZJkJUmSlSRZK1lJxkokK0mS JGtkJUmSJEkykiRJMpIkyRgjY4wxxhhjjN/v9dnd7rutz3xmrus61/uc8z2PJw+/2++/na7rnO/3dZ3z +Z4iSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk @@ -498,7 +498,7 @@ iVBORw0KGgoAAAANSUhEUgAABGsAAAZACAYAAADO3c9BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAVmJJREFUeF7s3XGk5nX+//98ZK2VJEkykpEkSZKsJEmyspIkyUqSrJWsJGMlkpUk + vAAADrwBlbxySQAAVmJJREFUeF7s3XGk5nX+//98ZK2VJEkykpEkSZKsJEmyspIkyUqSrJWsJGMlkpUk SZKVrCRZSVYyVpIkSZKRJEnGGBljjDHGGGP8fo/37mc/36199WzOnHOe531d1+3Ozf69zTnX9X4/znW9 3qdJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ @@ -873,7 +873,7 @@ iVBORw0KGgoAAAANSUhEUgAABkAAAARrCAYAAADb+Gp7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAASClJREFUeF7s3Q+k3vX///F85SNJJjMzk0ySyXwkk8nMJEkyyWQySSaZZGYmGUmS + vAAADrwBlbxySQAASClJREFUeF7s3Q+k3vX///F85SNJJjMzk0ySyXwkk8nMJEkyyWQySSaZZGYmGUmS ZJJJZpLMJJlkJjOZj5mZmZmZyczMzBwzxxzHMcfv93hXq7ad/+d9Xdf7/Xrf7tx8vt+vjy/V2RXn4Xq+ 7pMkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk @@ -1187,7 +1187,7 @@ iVBORw0KGgoAAAANSUhEUgAABkAAAARrCAYAAADb+Gp7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAUVNJREFUeF7s3X/E34X+//F85DiSTDKTSSbJJEcySZIkSZJkkiTJ5EiSZJJIkiRJ + vAAADrwBlbxySQAAUVNJREFUeF7s3X/E34X+//F85DiSTDKTSSbJJEcySZIkSZJkkiTJ5EiSZJJIkiRJ JpkkSZJMMpNM5pjMzMzMTGZmZmZmZuZymcv3+3idTufU9tyuX+8frx+3OzfO+bPrer9fF8+Hvd9XSZIk SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk diff --git a/ProjectBus/ProjectBus/MovementStrategy/AbstractStrategy.cs b/ProjectBus/ProjectBus/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..5739570 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,123 @@ +namespace ProjectBoat.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/ProjectBus/ProjectBus/MovementStrategy/IMoveableObject.cs b/ProjectBus/ProjectBus/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..2d578fd --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,24 @@ +namespace ProjectBoat.MovementStrategy +{ + /// + /// Интерфейс для работы с перемещаемым объектом + /// + public interface IMoveableObject + { + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); + } + +} diff --git a/ProjectBus/ProjectBus/MovementStrategy/MoveToBorder.cs b/ProjectBus/ProjectBus/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..a69aeb1 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,53 @@ +namespace ProjectBoat.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/ProjectBus/ProjectBus/MovementStrategy/MoveToCenter.cs b/ProjectBus/ProjectBus/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..c62d289 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,53 @@ +namespace ProjectBoat.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/ProjectBus/ProjectBus/MovementStrategy/MoveableBoat.cs b/ProjectBus/ProjectBus/MovementStrategy/MoveableBoat.cs new file mode 100644 index 0000000..fff18ec --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/MoveableBoat.cs @@ -0,0 +1,62 @@ +using ProjectBoat.Drawnings; + +namespace ProjectBoat.MovementStrategy +{ + /// + /// класс реалтзация для IMoveableObject с использованием DrawningBoat + /// + public class MoveableBoat : IMoveableObject + { + /// + /// Поле-объект класса DrawningBoat или его наследника + /// + private readonly DrawningBoat? _cruiser = null; + /// + /// Конструктор + /// + /// Объект класса DrawningBoat + public MoveableBoat(DrawningBoat cruiser) + { + _cruiser = cruiser; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_cruiser == null || _cruiser.EntityBoat == 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?.EntityBoat?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_cruiser == null || _cruiser.EntityBoat == 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/ProjectBus/ProjectBus/MovementStrategy/MovementDirection.cs b/ProjectBus/ProjectBus/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..1106396 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/MovementDirection.cs @@ -0,0 +1,26 @@ +namespace ProjectBoat.MovementStrategy +{ + /// + /// Направление перемещения + /// + public enum MovementDirection + { + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 + } + +} diff --git a/ProjectBus/ProjectBus/MovementStrategy/ObjectParameters.cs b/ProjectBus/ProjectBus/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..cae4972 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,64 @@ +namespace ProjectBoat.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/ProjectBus/ProjectBus/MovementStrategy/StrategyStatus.cs b/ProjectBus/ProjectBus/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..75d4165 --- /dev/null +++ b/ProjectBus/ProjectBus/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,22 @@ +namespace ProjectBoat.MovementStrategy +{ + /// + /// Статус выполнения операции перемещения + /// + public enum StrategyStatus + { + /// + /// Все готово к началу + /// + NotInit, + /// + /// Выполняется + /// + InProgress, + /// + /// Завершено + /// + Finish + } + +}