diff --git a/DumpTruck/DumpTruck/AbstractStrategy.cs b/DumpTruck/DumpTruck/AbstractStrategy.cs new file mode 100644 index 0000000..9d92804 --- /dev/null +++ b/DumpTruck/DumpTruck/AbstractStrategy.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.MovementStrategy +{ + public abstract class AbstractStrategy + { + /// + /// Перемещаемый объект + /// + private IMoveableObject? _moveableObject; + /// + /// Статус перемещения + /// + private Status _state = Status.NotInit; + /// + /// Ширина поля + /// + protected int FieldWidth { get; private set; } + /// + /// Высота поля + /// + protected int FieldHeight { get; private set; } + /// + /// Статус перемещения + /// + public Status GetStatus() { return _state; } + /// + /// Установка данных + /// + /// Перемещаемый объект + /// Ширина поля + /// Высота поля + public void SetData(IMoveableObject moveableObject, int width, int height) + { + if (moveableObject == null) + { + _state = Status.NotInit; + return; + } + _state = Status.InProgress; + _moveableObject = moveableObject; + FieldWidth = width; + FieldHeight = height; + } + + /// + /// Шаг перемещения + /// + public void MakeStep() + { + if (_state != Status.InProgress) + { + return; + } + if (IsTargetDestinaion()) + { + _state = Status.Finish; + return; + } + MoveToTarget(); + } + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveLeft() => MoveTo(DirectionType.Left); + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveRight() => MoveTo(DirectionType.Right); + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveUp() => MoveTo(DirectionType.Up); + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveDown() => MoveTo(DirectionType.Down); + /// + /// Параметры объекта + /// + protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition; + /// + /// Шаг объекта + /// + /// + protected int? GetStep() + { + if (_state != Status.InProgress) + { + return null; + } + return _moveableObject?.GetStep; + } + + /// + /// Перемещение к цели + /// + protected abstract void MoveToTarget(); + /// + /// Достигнута ли цель + /// + /// + protected abstract bool IsTargetDestinaion(); + /// + /// Попытка перемещения в требуемом направлении + /// + /// Направление + /// Результат попытки (true - удалось переместиться, false - неудача) + private bool MoveTo(DirectionType directionType) + { + if (_state != Status.InProgress) + { + return false; + } + if (_moveableObject?.CheckCanMove(directionType) ?? false) + { + _moveableObject.MoveObject(directionType); + return true; + } + return false; + } + } +} diff --git a/DumpTruck/DumpTruck/Direction.cs b/DumpTruck/DumpTruck/DirectionType.cs similarity index 87% rename from DumpTruck/DumpTruck/Direction.cs rename to DumpTruck/DumpTruck/DirectionType.cs index 8cd74cb..2ae426b 100644 --- a/DumpTruck/DumpTruck/Direction.cs +++ b/DumpTruck/DumpTruck/DirectionType.cs @@ -6,11 +6,11 @@ using System.Threading.Tasks; namespace DumpTruck { - internal enum DirectionType + public enum DirectionType { Up = 1, Down = 2, Left = 3, Right = 4 } -} \ No newline at end of file +} diff --git a/DumpTruck/DumpTruck/DrawingTruck.cs b/DumpTruck/DumpTruck/DrawingTruck.cs deleted file mode 100644 index 8a05ede..0000000 --- a/DumpTruck/DumpTruck/DrawingTruck.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DumpTruck -{ - internal class DrawingTruck - { - public EntityTruck? EntityTruck { get; private set; } - private int _startPosX; - private int _startPosY; - private int _pictureWidth; - private int _pictureHeight; - protected readonly int _truckWidth = 100; - protected readonly int _truckHeight = 50; - public bool Init(int speed, float weight, Color bodyColor, Color additionalColor, int width, int height, bool threeWheels, bool dump) - { - if (width < _truckWidth || height < _truckHeight) - { - return false; - } - _pictureWidth = width; - _pictureHeight = height; - EntityTruck = new EntityTruck(); - EntityTruck.Init(speed, weight, bodyColor, additionalColor, threeWheels, dump); - return true; - } - public void SetPosition(int x, int y) - { - if (x < 0 || x + _truckWidth > _pictureWidth) - { - x = _pictureWidth - _truckWidth; - } - if (y < 0 || y + _truckHeight > _pictureHeight) - { - y = _pictureHeight - _truckHeight; - } - _startPosX = x; - _startPosY = y; - } - public void MoveTransport(DirectionType direction) - { - if (EntityTruck == null) - - { - return; - } - - switch (direction) - { - case DirectionType.Left: - if (_startPosX - EntityTruck.Step > 0) - { - _startPosX -= (int)EntityTruck.Step; - } - break; - //вверх - case DirectionType.Up: - if (_startPosY - EntityTruck.Step > 0) - { - _startPosY -= (int)EntityTruck.Step; - } - break; - //вправо - case DirectionType.Right: - if (_startPosX + EntityTruck.Step + _truckWidth < _pictureWidth) - { - _startPosX += (int)EntityTruck.Step; - } - break; - case DirectionType.Down: - if (_startPosY + EntityTruck.Step + _truckHeight < _pictureHeight) - { - _startPosY += (int)EntityTruck.Step; - } - break; - } - - - } - public void DrawTransport(Graphics g, Color bodyColor, Color additionalColor, bool threeWheels, bool Dump) - { - if (EntityTruck == null) - { - return; - } - - - Brush br = new SolidBrush(EntityTruck?.BodyColor ?? Color.Black); - g.FillRectangle(br, _startPosX + 80, _startPosY, 20, 30); - - Brush brBodyRandom = new SolidBrush(bodyColor); - g.FillRectangle(brBodyRandom, _startPosX, _startPosY + 30, 100, 5); - - Brush brBlack = new SolidBrush(Color.Black); - - g.FillEllipse(brBlack, _startPosX, _startPosY + 35, 20, 20); - if (threeWheels) - g.FillEllipse(brBlack, _startPosX + 22, _startPosY + 35, 20, 20); - g.FillEllipse(brBlack, _startPosX + 80, _startPosY + 35, 20, 20); - - Brush brWhite = new SolidBrush(Color.White); - g.FillEllipse(brWhite, _startPosX + 5, _startPosY + 40, 10, 10); - if (threeWheels) - g.FillEllipse(brWhite, _startPosX + 27, _startPosY + 40, 10, 10); - g.FillEllipse(brWhite, _startPosX + 85, _startPosY + 40, 10, 10); - - Pen pen = new Pen(Color.Black); - - g.DrawRectangle(pen, _startPosX + 80, _startPosY, 20, 30); - g.DrawRectangle(pen, _startPosX, _startPosY + 30, 100, 5); - g.DrawEllipse(pen, _startPosX, _startPosY + 35, 20, 20); - if (threeWheels) - g.DrawEllipse(pen, _startPosX + 22, _startPosY + 35, 20, 20); - g.DrawEllipse(pen, _startPosX + 80, _startPosY + 35, 20, 20); - - - //Brush brBody = new SolidBrush(EntityTruck?.AdditionalColor ?? Color.Red); - if (Dump) - { - Brush brBodyAdditional = new SolidBrush(additionalColor); - g.FillRectangle(brBodyAdditional, _startPosX + 0, _startPosY, 70, 30); - Pen pen1 = new Pen(Color.Black); - g.DrawRectangle(pen1, _startPosX + 0, _startPosY, 70, 30); - } - - - - } - } -} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/DrawningDumpTruck.cs b/DumpTruck/DumpTruck/DrawningDumpTruck.cs new file mode 100644 index 0000000..13e6de5 --- /dev/null +++ b/DumpTruck/DumpTruck/DrawningDumpTruck.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DumpTruck.DrawningObjects; +using DumpTruck.Entities; + +namespace DumpTruck.DrawningObjects +{ + public class DrawningDumpTruck : DrawningTruck + { + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Ширина картинки + /// Высота картинки + /// Признак наличия груза + /// Признак наличия тента + public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height) : + base(speed, weight, bodyColor, width, height, 110, 60) + { + if (EntityTruck != null) + { + EntityTruck = new EntityDumpTruck(speed, weight, bodyColor, additionalColor, bodyKit, tent); + } + } + + /// + /// Отрисовка автомобиля + /// + /// + public override void DrawTransport(Graphics g) + { + if (EntityTruck is not EntityDumpTruck dumpTruck) + { + return; + } + + Brush brushAdditionalColor = new SolidBrush(dumpTruck.AdditionalColor); + Brush brushWhite = new SolidBrush(Color.White); + Pen penBlack = new Pen(Color.Black); + + base.DrawTransport(g); + + if (dumpTruck.BodyKit) + { + g.FillRectangle(brushAdditionalColor, _startPosX, _startPosY + 30, 100, 5); + g.FillRectangle(brushAdditionalColor, _startPosX, _startPosY + 10, 70, 20); + g.DrawRectangle(penBlack, _startPosX, _startPosY + 30, 100, 5); + g.DrawRectangle(penBlack, _startPosX, _startPosY + 10, 70, 20); + + if (dumpTruck.Tent) + { + g.FillRectangle(brushWhite, _startPosX, _startPosY + 10, 70, 5); + g.DrawRectangle(penBlack, _startPosX, _startPosY + 10, 70, 5); + } + } + } + } +} diff --git a/DumpTruck/DumpTruck/DrawningObjectTruck.cs b/DumpTruck/DumpTruck/DrawningObjectTruck.cs new file mode 100644 index 0000000..70d7303 --- /dev/null +++ b/DumpTruck/DumpTruck/DrawningObjectTruck.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DumpTruck.DrawningObjects; + +namespace DumpTruck.MovementStrategy +{ + public class DrawningObjectTruck : IMoveableObject + { + private readonly DrawningTruck? _drawningTruck = null; + public DrawningObjectTruck(DrawningTruck drawningTruck) + { + _drawningTruck = drawningTruck; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_drawningTruck == null || _drawningTruck.EntityTruck == null) + { + return null; + } + return new ObjectParameters(_drawningTruck.GetPosX, _drawningTruck.GetPosY, _drawningTruck.GetWidth, _drawningTruck.GetHeight); + } + } + public int GetStep => (int)(_drawningTruck?.EntityTruck?.Step ?? 0); + + public bool CheckCanMove(DirectionType direction) => _drawningTruck?.CanMove(direction) ?? false; + public void MoveObject(DirectionType direction) => _drawningTruck?.MoveTransport(direction); + } +} diff --git a/DumpTruck/DumpTruck/DrawningTruck.cs b/DumpTruck/DumpTruck/DrawningTruck.cs new file mode 100644 index 0000000..46b29e2 --- /dev/null +++ b/DumpTruck/DumpTruck/DrawningTruck.cs @@ -0,0 +1,223 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DumpTruck.Entities; + +namespace DumpTruck.DrawningObjects +{ + public class DrawningTruck + { + /// + /// Класс-сущность + /// + public EntityTruck? EntityTruck { get; protected set; } + /// + /// Ширина окна + /// + private int _pictureWidth; + /// + /// Высота окна + /// + private int _pictureHeight; + /// + /// Левая координата прорисовки автомобиля + /// + protected int _startPosX; + /// + /// Верхняя кооридната прорисовки автомобиля + /// + protected int _startPosY; + /// + /// Ширина прорисовки автомобиля + /// + protected readonly int _truckWidth = 110; + /// + /// Высота прорисовки автомобиля + /// + protected readonly int _truckHeight = 60; + /// + /// + /// Координата X объекта + /// + public int GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _truckWidth; + /// + /// Высота объекта + /// + public int GetHeight => _truckHeight; + + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Ширина картинки + /// Высота картинки + public DrawningTruck(int speed, double weight, Color bodyColor, int width, int height) + { + if (width < _truckWidth || height < _truckHeight) + { + return; + } + _pictureWidth = width; + _pictureHeight = height; + EntityTruck = new EntityTruck(speed, weight, bodyColor); + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Ширина картинки + /// Высота картинки + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawningTruck(int speed, double weight, Color bodyColor, int width, int height, int truckWidth, int truckHeight) + { + if (width <= _truckWidth || height <= _truckHeight) + { + return; + } + _pictureWidth = width; + _pictureHeight = height; + _truckWidth = truckWidth; + _truckHeight = truckHeight; + EntityTruck = new EntityTruck(speed, weight, bodyColor); + } + + /// + /// Проверка, что объект может переместится по указанному направлению + /// + /// Направление + /// true - можно переместится по указанному направлению + public bool CanMove(DirectionType direction) + { + if (EntityTruck == null) + { + return false; + } + return direction switch + { + //влево + DirectionType.Left => _startPosX - EntityTruck.Step > 0, + //вверх + DirectionType.Up => _startPosY - EntityTruck.Step > 0, + // вправо + DirectionType.Right => _startPosX + _truckWidth + EntityTruck.Step < _pictureWidth, + //вниз + DirectionType.Down => _startPosY + _truckHeight + EntityTruck.Step < _pictureHeight, + _ => false, + }; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (x < 0 || x + _truckWidth > _pictureWidth) + { + x = Math.Max(0, _pictureWidth - _truckWidth); + } + if (y < 0 || y + _truckHeight > _pictureHeight) + { + y = Math.Max(0, _pictureHeight - _truckHeight); + } + _startPosX = x; + _startPosY = y; + } + + /// + /// Изменение направления перемещения + /// + /// Направление + public void MoveTransport(DirectionType direction) + { + if (!CanMove(direction) || EntityTruck == null) + { + return; + } + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX - EntityTruck.Step > 0) + { + _startPosX -= (int)EntityTruck.Step; + } + break; + //вверх + case DirectionType.Up: + if (_startPosY - EntityTruck.Step > 0) + { + _startPosY -= (int)EntityTruck.Step; + } + break; + // вправо + case DirectionType.Right: + if (_startPosX + _truckWidth + EntityTruck.Step < _pictureWidth) + { + _startPosX += (int)EntityTruck.Step; + } + break; + //вниз + case DirectionType.Down: + if (_startPosY + _truckHeight + EntityTruck.Step < _pictureHeight) + { + _startPosY += (int)EntityTruck.Step; + } + break; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityTruck == null) + { + return; + } + Pen penBlack = new Pen(Color.Black); + Brush brushBodyColor = new SolidBrush(EntityTruck.BodyColor); + Brush brushBlack = new SolidBrush(Color.Black); + Brush brushWhite = new SolidBrush(Color.White); + + //Кабина + g.FillRectangle(brushBodyColor, _startPosX + 80, _startPosY, 20, 30); + g.DrawRectangle(penBlack, _startPosX + 80, _startPosY, 20, 30); + + //Рама + g.FillRectangle(brushBodyColor, _startPosX, _startPosY + 30, 100, 5); + g.DrawRectangle(penBlack, _startPosX, _startPosY + 30, 100, 5); + + //Колёса + g.FillEllipse(brushBlack, _startPosX, _startPosY + 35, 20, 20); + g.FillEllipse(brushBlack, _startPosX + 22, _startPosY + 35, 20, 20); + g.FillEllipse(brushBlack, _startPosX + 80, _startPosY + 35, 20, 20); + + g.FillEllipse(brushWhite, _startPosX + 5, _startPosY + 40, 10, 10); + g.FillEllipse(brushWhite, _startPosX + 27, _startPosY + 40, 10, 10); + g.FillEllipse(brushWhite, _startPosX + 85, _startPosY + 40, 10, 10); + + g.DrawEllipse(penBlack, _startPosX, _startPosY + 35, 20, 20); + g.DrawEllipse(penBlack, _startPosX + 22, _startPosY + 35, 20, 20); + g.DrawEllipse(penBlack, _startPosX + 80, _startPosY + 35, 20, 20); + } + } +} diff --git a/DumpTruck/DumpTruck/EntityDumpTruck.cs b/DumpTruck/DumpTruck/EntityDumpTruck.cs new file mode 100644 index 0000000..b326478 --- /dev/null +++ b/DumpTruck/DumpTruck/EntityDumpTruck.cs @@ -0,0 +1,43 @@ +using DumpTruck.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.Entities +{ + internal class EntityDumpTruck: EntityTruck + { + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия кузова + /// + public bool BodyKit { get; private set; } + + /// + /// Признак (опция) наличия тента + /// + public bool Tent { get; private set; } + + /// + /// Инициализация полей объекта-класса автомобиля + /// + /// + /// + /// + /// + /// + public EntityDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent) : + base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + BodyKit = bodyKit; + Tent = tent; + } + } +} diff --git a/DumpTruck/DumpTruck/EntityTruck.cs b/DumpTruck/DumpTruck/EntityTruck.cs index 8f9e4dc..c2b757f 100644 --- a/DumpTruck/DumpTruck/EntityTruck.cs +++ b/DumpTruck/DumpTruck/EntityTruck.cs @@ -1,35 +1,44 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace DumpTruck +namespace DumpTruck.Entities { - internal class EntityTruck + public class EntityTruck { + /// + /// Скорость + /// public int Speed { get; private set; } - public float Weight { get; private set; } + /// + /// Вес + /// + public double Weight { get; private set; } + /// + /// Основной цвет + /// public Color BodyColor { get; private set; } - public Color AdditionalColor { get; private set; } - public bool ThreeWheels { get; private set; } + /// + /// Шаг перемещения автомобиля + /// + public double Step => (double)Speed * 100 / Weight; - public bool Dump { get; private set; } - - public float Step => Speed * 100 / Weight; - - public void Init(int speed, float weight, Color bodyColor, Color additionalColor, bool threeWheels, bool dump) + /// + /// Конструктор с параметрами + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + public EntityTruck(int speed, double weight, Color bodyColor) { Speed = speed; Weight = weight; BodyColor = bodyColor; - AdditionalColor = additionalColor; - ThreeWheels = threeWheels; - Dump = dump; } } -} \ No newline at end of file +} diff --git a/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs b/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs new file mode 100644 index 0000000..5090c0d --- /dev/null +++ b/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs @@ -0,0 +1,179 @@ +namespace DumpTruck +{ + partial class FormDumpTruck + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + pictureBoxDumpTruck = new PictureBox(); + buttonCreateTruck = new Button(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + buttonCreateDumpTruck = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStep = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck).BeginInit(); + SuspendLayout(); + // + // pictureBoxDumpTruck + // + pictureBoxDumpTruck.Dock = DockStyle.Fill; + pictureBoxDumpTruck.Location = new Point(0, 0); + pictureBoxDumpTruck.Name = "pictureBoxDumpTruck"; + pictureBoxDumpTruck.Size = new Size(884, 461); + pictureBoxDumpTruck.SizeMode = PictureBoxSizeMode.AutoSize; + pictureBoxDumpTruck.TabIndex = 0; + pictureBoxDumpTruck.TabStop = false; + // + // buttonCreateTruck + // + buttonCreateTruck.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateTruck.Location = new Point(12, 406); + buttonCreateTruck.Name = "buttonCreateTruck"; + buttonCreateTruck.Size = new Size(107, 43); + buttonCreateTruck.TabIndex = 1; + buttonCreateTruck.Text = "Создать грузовик"; + buttonCreateTruck.UseVisualStyleBackColor = true; + buttonCreateTruck.Click += buttonCreateTruck_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; + buttonLeft.BackgroundImageLayout = ImageLayout.Zoom; + buttonLeft.Location = new Point(770, 426); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(30, 30); + 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.Zoom; + buttonUp.Location = new Point(806, 390); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(30, 30); + 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.Zoom; + buttonDown.Location = new Point(806, 426); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(30, 30); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += buttonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.arrowRight; + buttonRight.BackgroundImageLayout = ImageLayout.Zoom; + buttonRight.Location = new Point(842, 426); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(30, 30); + buttonRight.TabIndex = 5; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += buttonMove_Click; + // + // buttonCreateDumpTruck + // + buttonCreateDumpTruck.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateDumpTruck.Location = new Point(125, 406); + buttonCreateDumpTruck.Name = "buttonCreateDumpTruck"; + buttonCreateDumpTruck.Size = new Size(118, 43); + buttonCreateDumpTruck.TabIndex = 6; + buttonCreateDumpTruck.Text = "Создать грузовик с кузовом"; + buttonCreateDumpTruck.UseVisualStyleBackColor = true; + buttonCreateDumpTruck.Click += buttonCreateDumpTruck_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right; + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "Путь к центру", "Путь к правому нижнему углу" }); + comboBoxStrategy.Location = new Point(751, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 7; + // + // buttonStep + // + buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonStep.Location = new Point(797, 41); + buttonStep.Name = "buttonStep"; + buttonStep.Size = new Size(75, 23); + buttonStep.TabIndex = 8; + buttonStep.Text = "Шаг"; + buttonStep.UseVisualStyleBackColor = true; + buttonStep.Click += buttonStep_Click; + // + // FormDumpTruck + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(884, 461); + Controls.Add(buttonStep); + Controls.Add(comboBoxStrategy); + Controls.Add(buttonCreateDumpTruck); + Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreateTruck); + Controls.Add(pictureBoxDumpTruck); + Name = "FormDumpTruck"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Проект"; + ((System.ComponentModel.ISupportInitialize)pictureBoxDumpTruck).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private PictureBox pictureBoxDumpTruck; + private Button buttonCreateTruck; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateDumpTruck; + private ComboBox comboBoxStrategy; + private Button buttonStep; + } +} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormDumpTruck.cs b/DumpTruck/DumpTruck/FormDumpTruck.cs new file mode 100644 index 0000000..6daad08 --- /dev/null +++ b/DumpTruck/DumpTruck/FormDumpTruck.cs @@ -0,0 +1,131 @@ +using DumpTruck.DrawningObjects; +using DumpTruck.MovementStrategy; + +namespace DumpTruck +{ + public partial class FormDumpTruck : Form + { + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningTruck? _drawningTruck; + + private AbstractStrategy? _abstractStrategy; + + /// + /// Инициализация формы + /// + public FormDumpTruck() + { + InitializeComponent(); + } + + /// + /// Метод прорисовки машины + /// + private void Draw() + { + if (_drawningTruck == null) + return; + Bitmap bmp = new(pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningTruck.DrawTransport(gr); + pictureBoxDumpTruck.Image = bmp; + } + + /// + /// Обработка нажатия кнопки "Создать truck" + /// + /// + /// + private void buttonCreateTruck_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningTruck = new DrawningTruck(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height); + _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + } + + /// + /// Изменение размеров формы + /// + /// + /// + private void buttonMove_Click(object sender, EventArgs e) + { + if (_drawningTruck == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + switch (name) + { + case "buttonUp": + _drawningTruck.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + _drawningTruck.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + _drawningTruck.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + _drawningTruck.MoveTransport(DirectionType.Right); + break; + } + Draw(); + } + + private void buttonCreateDumpTruck_Click(object sender, EventArgs e) + { + Random random = new(); + _drawningTruck = new DrawningDumpTruck(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)), + pictureBoxDumpTruck.Width, pictureBoxDumpTruck.Height); + _drawningTruck.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + + private void buttonStep_Click(object sender, EventArgs e) + { + if (_drawningTruck == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _abstractStrategy = comboBoxStrategy.SelectedIndex + switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_abstractStrategy == null) + { + return; + } + _abstractStrategy.SetData(new + DrawningObjectTruck(_drawningTruck), pictureBoxDumpTruck.Width, + pictureBoxDumpTruck.Height); + comboBoxStrategy.Enabled = false; + } + if (_abstractStrategy == null) + { + return; + } + _abstractStrategy.MakeStep(); + Draw(); + if (_abstractStrategy.GetStatus() == Status.Finish) + { + comboBoxStrategy.Enabled = true; + _abstractStrategy = null; + } + } + } +} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormDumpTruck.resx b/DumpTruck/DumpTruck/FormDumpTruck.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/DumpTruck/DumpTruck/FormDumpTruck.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormTruck.Designer.cs b/DumpTruck/DumpTruck/FormTruck.Designer.cs deleted file mode 100644 index 47c7eda..0000000 --- a/DumpTruck/DumpTruck/FormTruck.Designer.cs +++ /dev/null @@ -1,142 +0,0 @@ -namespace DumpTruck -{ - partial class FormTruck - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.btnCreate = new System.Windows.Forms.Button(); - this.btnLeft = new System.Windows.Forms.Button(); - this.btnDown = new System.Windows.Forms.Button(); - this.btnRight = new System.Windows.Forms.Button(); - this.btnUp = new System.Windows.Forms.Button(); - this.pictureBoxTruck = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTruck)).BeginInit(); - this.SuspendLayout(); - // - // btnCreate - // - this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnCreate.Location = new System.Drawing.Point(12, 426); - this.btnCreate.Name = "btnCreate"; - this.btnCreate.Size = new System.Drawing.Size(75, 23); - this.btnCreate.TabIndex = 0; - this.btnCreate.Text = "Создать"; - this.btnCreate.UseVisualStyleBackColor = true; - this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click); - // - // btnLeft - // - this.btnLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnLeft.BackgroundImage = global::DumpTruck.Properties.Resources.left; - this.btnLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnLeft.Location = new System.Drawing.Point(766, 419); - this.btnLeft.Name = "btnLeft"; - this.btnLeft.Size = new System.Drawing.Size(30, 30); - this.btnLeft.TabIndex = 1; - this.btnLeft.Text = " "; - this.btnLeft.UseVisualStyleBackColor = true; - this.btnLeft.Click += new System.EventHandler(this.btnMove_Click); - // - // btnDown - // - this.btnDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnDown.BackgroundImage = global::DumpTruck.Properties.Resources.down; - this.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnDown.Location = new System.Drawing.Point(802, 419); - this.btnDown.Name = "btnDown"; - this.btnDown.Size = new System.Drawing.Size(30, 30); - this.btnDown.TabIndex = 2; - this.btnDown.Text = " "; - this.btnDown.UseVisualStyleBackColor = true; - this.btnDown.Click += new System.EventHandler(this.btnMove_Click); - // - // btnRight - // - this.btnRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnRight.BackgroundImage = global::DumpTruck.Properties.Resources.right; - this.btnRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnRight.Location = new System.Drawing.Point(838, 419); - this.btnRight.Name = "btnRight"; - this.btnRight.Size = new System.Drawing.Size(30, 30); - this.btnRight.TabIndex = 3; - this.btnRight.Text = " "; - this.btnRight.UseVisualStyleBackColor = true; - this.btnRight.Click += new System.EventHandler(this.btnMove_Click); - // - // btnUp - // - this.btnUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnUp.BackgroundImage = global::DumpTruck.Properties.Resources.up; - this.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnUp.Location = new System.Drawing.Point(802, 383); - this.btnUp.Name = "btnUp"; - this.btnUp.Size = new System.Drawing.Size(30, 30); - this.btnUp.TabIndex = 4; - this.btnUp.Text = " "; - this.btnUp.UseVisualStyleBackColor = true; - this.btnUp.Click += new System.EventHandler(this.btnMove_Click); - // - // pictureBoxTruck - // - this.pictureBoxTruck.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxTruck.Location = new System.Drawing.Point(0, 0); - this.pictureBoxTruck.Name = "pictureBoxTruck"; - this.pictureBoxTruck.Size = new System.Drawing.Size(884, 461); - this.pictureBoxTruck.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxTruck.TabIndex = 5; - this.pictureBoxTruck.TabStop = false; - // - // FormTruck - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(884, 461); - this.Controls.Add(this.btnUp); - this.Controls.Add(this.btnRight); - this.Controls.Add(this.btnDown); - this.Controls.Add(this.btnLeft); - this.Controls.Add(this.btnCreate); - this.Controls.Add(this.pictureBoxTruck); - this.Name = "FormTruck"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "FormTruck"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTruck)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private Button btnCreate; - private Button btnLeft; - private Button btnDown; - private Button btnRight; - private Button btnUp; - private PictureBox pictureBoxTruck; - } -} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormTruck.cs b/DumpTruck/DumpTruck/FormTruck.cs deleted file mode 100644 index 584da64..0000000 --- a/DumpTruck/DumpTruck/FormTruck.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace DumpTruck -{ - public partial class FormTruck : Form - { - - private DrawingTruck? _drawningTruck; - - - private void Draw() - { - - if (_drawningTruck == null) - { - return; - } - Random rnd = new Random(); - Bitmap bmp = new(pictureBoxTruck.Width, - pictureBoxTruck.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningTruck.DrawTransport(gr, Color.FromArgb(0,255,128),Color.FromArgb(255,0,0), false, true); - pictureBoxTruck.Image = bmp; - } - - public FormTruck() - { - InitializeComponent(); - } - - private void btnCreate_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningTruck = new DrawingTruck(); - _drawningTruck.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256)), Color.FromArgb(random.Next(0,256)), pictureBoxTruck.Width, pictureBoxTruck.Height, Convert.ToBoolean(random.Next(2)), Convert.ToBoolean(random.Next(2))); - _drawningTruck.SetPosition(random.Next(1, 100), random.Next(1, 100)); - Draw(); - } - - private void btnMove_Click(object sender, EventArgs e) - { - if (_drawningTruck == null) - { - return; - } - string name = ((Button)sender)?.Name ?? string.Empty; - switch (name) - { - case "btnUp": - _drawningTruck.MoveTransport(DirectionType.Up); - break; - case "btnDown": - _drawningTruck.MoveTransport(DirectionType.Down); - break; - case "btnLeft": - _drawningTruck.MoveTransport(DirectionType.Left); - break; - case "btnRight": - _drawningTruck.MoveTransport(DirectionType.Right); - break; - } - Draw(); - } - } -} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormTruck.resx b/DumpTruck/DumpTruck/FormTruck.resx deleted file mode 100644 index f298a7b..0000000 --- a/DumpTruck/DumpTruck/FormTruck.resx +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/DumpTruck/DumpTruck/IMoveableObject.cs b/DumpTruck/DumpTruck/IMoveableObject.cs new file mode 100644 index 0000000..6792e74 --- /dev/null +++ b/DumpTruck/DumpTruck/IMoveableObject.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.MovementStrategy +{ + public interface IMoveableObject + { + /// + /// Получение координаты X объекта + /// + ObjectParameters? GetObjectPosition { get; } + /// + /// Шаг объекта + /// + int GetStep { get; } + /// + /// Проверка, можно ли переместиться по нужному направлению + /// + /// + /// + bool CheckCanMove(DirectionType direction); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(DirectionType direction); + } +} diff --git a/DumpTruck/DumpTruck/MoveToBorder.cs b/DumpTruck/DumpTruck/MoveToBorder.cs new file mode 100644 index 0000000..2a4a825 --- /dev/null +++ b/DumpTruck/DumpTruck/MoveToBorder.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DumpTruck.MovementStrategy; + +namespace DumpTruck +{ + internal class MoveToBorder : AbstractStrategy + { + protected override bool IsTargetDestinaion() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + + return objParams.RightBorder <= FieldWidth && + objParams.RightBorder + GetStep() >= FieldWidth && + objParams.DownBorder <= FieldHeight && + objParams.DownBorder + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + var diffX = objParams.RightBorder - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + var diffY = objParams.DownBorder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } + } +} diff --git a/DumpTruck/DumpTruck/MoveToCenter.cs b/DumpTruck/DumpTruck/MoveToCenter.cs new file mode 100644 index 0000000..fe0c9c4 --- /dev/null +++ b/DumpTruck/DumpTruck/MoveToCenter.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.MovementStrategy +{ + public class MoveToCenter : AbstractStrategy + { + protected override bool IsTargetDestinaion() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 && + objParams.ObjectMiddleVertical <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2; + } + protected override void MoveToTarget() + { + var objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } + } +} diff --git a/DumpTruck/DumpTruck/ObjectParameters.cs b/DumpTruck/DumpTruck/ObjectParameters.cs new file mode 100644 index 0000000..2af38ef --- /dev/null +++ b/DumpTruck/DumpTruck/ObjectParameters.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.MovementStrategy +{ + public class ObjectParameters + { + private readonly int _x; + private readonly int _y; + private readonly int _width; + private readonly int _height; + /// + /// Левая граница + /// + public int LeftBorder => _x; + /// + /// Верхняя граница + /// + public int TopBorder => _y; + /// + /// Правая граница + /// + public int RightBorder => _x + _width; + /// + /// Нижняя граница + /// + public int DownBorder => _y + _height; + + /// + /// Середина объекта + /// + public int ObjectMiddleHorizontal => _x + _width / 2; + /// + /// Середина объекта + /// + public int ObjectMiddleVertical => _y + _height / 2; + /// + /// Конструктор + /// + /// Координата X + /// Координата Y + /// Ширина + /// Высота + public ObjectParameters(int x, int y, int width, int height) + { + _x = x; + _y = y; + _width = width; + _height = height; + } + } +} diff --git a/DumpTruck/DumpTruck/Program.cs b/DumpTruck/DumpTruck/Program.cs index b5a689f..b619d5a 100644 --- a/DumpTruck/DumpTruck/Program.cs +++ b/DumpTruck/DumpTruck/Program.cs @@ -11,7 +11,7 @@ namespace DumpTruck // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormTruck()); + Application.Run(new FormDumpTruck()); } } } \ No newline at end of file diff --git a/DumpTruck/DumpTruck/Properties/Resources.Designer.cs b/DumpTruck/DumpTruck/Properties/Resources.Designer.cs index aac7e60..eb02a09 100644 --- a/DumpTruck/DumpTruck/Properties/Resources.Designer.cs +++ b/DumpTruck/DumpTruck/Properties/Resources.Designer.cs @@ -63,9 +63,9 @@ namespace DumpTruck.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap down { + internal static System.Drawing.Bitmap arrowDown { get { - object obj = ResourceManager.GetObject("down", resourceCulture); + object obj = ResourceManager.GetObject("arrowDown", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -73,9 +73,9 @@ namespace DumpTruck.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap left { + internal static System.Drawing.Bitmap arrowLeft { get { - object obj = ResourceManager.GetObject("left", resourceCulture); + object obj = ResourceManager.GetObject("arrowLeft", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -83,9 +83,9 @@ namespace DumpTruck.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap right { + internal static System.Drawing.Bitmap arrowRight { get { - object obj = ResourceManager.GetObject("right", resourceCulture); + object obj = ResourceManager.GetObject("arrowRight", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -93,9 +93,9 @@ namespace DumpTruck.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap up { + internal static System.Drawing.Bitmap arrowUp { get { - object obj = ResourceManager.GetObject("up", resourceCulture); + object obj = ResourceManager.GetObject("arrowUp", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/DumpTruck/DumpTruck/Properties/Resources.resx b/DumpTruck/DumpTruck/Properties/Resources.resx index 3d5a144..dc6b4c5 100644 --- a/DumpTruck/DumpTruck/Properties/Resources.resx +++ b/DumpTruck/DumpTruck/Properties/Resources.resx @@ -118,16 +118,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/DumpTruck/DumpTruck/Resources/arrowDown.png b/DumpTruck/DumpTruck/Resources/arrowDown.png new file mode 100644 index 0000000..c8222f8 Binary files /dev/null and b/DumpTruck/DumpTruck/Resources/arrowDown.png differ diff --git a/DumpTruck/DumpTruck/Resources/arrowLeft.png b/DumpTruck/DumpTruck/Resources/arrowLeft.png new file mode 100644 index 0000000..ff74fb3 Binary files /dev/null and b/DumpTruck/DumpTruck/Resources/arrowLeft.png differ diff --git a/DumpTruck/DumpTruck/Resources/arrowRight.png b/DumpTruck/DumpTruck/Resources/arrowRight.png new file mode 100644 index 0000000..ee722eb Binary files /dev/null and b/DumpTruck/DumpTruck/Resources/arrowRight.png differ diff --git a/DumpTruck/DumpTruck/Resources/arrowUp.png b/DumpTruck/DumpTruck/Resources/arrowUp.png new file mode 100644 index 0000000..0c80a4f Binary files /dev/null and b/DumpTruck/DumpTruck/Resources/arrowUp.png differ diff --git a/DumpTruck/DumpTruck/Resources/down.jpg b/DumpTruck/DumpTruck/Resources/down.jpg deleted file mode 100644 index aabdc4a..0000000 Binary files a/DumpTruck/DumpTruck/Resources/down.jpg and /dev/null differ diff --git a/DumpTruck/DumpTruck/Resources/left.jpg b/DumpTruck/DumpTruck/Resources/left.jpg deleted file mode 100644 index 36676e1..0000000 Binary files a/DumpTruck/DumpTruck/Resources/left.jpg and /dev/null differ diff --git a/DumpTruck/DumpTruck/Resources/right.jpg b/DumpTruck/DumpTruck/Resources/right.jpg deleted file mode 100644 index 84e1972..0000000 Binary files a/DumpTruck/DumpTruck/Resources/right.jpg and /dev/null differ diff --git a/DumpTruck/DumpTruck/Resources/up.jpg b/DumpTruck/DumpTruck/Resources/up.jpg deleted file mode 100644 index 25c56cb..0000000 Binary files a/DumpTruck/DumpTruck/Resources/up.jpg and /dev/null differ diff --git a/DumpTruck/DumpTruck/Status.cs b/DumpTruck/DumpTruck/Status.cs new file mode 100644 index 0000000..fafc078 --- /dev/null +++ b/DumpTruck/DumpTruck/Status.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DumpTruck.MovementStrategy +{ + public enum Status + { + NotInit, + + InProgress, + + Finish + } +}