diff --git a/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs deleted file mode 100644 index 8c3f28d..0000000 --- a/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs +++ /dev/null @@ -1,328 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Sockets; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectExcavator; - -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningExcavator -{ - /// - /// Класс-сущность - /// - public EntityExcavator? EntityExcavator { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки Экскаватора - /// - private int? _startPosX; - - /// - /// Верхняя кооридната прорисовки Экскаватора - /// - private int? _startPosY; - - /// - /// Ширина прорисовки Экскаватора - /// - private readonly int _drawningExcavatorWidth = 135; - - /// - /// Высота прорисовки Экскаватора - /// - private readonly int _drawningExcavatorHeight = 82; - - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия ковша - /// Признак наличия поддержки - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) - { - EntityExcavator = new EntityExcavator(); - EntityExcavator.Init(speed, weight, bodyColor, additionalColor, bucket,supports); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - //проверка, что объект "влезает" в размеры поля - if (_drawningExcavatorWidth > width || _drawningExcavatorHeight > height) - { - EntityExcavator = null; - return false; - } - - // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена - else - { - _pictureWidth = width; - _pictureHeight = height; - - if (_startPosX.HasValue && (_startPosX.Value + _drawningExcavatorWidth > _pictureWidth)) - { - _startPosX = _pictureWidth - _drawningExcavatorWidth; - } - - if (_startPosY.HasValue && (_startPosY + _drawningExcavatorHeight > _pictureHeight)) - { - _startPosY = _pictureHeight - _drawningExcavatorHeight; - } - - return true; - } - } - - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y) - { - // если при установке объекта в эти координаты, он будет "выходить" за границы формы - // то надо изменить координаты, чтобы он оставался в этих границах - _startPosX = x; - _startPosY = y; - if (_startPosX + _drawningExcavatorWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawningExcavatorWidth; - } - - if (_startPosX < 0) - { - _startPosX = 0; - } - - if (_startPosY + _drawningExcavatorHeight > _pictureHeight) - { - _startPosY = _pictureHeight - _drawningExcavatorHeight; - } - - if (_startPosY < 0) - { - _startPosY = 0; - } - } - - /// - /// Изменение направления перемещения - /// - /// Направление - /// true - перемещене выполнено, false - перемещение невозможно - public bool MoveTransport(DirectionType direction) - { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - //влево - case DirectionType.Left: - if (_startPosX.Value - EntityExcavator.Step > 0) - { - _startPosX -= (int)EntityExcavator.Step; - } - return true; - //вверх - case DirectionType.Up: - if (_startPosY.Value - EntityExcavator.Step > 0) - { - _startPosY -= (int)EntityExcavator.Step; - } - return true; - // вправо - case DirectionType.Right: - if (_startPosX.Value + EntityExcavator.Step < _pictureWidth - _drawningExcavatorWidth) - { - _startPosX += (int)EntityExcavator.Step; - } - return true; - //вниз - case DirectionType.Down: - if (_startPosY.Value + EntityExcavator.Step < _pictureHeight - _drawningExcavatorHeight) - { - _startPosY += (int)EntityExcavator.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityExcavator.AdditionalColor); - Pen blackPen = new Pen(Color.Black, 2); - Brush brBrown = new SolidBrush(Color.DarkSlateGray); - - //Ковш со стрелой - if (EntityExcavator.Bucket) - { - //стрела - Point point1 = new Point(_startPosX.Value + 70, _startPosY.Value + 11); - Point point2 = new Point(_startPosX.Value + 110, _startPosY.Value + 3); - Point point3 = new Point(_startPosX.Value + 120, _startPosY.Value + 4); - Point point4 = new Point(_startPosX.Value + 120, _startPosY.Value + 7); - Point point5 = new Point(_startPosX.Value + 70, _startPosY.Value + 28); - Point[] BucketPart1= - { - point1, - point2, - point3, - point4, - point5 - }; - g.DrawPolygon(blackPen, BucketPart1); - g.FillPolygon(additionalBrush, BucketPart1); - - Point point6 = new Point(_startPosX.Value + 112, _startPosY.Value + 2); - Point point7 = new Point(_startPosX.Value + 120, _startPosY.Value + 3); - Point point8 = new Point(_startPosX.Value + 125, _startPosY.Value + 7); - Point point9 = new Point(_startPosX.Value + 135, _startPosY.Value + 35); - Point point10 = new Point(_startPosX.Value + 132, _startPosY.Value + 35); - Point[] BucketPart2 = - { - point6, - point7, - point8, - point9, - point10 - }; - g.DrawPolygon(pen, BucketPart2); - g.FillPolygon(additionalBrush, BucketPart2); - - //ковш - Point point21 = new Point(_startPosX.Value + 130, _startPosY.Value + 35); - Point point22 = new Point(_startPosX.Value + 135, _startPosY.Value + 35); - Point point23 = new Point(_startPosX.Value + 135, _startPosY.Value + 40 ); - Point point24 = new Point(_startPosX.Value + 125, _startPosY.Value + 45); - Point point25 = new Point(_startPosX.Value + 115, _startPosY.Value + 40); - Point[] BucketPart3 = - { - point21, - point22, - point23, - point24, - point25, - }; - g.DrawPolygon(blackPen, BucketPart3); - g.FillPolygon(brBrown, BucketPart3); - - //шарниры - g.DrawEllipse(pen, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6); - g.FillEllipse(brBrown, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6); - - g.FillEllipse(brBrown, _startPosX.Value + 127, _startPosY.Value + 32, 6, 6); - } - - //контур и заливка основы - Brush br = new SolidBrush(EntityExcavator.BodyColor); - g.FillRectangle(br, _startPosX.Value + 65, _startPosY.Value + 10, 25, 25);//кабина - g.DrawRectangle(pen, _startPosX.Value + 65, _startPosY.Value + 10, 25, 25); - - g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 35, 70, 20);//основа - g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 35, 70, 20); - - Brush brBlue = new SolidBrush(Color.LightBlue); - g.FillRectangle(brBlue, _startPosX.Value + 72, _startPosY.Value + 12, 15, 15);//окно - g.DrawRectangle(pen, _startPosX.Value + 72, _startPosY.Value + 12, 15, 15); - - g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 13, 5, 22);//труба - g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 13, 5, 22); - - g.FillEllipse(brBrown, _startPosX.Value + 17, _startPosY.Value + 59, 13, 13);//большое правое колесо - g.DrawEllipse(pen, _startPosX.Value + 17, _startPosY.Value + 59, 13, 13); - - g.FillEllipse(brBrown, _startPosX.Value + 80, _startPosY.Value + 59, 13, 13);//большое левое колесо - g.DrawEllipse(pen, _startPosX.Value + 80, _startPosY.Value + 59, 13, 13); - - g.FillEllipse(brBrown, _startPosX.Value + 34, _startPosY.Value + 63, 9, 9);//среднее правое колесо - g.DrawEllipse(pen, _startPosX.Value + 34, _startPosY.Value + 63, 9, 9); - - g.FillEllipse(brBrown, _startPosX.Value + 50, _startPosY.Value + 63, 9, 9);//средние колесо в середине - g.DrawEllipse(pen, _startPosX.Value + 50, _startPosY.Value + 63, 9, 9); - - g.FillEllipse(brBrown, _startPosX.Value + 66, _startPosY.Value + 63, 9, 9);//среднее левое колесо - g.DrawEllipse(pen, _startPosX.Value + 66, _startPosY.Value + 63, 9, 9); - - g.FillEllipse(brBrown, _startPosX.Value + 44, _startPosY.Value + 59, 5, 5);//маленькое правое колесо - g.DrawEllipse(pen, _startPosX.Value + 44, _startPosY.Value + 59, 5, 5); - - g.FillEllipse(brBrown, _startPosX.Value + 59, _startPosY.Value + 59, 5, 5);//маленькое левое колесо - g.DrawEllipse(pen, _startPosX.Value + 59, _startPosY.Value + 59, 5, 5); - - //гусеницы - g.DrawArc(blackPen, _startPosX.Value + 14, _startPosY.Value + 56, 20, 20, 125, 125);//правая дуга - g.DrawArc(blackPen, _startPosX.Value + 76, _startPosY.Value + 56, 20, 20, 290, 125);//левая дуга - g.DrawLine(blackPen, _startPosX.Value + 20, _startPosY.Value + 57, _startPosX.Value + 90, _startPosY.Value + 57); - g.DrawLine(blackPen, _startPosX.Value + 19, _startPosY.Value + 74, _startPosX.Value + 91, _startPosY.Value + 74); - - // Поддержка - if (EntityExcavator.Supports) - { - Point point1 = new Point(_startPosX.Value + 22 , _startPosY.Value + 55); - Point point2 = new Point(_startPosX.Value + 22, _startPosY.Value + 50); - Point point3 = new Point(_startPosX.Value + 15, _startPosY.Value + 50); - Point point4 = new Point(_startPosX.Value + 8 , _startPosY.Value + 80); - Point point5 = new Point(_startPosX.Value, _startPosY.Value + 82); - Point point6 = new Point(_startPosX.Value + 12, _startPosY.Value + 82); - Point[] BuckePoint = - { - point1, - point2, - point3, - point4, - point5, - point6 - }; - g.DrawPolygon(pen, BuckePoint); - g.FillPolygon(additionalBrush, BuckePoint); - - g.DrawEllipse(blackPen, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6); - g.FillEllipse(brBrown, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6); - } - - - } -} diff --git a/ProjectExcavator/ProjectExcavator/DirectionType.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs similarity index 58% rename from ProjectExcavator/ProjectExcavator/DirectionType.cs rename to ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs index 20f68ec..4ad5654 100644 --- a/ProjectExcavator/ProjectExcavator/DirectionType.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs @@ -1,13 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectExcavator; +namespace ProjectExcavator.Drawnings; +/// +/// Направление перемещения +/// public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, + /// /// Вверх /// diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBaseExcavator.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBaseExcavator.cs new file mode 100644 index 0000000..b0838c6 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBaseExcavator.cs @@ -0,0 +1,270 @@ +using ProjectExcavator.Entities; + +namespace ProjectExcavator.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningBaseExcavator +{ + /// + /// Класс-сущность + /// + public EntityBaseExcavator? EntityBaseExcavator { get; protected set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки Экскаватора + /// + protected int? _startPosX; + + /// + /// Верхняя кооридната прорисовки Экскаватора + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки Экскаватора + /// + private readonly int _drawningExcavatorWidth = 78; + + /// + /// Высота прорисовки Экскаватора + /// + private readonly int _drawningExcavatorHeight = 63; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawningExcavatorWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawningExcavatorHeight; + + /// + /// Пустой конструктор + /// + private DrawningBaseExcavator() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningBaseExcavator(int speed, double weight, Color bodyColor) : this() + { + EntityBaseExcavator = new EntityBaseExcavator(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки Экскаватора + /// Высота прорисовки Экскаватора + protected DrawningBaseExcavator(int drawningExcavatorWidth, int drawningExcavatorHeight) : this() + { + _drawningExcavatorWidth = drawningExcavatorWidth; + _drawningExcavatorHeight = drawningExcavatorHeight; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + //проверка, что объект "влезает" в размеры поля + if (_drawningExcavatorWidth > width || _drawningExcavatorHeight > height) + { + EntityBaseExcavator = null; + return false; + } + + // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена + else + { + _pictureWidth = width; + _pictureHeight = height; + + if (_startPosX.HasValue && (_startPosX.Value + _drawningExcavatorWidth > _pictureWidth)) + { + _startPosX = _pictureWidth - _drawningExcavatorWidth; + } + + if (_startPosY.HasValue && (_startPosY + _drawningExcavatorHeight > _pictureHeight)) + { + _startPosY = _pictureHeight - _drawningExcavatorHeight; + } + + return true; + } + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + // если при установке объекта в эти координаты, он будет "выходить" за границы формы + // то надо изменить координаты, чтобы он оставался в этих границах + _startPosX = x; + _startPosY = y; + if (_startPosX + _drawningExcavatorWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningExcavatorWidth; + } + + if (_startPosX < 0) + { + _startPosX = 0; + } + + if (_startPosY + _drawningExcavatorHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningExcavatorHeight; + } + + if (_startPosY < 0) + { + _startPosY = 0; + } + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещене выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityBaseExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityBaseExcavator.Step > 0) + { + _startPosX -= (int)EntityBaseExcavator.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityBaseExcavator.Step > 0) + { + _startPosY -= (int)EntityBaseExcavator.Step; + } + return true; + // вправо + case DirectionType.Right: + if (_startPosX.Value + EntityBaseExcavator.Step < _pictureWidth - _drawningExcavatorWidth) + { + _startPosX += (int)EntityBaseExcavator.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY.Value + EntityBaseExcavator.Step < _pictureHeight - _drawningExcavatorHeight) + { + _startPosY += (int)EntityBaseExcavator.Step; + } + return true; + default: + return false; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityBaseExcavator == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Pen blackPen = new Pen(Color.Black, 2); + Brush brBrown = new SolidBrush(Color.DarkSlateGray); + + //контур и заливка основы + Brush br = new SolidBrush(EntityBaseExcavator.BodyColor); + g.FillRectangle(br, _startPosX.Value + 51, _startPosY.Value, 25, 25);//кабина + g.DrawRectangle(pen, _startPosX.Value + 51, _startPosY.Value, 25, 25); + + g.FillRectangle(br, _startPosX.Value + 6, _startPosY.Value + 25 , 70, 20);//основа + g.DrawRectangle(pen, _startPosX.Value + 6, _startPosY.Value + 25 , 70, 20); + + Brush brBlue = new SolidBrush(Color.LightBlue); + g.FillRectangle(brBlue, _startPosX.Value + 58 , _startPosY.Value + 2 , 15, 15);//окно + g.DrawRectangle(pen, _startPosX.Value + 58 , _startPosY.Value + 2 , 15, 15); + + g.FillRectangle(br, _startPosX.Value + 26 , _startPosY.Value + 3 , 5, 22);//труба + g.DrawRectangle(pen, _startPosX.Value + 26 , _startPosY.Value + 3 , 5, 22); + + g.FillEllipse(brBrown, _startPosX.Value + 3 , _startPosY.Value + 49 , 13, 13);//большое правое колесо + g.DrawEllipse(pen, _startPosX.Value + 3 , _startPosY.Value + 49 , 13, 13); + + g.FillEllipse(brBrown, _startPosX.Value + 66 , _startPosY.Value + 49 , 13, 13);//большое левое колесо + g.DrawEllipse(pen, _startPosX.Value + 66 , _startPosY.Value + 49 , 13, 13); + + g.FillEllipse(brBrown, _startPosX.Value + 20 , _startPosY.Value + 53 , 9, 9);//среднее правое колесо + g.DrawEllipse(pen, _startPosX.Value + 20 , _startPosY.Value + 53 , 9, 9); + + g.FillEllipse(brBrown, _startPosX.Value + 36 , _startPosY.Value + 53 , 9, 9);//средние колесо в середине + g.DrawEllipse(pen, _startPosX.Value + 36 , _startPosY.Value + 53 , 9, 9); + + g.FillEllipse(brBrown, _startPosX.Value + 52 , _startPosY.Value + 53 , 9, 9);//среднее левое колесо + g.DrawEllipse(pen, _startPosX.Value + 52, _startPosY.Value + 53 , 9, 9); + + g.FillEllipse(brBrown, _startPosX.Value + 30 , _startPosY.Value + 49 , 5, 5);//маленькое правое колесо + g.DrawEllipse(pen, _startPosX.Value + 30 , _startPosY.Value + 49 , 5, 5); + + g.FillEllipse(brBrown, _startPosX.Value + 45, _startPosY.Value + 49 , 5, 5);//маленькое левое колесо + g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 49 , 5, 5); + + //гусеницы + g.DrawArc(blackPen, _startPosX.Value , _startPosY.Value + 46 , 20, 20, 125, 125);//правая дуга + g.DrawArc(blackPen, _startPosX.Value + 62, _startPosY.Value + 46 , 20, 20, 290, 125);//левая дуга + g.DrawLine(blackPen, _startPosX.Value + 6 , _startPosY.Value + 47 , _startPosX.Value + 76 , _startPosY.Value + 47 ); + g.DrawLine(blackPen, _startPosX.Value + 6 , _startPosY.Value + 64 , _startPosX.Value + 77 , _startPosY.Value + 64 ); + + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs new file mode 100644 index 0000000..951b599 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs @@ -0,0 +1,128 @@ +using ProjectExcavator.Entities; + +namespace ProjectExcavator.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningExcavator : DrawningBaseExcavator +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия ковша + /// Признак наличия поддержки + public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base(135, 82) + { + EntityBaseExcavator = new EntityExcavator(speed, weight, bodyColor, additionalColor, bucket, supports); + } + + public override void DrawTransport(Graphics g) + { + if (EntityBaseExcavator == null|| EntityBaseExcavator is not EntityExcavator excavator || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(excavator.AdditionalColor); + Pen blackPen = new Pen(Color.Black, 2); + Brush brBrown = new SolidBrush(Color.DarkSlateGray); + + //Ковш со стрелой + if (excavator.Bucket) + { + //стрела + Point point1 = new Point(_startPosX.Value + 70, _startPosY.Value + 11); + Point point2 = new Point(_startPosX.Value + 110, _startPosY.Value + 3); + Point point3 = new Point(_startPosX.Value + 120, _startPosY.Value + 4); + Point point4 = new Point(_startPosX.Value + 120, _startPosY.Value + 7); + Point point5 = new Point(_startPosX.Value + 70, _startPosY.Value + 28); + Point[] BucketPart1 = + { + point1, + point2, + point3, + point4, + point5 + }; + g.DrawPolygon(blackPen, BucketPart1); + g.FillPolygon(additionalBrush, BucketPart1); + + Point point6 = new Point(_startPosX.Value + 112, _startPosY.Value + 2); + Point point7 = new Point(_startPosX.Value + 120, _startPosY.Value + 3); + Point point8 = new Point(_startPosX.Value + 125, _startPosY.Value + 7); + Point point9 = new Point(_startPosX.Value + 135, _startPosY.Value + 35); + Point point10 = new Point(_startPosX.Value + 132, _startPosY.Value + 35); + Point[] BucketPart2 = + { + point6, + point7, + point8, + point9, + point10 + }; + g.DrawPolygon(pen, BucketPart2); + g.FillPolygon(additionalBrush, BucketPart2); + + //ковш + Point point21 = new Point(_startPosX.Value + 130, _startPosY.Value + 35); + Point point22 = new Point(_startPosX.Value + 135, _startPosY.Value + 35); + Point point23 = new Point(_startPosX.Value + 135, _startPosY.Value + 40); + Point point24 = new Point(_startPosX.Value + 125, _startPosY.Value + 45); + Point point25 = new Point(_startPosX.Value + 115, _startPosY.Value + 40); + Point[] BucketPart3 = + { + point21, + point22, + point23, + point24, + point25, + }; + g.DrawPolygon(blackPen, BucketPart3); + g.FillPolygon(brBrown, BucketPart3); + + //шарниры + g.DrawEllipse(pen, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6); + g.FillEllipse(brBrown, _startPosX.Value + 114, _startPosY.Value + 3, 6, 6); + + g.FillEllipse(brBrown, _startPosX.Value + 127, _startPosY.Value + 32, 6, 6); + } + + _startPosX += 14; + _startPosY += 10; + base.DrawTransport(g); + _startPosX -= 14; + _startPosY -= 10; + + //поддержка + if (excavator.Supports) + { + Point point1 = new Point(_startPosX.Value + 22, _startPosY.Value + 55); + Point point2 = new Point(_startPosX.Value + 22, _startPosY.Value + 50); + Point point3 = new Point(_startPosX.Value + 15, _startPosY.Value + 50); + Point point4 = new Point(_startPosX.Value + 8, _startPosY.Value + 80); + Point point5 = new Point(_startPosX.Value, _startPosY.Value + 82); + Point point6 = new Point(_startPosX.Value + 12, _startPosY.Value + 82); + Point[] BuckePoint = + { + point1, + point2, + point3, + point4, + point5, + point6 + }; + g.DrawPolygon(pen, BuckePoint); + g.FillPolygon(additionalBrush, BuckePoint); + + g.DrawEllipse(blackPen, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6); + g.FillEllipse(brBrown, _startPosX.Value + 17, _startPosY.Value + 47, 6, 6); + } + } + +} diff --git a/ProjectExcavator/ProjectExcavator/Entities/EntityBaseExcavator.cs b/ProjectExcavator/ProjectExcavator/Entities/EntityBaseExcavator.cs new file mode 100644 index 0000000..c0fd356 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityBaseExcavator.cs @@ -0,0 +1,41 @@ +namespace ProjectExcavator.Entities; + +/// +/// Класс-сущность "Базовый Экскаватор" +/// +public class EntityBaseExcavator +{ + /// + /// Скорость + /// + 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 EntityBaseExcavator(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs b/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs new file mode 100644 index 0000000..3bb5508 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs @@ -0,0 +1,40 @@ +namespace ProjectExcavator.Entities; + +/// +/// Класс-сущность "Экскаватор" +/// +public class EntityExcavator : EntityBaseExcavator +{ + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия ковша + /// + public bool Bucket { get; private set; } + + /// + /// Признак (опция) наличия опоры для фиксации + /// + public bool Supports { get; private set; } + + + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес Экскаватора + /// Основной цвет + /// Дополнительный цвет + /// Признак (опция) наличия ковша + /// Признак (опция) наличия поддержки + + public EntityExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) : base (speed, weight,bodyColor) + { + AdditionalColor = additionalColor; + Bucket = bucket; + Supports = supports; + } +} diff --git a/ProjectExcavator/ProjectExcavator/EntityExcavator.cs b/ProjectExcavator/ProjectExcavator/EntityExcavator.cs deleted file mode 100644 index 64c297b..0000000 --- a/ProjectExcavator/ProjectExcavator/EntityExcavator.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace ProjectExcavator; - -public class EntityExcavator -{ - /// - /// Скорость - /// - 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 Bucket { get; private set; } - - /// - /// Признак (опция) наличия опоры для фиксации - /// - public bool Supports { get; private set; } - - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - - - /// - /// Инициализация полей объекта-класса спортивного автомобиля - /// - /// Скорость - /// Вес автомобиля - /// Основной цвет - /// Дополнительный цвет - /// Признак (опция) наличия ковша - - - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bucket, bool supports) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Bucket = bucket; - Supports = supports; - } -} diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs index 3512515..25b4602 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs @@ -34,6 +34,9 @@ buttonDown = new Button(); buttonUp = new Button(); buttonRight = new Button(); + ButtonCreateBaseExcavator = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -51,9 +54,9 @@ buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateExcavator.Location = new Point(12, 540); buttonCreateExcavator.Name = "buttonCreateExcavator"; - buttonCreateExcavator.Size = new Size(100, 45); + buttonCreateExcavator.Size = new Size(250, 45); buttonCreateExcavator.TabIndex = 0; - buttonCreateExcavator.Text = "Создать"; + buttonCreateExcavator.Text = "Создать усиленный экскаватор"; buttonCreateExcavator.Click += ButtonCreateExcavator_Click; // // buttonLeft @@ -104,11 +107,46 @@ buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // + // ButtonCreateBaseExcavator + // + ButtonCreateBaseExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + ButtonCreateBaseExcavator.Location = new Point(265, 540); + ButtonCreateBaseExcavator.Name = "ButtonCreateBaseExcavator"; + ButtonCreateBaseExcavator.Size = new Size(250, 45); + ButtonCreateBaseExcavator.TabIndex = 5; + ButtonCreateBaseExcavator.Text = "Создать обычный экскаватор"; + ButtonCreateBaseExcavator.Click += ButtonCreateBaseExcavator_Click; + // + // comboBoxStrategy + // + comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right; + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(741, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(151, 28); + comboBoxStrategy.TabIndex = 6; + // + // buttonStrategyStep + // + buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonStrategyStep.Location = new Point(796, 46); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(94, 30); + buttonStrategyStep.TabIndex = 7; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormExcavator // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(905, 597); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); + Controls.Add(ButtonCreateBaseExcavator); Controls.Add(buttonRight); Controls.Add(buttonUp); Controls.Add(buttonDown); @@ -129,5 +167,8 @@ private Button buttonDown; private Button buttonUp; private Button buttonRight; + private Button ButtonCreateBaseExcavator; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.cs index fefa2a2..56a58f4 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.cs @@ -1,83 +1,170 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using ProjectExcavator.Drawnings; +using ProjectExcavator.MovementStrategy; -namespace ProjectExcavator +namespace ProjectExcavator; + + +/// +/// Форма работы с объектом "Усиленный экскаватор" +/// +public partial class FormExcavator : Form { - public partial class FormExcavator : Form + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningBaseExcavator? _drawningBaseExcavator; + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + + /// + /// Конструктор формы + /// + public FormExcavator() { - private DrawningExcavator? _drawningExcavator; - public FormExcavator() + InitializeComponent(); + _strategy = null; + } + + /// + /// Метод прорисовки экскаватора + /// + private void Draw() + { + if (_drawningBaseExcavator == null) { - InitializeComponent(); + return; } - private void Draw() + Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningBaseExcavator.DrawTransport(gr); + pictureBoxExcavator.Image = bmp; + } + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + Random random = new(); + switch (type) { - if (_drawningExcavator == null) - { + case nameof(DrawningBaseExcavator): + _drawningBaseExcavator = new DrawningBaseExcavator(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(DrawningExcavator): + _drawningBaseExcavator = new DrawningExcavator(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))); + break; + default: return; - } - - Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningExcavator.DrawTransport(gr); - pictureBoxExcavator.Image = bmp; } - private void ButtonCreateExcavator_Click(object sender, EventArgs e) + _drawningBaseExcavator.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + _drawningBaseExcavator.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; + Draw(); + } + + /// + /// Обработка нажатия кнопки "Создать усиленный экскаватор" + /// + /// + /// + private void ButtonCreateExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator)); + + /// + /// Обработка нажатия "Создать обычный экскаватор" + /// + /// + /// + private void ButtonCreateBaseExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBaseExcavator)); + + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningBaseExcavator == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningBaseExcavator.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningBaseExcavator.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningBaseExcavator.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningBaseExcavator.MoveTransport(DirectionType.Right); + break; + } + + if (result) { - Random random = new(); - _drawningExcavator = new DrawningExcavator(); - _drawningExcavator.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))); - _drawningExcavator.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - _drawningExcavator.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); } + } - /// - /// Перемещение объекта по форме (нажатие кнопок навигации) - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) + + /// + /// Обработка нажатия кнопки "Шаг" + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningBaseExcavator == null) { - if (_drawningExcavator == null) + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) { return; } + _strategy.SetData(new MoveableBaseExcavator(_drawningBaseExcavator), pictureBoxExcavator.Width, pictureBoxExcavator.Height); + } - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningExcavator.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningExcavator.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningExcavator.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningExcavator.MoveTransport(DirectionType.Right); - break; - } + if (_strategy == null) + { + return; + } - if (result) - { - Draw(); - } + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; } } } diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/AbstractStrategy.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..6e5e07c --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,139 @@ +namespace ProjectExcavator.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/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..54054a2 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,24 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Интерфейс для работы с перемещаемым объектом +/// +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToBorder.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..7eedff9 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,54 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Стратегия перемещения объекта в правый нижний угол экрана +/// +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + + return objParams.RightBorder + GetStep() >= FieldWidth + && objParams.DownBorder + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + + int diffX = objParams.ObjectMiddleHorizontal - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + + int diffY = objParams.ObjectMiddleVertical - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..195aca6 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,56 @@ +namespace ProjectExcavator.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/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBaseExcavator.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBaseExcavator.cs new file mode 100644 index 0000000..8d92e83 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBaseExcavator.cs @@ -0,0 +1,64 @@ +using ProjectExcavator.Drawnings; + +namespace ProjectExcavator.MovementStrategy; + +/// +/// Класс-реализация IMoveableObject с использованием DrawningBaseExcavator +/// +public class MoveableBaseExcavator : IMoveableObject +{ + /// + /// Поле-объект класса DrawningBaseExcavator или его наследника + /// + private readonly DrawningBaseExcavator? _baseExcavator = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningBaseExcavator + public MoveableBaseExcavator(DrawningBaseExcavator baseExcavator) + { + _baseExcavator = baseExcavator; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_baseExcavator == null || _baseExcavator.EntityBaseExcavator == null || !_baseExcavator.GetPosX.HasValue || !_baseExcavator.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_baseExcavator.GetPosX.Value, _baseExcavator.GetPosY.Value, _baseExcavator.GetWidth, _baseExcavator.GetHeight); + } + } + + public int GetStep => (int)(_baseExcavator?.EntityBaseExcavator?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_baseExcavator == null || _baseExcavator.EntityBaseExcavator == null) + { + return false; + } + + return _baseExcavator.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/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..01bd25c --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs @@ -0,0 +1,28 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Направление перемещения +/// +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} + diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..b4de208 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,72 @@ +namespace ProjectExcavator.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/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..a2f1191 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,22 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +}