From 2dc0f239caa8797ab918ef65d214dcbbaea1743b Mon Sep 17 00:00:00 2001 From: insideq Date: Wed, 14 Feb 2024 22:56:16 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectExcavator/DrawningExcavator.cs | 276 ------------------ .../{ => Drawnings}/DirectionType.cs | 2 +- .../Drawnings/DrawningBulldozer.cs | 240 +++++++++++++++ .../Drawnings/DrawningExcavator.cs | 88 ++++++ .../Entities/EntityBulldozer.cs | 39 +++ .../Entities/EntityExcavator.cs | 35 +++ .../ProjectExcavator/EntityExcavator.cs | 67 ----- .../FormExcavator.Designer.cs | 49 ++-- .../ProjectExcavator/FormExcavator.cs | 57 +++- 9 files changed, 476 insertions(+), 377 deletions(-) delete mode 100644 ProjectExcavator/ProjectExcavator/DrawningExcavator.cs rename ProjectExcavator/ProjectExcavator/{ => Drawnings}/DirectionType.cs (90%) create mode 100644 ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs create mode 100644 ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs create mode 100644 ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs create mode 100644 ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs delete mode 100644 ProjectExcavator/ProjectExcavator/EntityExcavator.cs diff --git a/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs deleted file mode 100644 index 102e984..0000000 --- a/ProjectExcavator/ProjectExcavator/DrawningExcavator.cs +++ /dev/null @@ -1,276 +0,0 @@ -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 _drawingExcWidth = 120; //дописать ширина - - /// - /// Высота прорисовки автомобиля - /// - private readonly int _drawingExcHeight = 70; //дописать высота - - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия опор - /// Признак наличия ковша - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool prop, bool ladle) - { - EntityExcavator = new EntityExcavator(); - EntityExcavator.Init(speed, weight, bodyColor, additionalColor, bodyKit, prop, ladle); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - //TODO проверка, что объект "влезает" в размеры поля - //если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена - if(_drawingExcWidth > width || _drawingExcHeight > height) { - return false; - } - - _pictureWidth = width; - _pictureHeight = height; - if (_startPosX.HasValue || _startPosY.HasValue) - { - if (_startPosX + _drawingExcWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawingExcWidth; - } - else if (_startPosX < 0) _startPosX = 0; - if (_startPosY + _drawingExcHeight > _pictureHeight) - { - _startPosY = _pictureHeight - _drawingExcHeight; - } - else if (_startPosY < 0) _startPosY = 0; - } - return true; - } - - /// - /// Установка позиции - /// - /// Координата X - /// Координата Y - public void SetPosition(int x, int y, int width, int height) - { - if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) - { - return; - } - - //TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы - //то надо изменить координаты, чтобы он оставался в этих границах - if (x + _drawingExcWidth > _pictureWidth) - { - _startPosX = _pictureWidth - _drawingExcWidth; - } - else if (x < 0) _startPosX = 0; - else _startPosX = x; - - if (y + _drawingExcHeight > _pictureHeight) - { - _startPosY = _pictureHeight - _drawingExcHeight; - } - else if (y < 0) _startPosY = 0; - else _startPosY = y; - } - - /// - /// Изменение направления движения - /// - /// Направление - /// 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 + EntityExcavator.Step < _pictureWidth - _drawingExcWidth) - { - _startPosX += (int)EntityExcavator.Step; - } - return true; - //вниз - case DirectionType.Down: - if(_startPosY + EntityExcavator.Step < _pictureHeight - _drawingExcHeight) - { - _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); - - //обвесы - if (EntityExcavator.Prop) - { - //Опоры - //справа - g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 40, 11, 3); - g.DrawRectangle(pen, _startPosX.Value + 87, _startPosY.Value + 43, 5, 25); - g.DrawRectangle(pen, _startPosX.Value + 84, _startPosY.Value + 68, 11, 3); - - //слева - g.DrawRectangle(pen, _startPosX.Value + 6, _startPosY.Value + 40, 13, 3); - g.DrawRectangle(pen, _startPosX.Value + 4, _startPosY.Value + 43, 5, 25); - g.DrawRectangle(pen, _startPosX.Value + 1, _startPosY.Value + 68, 11, 3); - - //покраска справа - g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 40, 11, 3); - g.FillRectangle(additionalBrush, _startPosX.Value + 87, _startPosY.Value + 43, 5, 25); - g.FillRectangle(additionalBrush, _startPosX.Value + 84, _startPosY.Value + 68, 11, 3); - - //покраска слева - g.FillRectangle(additionalBrush, _startPosX.Value + 6, _startPosY.Value + 40, 13, 3); - g.FillRectangle(additionalBrush, _startPosX.Value + 4, _startPosY.Value + 43, 5, 25); - g.FillRectangle(additionalBrush, _startPosX.Value + 1, _startPosY.Value + 68, 11, 3); - } - - if (EntityExcavator.Ladle) - { - //Ковш - //ковш(стрела) - g.DrawRectangle(pen, _startPosX.Value + 77, _startPosY.Value + 17, 14, 8); - g.DrawRectangle(pen, _startPosX.Value + 91, _startPosY.Value + 9, 20, 7); - g.DrawRectangle(pen, _startPosX.Value + 111, _startPosY.Value + 17, 9, 20); - - Point[] pointsLadle = - { - new Point(_startPosX.Value + 120, _startPosY.Value + 37), - new Point(_startPosX.Value + 104, _startPosY.Value + 54), - new Point(_startPosX.Value + 120, _startPosY.Value + 54), - }; - g.FillPolygon(additionalBrush, pointsLadle); - g.DrawPolygon(pen, pointsLadle); - - //покраска - g.FillRectangle(additionalBrush, _startPosX.Value + 77, _startPosY.Value + 17, 14, 8); - g.FillRectangle(additionalBrush, _startPosX.Value + 91, _startPosY.Value + 9, 20, 7); - g.FillRectangle(additionalBrush, _startPosX.Value + 111, _startPosY.Value + 17, 9, 20); - } - - //Границы экскаватора - g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 25, /*длина*/60, /*ширина*/20); //главная нижняя - g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 10, 5, 15); - g.DrawRectangle(pen, _startPosX.Value + 55, _startPosY.Value + 3, 22, 22); //кабина - - Brush br = new SolidBrush(EntityExcavator.BodyColor); - - g.FillRectangle(br, _startPosX.Value + 21, _startPosY.Value + 26, 59, 19); - g.FillRectangle(br, _startPosX.Value + 36, _startPosY.Value + 11, 4, 14); - - Brush brBlue = new SolidBrush(Color.PowderBlue); - g.FillRectangle(brBlue, _startPosX.Value + 56, _startPosY.Value + 4, 21, 21); - - //ручка для катков - Pen penEllip = new Pen(Color.Black); - penEllip.Width = 2; - - //гусеницы (катки) - g.DrawEllipse(pen, _startPosX.Value + 15, _startPosY.Value + 47, 17, 17); - g.DrawEllipse(pen, _startPosX.Value + 63, _startPosY.Value + 47, 17, 17); - - //гусеницы (гуценица) - g.DrawRectangle(pen, _startPosX.Value + 24, _startPosY.Value + 47, 48, 17); - - //закрашивание катков - Brush brWhite = new SolidBrush(Color.White); - g.FillEllipse(brWhite, _startPosX.Value + 15, _startPosY.Value + 47, 17, 17); - g.FillEllipse(brWhite, _startPosX.Value + 63, _startPosY.Value + 47, 17, 17); - - //жирные круги - g.DrawEllipse(penEllip, _startPosX.Value + 15, _startPosY.Value + 47, 17, 17); - g.DrawEllipse(penEllip, _startPosX.Value + 63, _startPosY.Value + 47, 17, 17); - - //маленькие катки (верхние) - g.DrawEllipse(penEllip, _startPosX.Value + 40, _startPosY.Value + 48, 5, 5); - g.DrawEllipse(penEllip, _startPosX.Value + 50, _startPosY.Value + 48, 5, 5); - - //нижние катки - g.DrawEllipse(penEllip, _startPosX.Value + 34, _startPosY.Value + 55, 8, 8); - g.DrawEllipse(penEllip, _startPosX.Value + 44, _startPosY.Value + 55, 8, 8); - g.DrawEllipse(penEllip, _startPosX.Value + 54, _startPosY.Value + 55, 8, 8); - - } -} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/DirectionType.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs similarity index 90% rename from ProjectExcavator/ProjectExcavator/DirectionType.cs rename to ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs index 417fbd5..cb7f6cf 100644 --- a/ProjectExcavator/ProjectExcavator/DirectionType.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ProjectExcavator; +namespace ProjectExcavator.Drawnings; /// /// Направление перемещения diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs new file mode 100644 index 0000000..8005728 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs @@ -0,0 +1,240 @@ +using ProjectExcavator.Entities; + +namespace ProjectExcavator.Drawnings; + +public class DrawningBulldozer +{ + /// + /// Класс-сущность + /// + public EntityBulldozer? EntityBulldozer { get; protected set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки автомобиля + /// + protected int? _startPosX; + + /// + /// Верхняя координата прорисовки автомобиля + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки автомобиля + /// + private readonly int _drawingExcWidth = 80; //дописать ширина + + /// + /// Высота прорисовки автомобиля + /// + private readonly int _drawingExcHeight = 61; //дописать высота + + /// + /// Пустой конструктор + /// + private DrawningBulldozer() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningBulldozer(int speed, double weight, Color bodyColor) : this() + { + EntityBulldozer = new EntityBulldozer(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawningBulldozer(int drawingExcWidth, int drawingExcHeight) : this() + { + _drawingExcWidth = drawingExcWidth; + _pictureHeight = drawingExcHeight; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + //TODO проверка, что объект "влезает" в размеры поля + //если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена + if (_drawingExcWidth > width || _drawingExcHeight > height) + { + return false; + } + + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX.HasValue || _startPosY.HasValue) + { + if (_startPosX + _drawingExcWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawingExcWidth; + } + else if (_startPosX < 0) _startPosX = 0; + if (_startPosY + _drawingExcHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawingExcHeight; + } + else if (_startPosY < 0) _startPosY = 0; + } + return true; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y, int width, int height) + { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + + //TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы + //то надо изменить координаты, чтобы он оставался в этих границах + if (x + _drawingExcWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawingExcWidth; + } + else if (x < 0) _startPosX = 0; + else _startPosX = x; + + if (y + _drawingExcHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawingExcHeight; + } + else if (y < 0) _startPosY = 0; + else _startPosY = y; + } + + /// + /// Изменение направления движения + /// + /// Направление + /// true - перемещение выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityBulldozer == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityBulldozer.Step > 0) + { + _startPosX -= (int)EntityBulldozer.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityBulldozer.Step > 0) + { + _startPosY -= (int)EntityBulldozer.Step; + } + return true; + //вправо + case DirectionType.Right: + if (_startPosX + EntityBulldozer.Step < _pictureWidth - _drawingExcWidth) + { + _startPosX += (int)EntityBulldozer.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY + EntityBulldozer.Step < _pictureHeight - _drawingExcHeight) + { + _startPosY += (int)EntityBulldozer.Step; + } + return true; + default: + return false; + } + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityBulldozer == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + + //Границы экскаватора + g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 22, /*длина*/60, /*ширина*/20); //главная нижняя + g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 7, 5, 15); + g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value, 22, 22); //кабина + + Brush br = new SolidBrush(EntityBulldozer.BodyColor); + + g.FillRectangle(br, _startPosX.Value + 6, _startPosY.Value + 23, 59, 19); + g.FillRectangle(br, _startPosX.Value + 21, _startPosY.Value + 8, 4, 14); + + Brush brBlue = new SolidBrush(Color.PowderBlue); + g.FillRectangle(brBlue, _startPosX.Value + 41, _startPosY.Value + 1, 21, 21); + + //ручка для катков + Pen penEllip = new Pen(Color.Black); + penEllip.Width = 2; + + //гусеницы (катки) + g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 44, 17, 17); + g.DrawEllipse(pen, _startPosX.Value + 48, _startPosY.Value + 44, 17, 17); + + //гусеницы (гуценица) + g.DrawRectangle(pen, _startPosX.Value + 9, _startPosY.Value + 44, 48, 17); + + //закрашивание катков + Brush brWhite = new SolidBrush(Color.White); + g.FillEllipse(brWhite, _startPosX.Value, _startPosY.Value + 44, 17, 17); + g.FillEllipse(brWhite, _startPosX.Value + 48, _startPosY.Value + 44, 17, 17); + + //жирные круги + g.DrawEllipse(penEllip, _startPosX.Value, _startPosY.Value + 44, 17, 17); + g.DrawEllipse(penEllip, _startPosX.Value + 48, _startPosY.Value + 44, 17, 17); + + //маленькие катки (верхние) + g.DrawEllipse(penEllip, _startPosX.Value + 25, _startPosY.Value + 45, 5, 5); + g.DrawEllipse(penEllip, _startPosX.Value + 35, _startPosY.Value + 45, 5, 5); + + //нижние катки + g.DrawEllipse(penEllip, _startPosX.Value + 19, _startPosY.Value + 52, 8, 8); + g.DrawEllipse(penEllip, _startPosX.Value + 29, _startPosY.Value + 52, 8, 8); + g.DrawEllipse(penEllip, _startPosX.Value + 39, _startPosY.Value + 52, 8, 8); + + } +} diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs new file mode 100644 index 0000000..78fe878 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs @@ -0,0 +1,88 @@ +using ProjectExcavator.Entities; +using System.Net.Sockets; + +namespace ProjectExcavator.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningExcavator : DrawningBulldozer +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия опор + /// Признак наличия ковша + public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool prop, bool ladle) : base(120, 70) + { + EntityBulldozer = new EntityExcavator(speed, weight, bodyColor, additionalColor, prop, ladle); + } //ДОПИСАТЬ!!!!!!!!!!!!!!!!!!!!!!!!! + + public override void DrawTransport(Graphics g) + { + if (EntityBulldozer == null || EntityBulldozer is not EntityExcavator excavator || !_startPosX.HasValue || !_startPosX.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(excavator.AdditionalColor); + + if (excavator.Prop) + { + //Опоры + //справа + g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 40, 11, 3); + g.DrawRectangle(pen, _startPosX.Value + 87, _startPosY.Value + 43, 5, 25); + g.DrawRectangle(pen, _startPosX.Value + 84, _startPosY.Value + 68, 11, 3); + + //слева + g.DrawRectangle(pen, _startPosX.Value + 6, _startPosY.Value + 40, 13, 3); + g.DrawRectangle(pen, _startPosX.Value + 4, _startPosY.Value + 43, 5, 25); + g.DrawRectangle(pen, _startPosX.Value + 1, _startPosY.Value + 68, 11, 3); + + //покраска справа + g.FillRectangle(additionalBrush, _startPosX.Value + 80, _startPosY.Value + 40, 11, 3); + g.FillRectangle(additionalBrush, _startPosX.Value + 87, _startPosY.Value + 43, 5, 25); + g.FillRectangle(additionalBrush, _startPosX.Value + 84, _startPosY.Value + 68, 11, 3); + + //покраска слева + g.FillRectangle(additionalBrush, _startPosX.Value + 6, _startPosY.Value + 40, 13, 3); + g.FillRectangle(additionalBrush, _startPosX.Value + 4, _startPosY.Value + 43, 5, 25); + g.FillRectangle(additionalBrush, _startPosX.Value + 1, _startPosY.Value + 68, 11, 3); + } + + if (excavator.Ladle) + { + //Ковш + //ковш(стрела) + g.DrawRectangle(pen, _startPosX.Value + 77, _startPosY.Value + 17, 14, 8); + g.DrawRectangle(pen, _startPosX.Value + 91, _startPosY.Value + 9, 20, 7); + g.DrawRectangle(pen, _startPosX.Value + 111, _startPosY.Value + 17, 9, 20); + + Point[] pointsLadle = + { + new Point(_startPosX.Value + 120, _startPosY.Value + 37), + new Point(_startPosX.Value + 104, _startPosY.Value + 54), + new Point(_startPosX.Value + 120, _startPosY.Value + 54), + }; + g.FillPolygon(additionalBrush, pointsLadle); + g.DrawPolygon(pen, pointsLadle); + + //покраска + g.FillRectangle(additionalBrush, _startPosX.Value + 77, _startPosY.Value + 17, 14, 8); + g.FillRectangle(additionalBrush, _startPosX.Value + 91, _startPosY.Value + 9, 20, 7); + g.FillRectangle(additionalBrush, _startPosX.Value + 111, _startPosY.Value + 17, 9, 20); + } + + _startPosX += 15; + _startPosY += 3; + base.DrawTransport(g); + _startPosX -= 15; + _startPosY -= 3; + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs b/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs new file mode 100644 index 0000000..a0ba79e --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs @@ -0,0 +1,39 @@ +namespace ProjectExcavator.Entities; +/// +/// Класс-сущность "Бульдозер" +/// +public class EntityBulldozer +{ + /// + /// Скорость + /// + 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 EntityBulldozer(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..ae6af3f --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs @@ -0,0 +1,35 @@ +namespace ProjectExcavator.Entities; +/// +/// Класс-сущность "Экскаватор" +/// +public class EntityExcavator : EntityBulldozer +{ + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак наличия опор + /// + public bool Prop { get; private set; } + + /// + /// Признак наличия ковша + /// + public bool Ladle { get; private set; } + + /// + /// Инициализация полей объекта-класса экскаватора + /// + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия опор + /// Признак наличия ковша + public EntityExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool prop, bool ladle) : base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + Prop = prop; + Ladle = ladle; + } +} diff --git a/ProjectExcavator/ProjectExcavator/EntityExcavator.cs b/ProjectExcavator/ProjectExcavator/EntityExcavator.cs deleted file mode 100644 index b131d5f..0000000 --- a/ProjectExcavator/ProjectExcavator/EntityExcavator.cs +++ /dev/null @@ -1,67 +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 BodyKit { get; private set; } - - /// - /// Признак наличия опор - /// - public bool Prop { get; private set; } - - /// - /// Признак наличия ковша - /// - public bool Ladle { get; private set; } - - /// - /// Шаг перемещения экскаватора - /// - public double Step => Speed * 100 / Weight; - - /// - /// - /// - /// Скорсть - /// Вес экскаватора - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия опор - /// Признак наличия ковша - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool prop, bool ladle) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - BodyKit = bodyKit; - Prop = prop; - Ladle = ladle; - } -} diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs index 996a49f..e614414 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs @@ -29,11 +29,12 @@ private void InitializeComponent() { pictureBoxExcavator = new PictureBox(); - buttonCreate = new Button(); + buttonCreateExcavator = new Button(); buttonLeft = new Button(); buttonRight = new Button(); buttonDown = new Button(); buttonUp = new Button(); + buttonCreateBulldozer = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -45,17 +46,17 @@ pictureBoxExcavator.TabIndex = 0; pictureBoxExcavator.TabStop = false; // - // buttonCreate + // buttonCreateExcavator // - buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.BackColor = SystemColors.Control; - buttonCreate.Location = new Point(12, 569); - buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(75, 23); - buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; - buttonCreate.UseVisualStyleBackColor = false; - buttonCreate.Click += buttonCreate_Click; + buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateExcavator.BackColor = SystemColors.Control; + buttonCreateExcavator.Location = new Point(12, 569); + buttonCreateExcavator.Name = "buttonCreateExcavator"; + buttonCreateExcavator.Size = new Size(198, 23); + buttonCreateExcavator.TabIndex = 1; + buttonCreateExcavator.Text = "Создать экскаватор"; + buttonCreateExcavator.UseVisualStyleBackColor = false; + buttonCreateExcavator.Click += ButtonCreateExcavator_Click; // // buttonLeft // @@ -67,7 +68,7 @@ buttonLeft.Size = new Size(35, 35); buttonLeft.TabIndex = 2; buttonLeft.UseVisualStyleBackColor = true; - buttonLeft.Click += buttonMove_Click; + buttonLeft.Click += ButtonMove_Click; // // buttonRight // @@ -79,7 +80,7 @@ buttonRight.Size = new Size(35, 35); buttonRight.TabIndex = 3; buttonRight.UseVisualStyleBackColor = true; - buttonRight.Click += buttonMove_Click; + buttonRight.Click += ButtonMove_Click; // // buttonDown // @@ -91,7 +92,7 @@ buttonDown.Size = new Size(35, 35); buttonDown.TabIndex = 4; buttonDown.UseVisualStyleBackColor = true; - buttonDown.Click += buttonMove_Click; + buttonDown.Click += ButtonMove_Click; // // buttonUp // @@ -103,18 +104,31 @@ buttonUp.Size = new Size(35, 35); buttonUp.TabIndex = 5; buttonUp.UseVisualStyleBackColor = true; - buttonUp.Click += buttonMove_Click; + buttonUp.Click += ButtonMove_Click; + // + // buttonCreateBulldozer + // + buttonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateBulldozer.BackColor = SystemColors.Control; + buttonCreateBulldozer.Location = new Point(225, 569); + buttonCreateBulldozer.Name = "buttonCreateBulldozer"; + buttonCreateBulldozer.Size = new Size(198, 23); + buttonCreateBulldozer.TabIndex = 6; + buttonCreateBulldozer.Text = "Создать бульдозер"; + buttonCreateBulldozer.UseVisualStyleBackColor = false; + buttonCreateBulldozer.Click += ButtonCreateBulldozer_Click; // // FormExcavator // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(931, 604); + Controls.Add(buttonCreateBulldozer); Controls.Add(buttonUp); Controls.Add(buttonDown); Controls.Add(buttonRight); Controls.Add(buttonLeft); - Controls.Add(buttonCreate); + Controls.Add(buttonCreateExcavator); Controls.Add(pictureBoxExcavator); Name = "FormExcavator"; Text = "Экскаватор"; @@ -125,10 +139,11 @@ #endregion private PictureBox pictureBoxExcavator; - private Button buttonCreate; + private Button buttonCreateExcavator; private Button buttonLeft; private Button buttonRight; private Button buttonDown; private Button buttonUp; + private Button buttonCreateBulldozer; } } \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.cs index a53f52d..6403319 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.cs @@ -1,8 +1,10 @@ -namespace ProjectExcavator; +using ProjectExcavator.Drawnings; + +namespace ProjectExcavator; public partial class FormExcavator : Form { - private DrawningExcavator? _drawningExcavator; + private DrawningBulldozer? _drawningBulldozer; public FormExcavator() { InitializeComponent(); @@ -10,34 +12,56 @@ public partial class FormExcavator : Form private void Draw() { - if (_drawningExcavator == null) + if (_drawningBulldozer == null) { return; } Bitmap bmp = new(pictureBoxExcavator.Width, pictureBoxExcavator.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningExcavator.DrawTransport(gr); + _drawningBulldozer.DrawTransport(gr); pictureBoxExcavator.Image = bmp; } - private void buttonCreate_Click(object sender, EventArgs e) + private void CreateObject(string type) { Random random = new(); - _drawningExcavator = new DrawningExcavator(); - _drawningExcavator.Init(random.Next(100, 300), random.Next(1000, 3000), + switch (type) + { + case nameof(DrawningBulldozer): + _drawningBulldozer = new DrawningBulldozer(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): + _drawningBulldozer = 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)), Convert.ToBoolean(random.Next(0, 2))); - _drawningExcavator.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); - _drawningExcavator.SetPosition(random.Next(10,100), random.Next(10,100), pictureBoxExcavator.Width, pictureBoxExcavator.Height); + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + + _drawningBulldozer.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); + _drawningBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxExcavator.Width, pictureBoxExcavator.Height); Draw(); } - private void buttonMove_Click(object sender, EventArgs e) + private void ButtonCreateExcavator_Click(object sender, EventArgs e) { - if(_drawningExcavator == null) + CreateObject(nameof(DrawningExcavator)); + } + + + private void ButtonCreateBulldozer_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningBulldozer)); + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningBulldozer == null) { return; } @@ -47,16 +71,16 @@ public partial class FormExcavator : Form switch (name) { case "buttonUp": - result = _drawningExcavator.MoveTransport(DirectionType.Up); + result = _drawningBulldozer.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningExcavator.MoveTransport(DirectionType.Down); + result = _drawningBulldozer.MoveTransport(DirectionType.Down); break; case "buttonRight": - result = _drawningExcavator.MoveTransport(DirectionType.Right); + result = _drawningBulldozer.MoveTransport(DirectionType.Right); break; case "buttonLeft": - result = _drawningExcavator.MoveTransport(DirectionType.Left); + result = _drawningBulldozer.MoveTransport(DirectionType.Left); break; } @@ -65,4 +89,5 @@ public partial class FormExcavator : Form Draw(); } } + } -- 2.25.1 From a67ac47ff3d0a5810abb9162253278e960731426 Mon Sep 17 00:00:00 2001 From: insideq Date: Sun, 18 Feb 2024 13:26:32 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DirectionType.cs | 5 + .../Drawnings/DrawningBulldozer.cs | 26 +++- .../Drawnings/DrawningExcavator.cs | 3 +- .../FormExcavator.Designer.cs | 26 ++++ .../ProjectExcavator/FormExcavator.cs | 65 +++++++++ .../MovementStrategy/AbstractStrategy.cs | 137 ++++++++++++++++++ .../MovementStrategy/IMoveableObject.cs | 21 +++ .../MovementStrategy/MoveToBorder.cs | 51 +++++++ .../MovementStrategy/MoveToCenter.cs | 54 +++++++ .../MovementStrategy/MoveableBulldozer.cs | 64 ++++++++ .../MovementStrategy/MovementDirection.cs | 27 ++++ .../MovementStrategy/ObjectParameters.cs | 72 +++++++++ .../MovementStrategy/StrategyStatus.cs | 22 +++ 13 files changed, 568 insertions(+), 5 deletions(-) create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/AbstractStrategy.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToBorder.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBulldozer.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs create mode 100644 ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs index cb7f6cf..adb0851 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DirectionType.cs @@ -5,6 +5,11 @@ /// public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, + /// /// Вверх /// diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs index 8005728..65b2d32 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs @@ -32,12 +32,32 @@ public class DrawningBulldozer /// /// Ширина прорисовки автомобиля /// - private readonly int _drawingExcWidth = 80; //дописать ширина + private readonly int _drawingExcWidth = 65; /// /// Высота прорисовки автомобиля /// - private readonly int _drawingExcHeight = 61; //дописать высота + private readonly int _drawingExcHeight = 61; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawingExcWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawingExcHeight; /// /// Пустой конструктор @@ -69,7 +89,7 @@ public class DrawningBulldozer protected DrawningBulldozer(int drawingExcWidth, int drawingExcHeight) : this() { _drawingExcWidth = drawingExcWidth; - _pictureHeight = drawingExcHeight; + _drawingExcHeight = drawingExcHeight; } /// diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs index 78fe878..b3f3e6a 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs @@ -1,5 +1,4 @@ using ProjectExcavator.Entities; -using System.Net.Sockets; namespace ProjectExcavator.Drawnings; @@ -20,7 +19,7 @@ public class DrawningExcavator : DrawningBulldozer public DrawningExcavator(int speed, double weight, Color bodyColor, Color additionalColor, bool prop, bool ladle) : base(120, 70) { EntityBulldozer = new EntityExcavator(speed, weight, bodyColor, additionalColor, prop, ladle); - } //ДОПИСАТЬ!!!!!!!!!!!!!!!!!!!!!!!!! + } public override void DrawTransport(Graphics g) { diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs index e614414..bf47ad7 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs @@ -35,6 +35,8 @@ buttonDown = new Button(); buttonUp = new Button(); buttonCreateBulldozer = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit(); SuspendLayout(); // @@ -118,11 +120,33 @@ buttonCreateBulldozer.UseVisualStyleBackColor = false; buttonCreateBulldozer.Click += ButtonCreateBulldozer_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(798, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(121, 23); + comboBoxStrategy.TabIndex = 7; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(844, 41); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(75, 23); + buttonStrategyStep.TabIndex = 8; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormExcavator // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(931, 604); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreateBulldozer); Controls.Add(buttonUp); Controls.Add(buttonDown); @@ -145,5 +169,7 @@ private Button buttonDown; private Button buttonUp; private Button buttonCreateBulldozer; + 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 6403319..1b9b10f 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavator.cs @@ -1,15 +1,32 @@ using ProjectExcavator.Drawnings; +using ProjectExcavator.MovementStrategy; namespace ProjectExcavator; public partial class FormExcavator : Form { + /// + /// Поле-объект для прорисовки объекта + /// private DrawningBulldozer? _drawningBulldozer; + + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + + /// + /// Конструктор формы + /// public FormExcavator() { InitializeComponent(); + _strategy = null; } + /// + /// Метод прорисовки Бульдозера + /// private void Draw() { if (_drawningBulldozer == null) @@ -23,6 +40,10 @@ public partial class FormExcavator : Form pictureBoxExcavator.Image = bmp; } + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта private void CreateObject(string type) { Random random = new(); @@ -44,6 +65,8 @@ public partial class FormExcavator : Form _drawningBulldozer.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height); _drawningBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxExcavator.Width, pictureBoxExcavator.Height); + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } @@ -90,4 +113,46 @@ public partial class FormExcavator : Form } } + /// + /// Обработка нажатия кнопки "Шаг" + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningBulldozer == null) + { + return; + } + + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + if (_strategy == null) + { + return; + } + _strategy.SetData(new MoveableBulldozer(_drawningBulldozer), pictureBoxExcavator.Width, pictureBoxExcavator.Height); + } + + if(_strategy == null) + { + return; + } + + 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..ccb5cc3 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,137 @@ +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 (IsTargetDestination()) + { + _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 IsTargetDestination(); + + + private bool MoveTo(MovementDirection movementDirection) + { + if (_state != StrategyStatus.InProgress) + { + return false; + } + + return _moveableObject?.TryMoveObject(movementDirection) ?? false; + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..a96bd5d --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,21 @@ +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..e0b170d --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,51 @@ +namespace ProjectExcavator.MovementStrategy; + +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestination() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + + return objParams.RightBorder - GetStep() <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth && + objParams.DownBorder - GetStep() <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight; + } + + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + + int diffX = objParams.RightBorder - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + + int diffY = objParams.DownBorder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..ce47061 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,54 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Стратегия перемещения объекта в центр экрана +/// +public class MoveToCenter : AbstractStrategy +{ + protected override bool IsTargetDestination() + { + 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/MoveableBulldozer.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBulldozer.cs new file mode 100644 index 0000000..ed9e4d2 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MoveableBulldozer.cs @@ -0,0 +1,64 @@ +using ProjectExcavator.Drawnings; + +namespace ProjectExcavator.MovementStrategy; + +/// +/// Класс-реализация IMoveableObject с использованием DrawningBulldozer +/// +public class MoveableBulldozer : IMoveableObject +{ + /// + /// Поле-объект класса DrawningBulldozer или его наследника + /// + private readonly DrawningBulldozer? _bulldozer = null; + + /// + /// Конструктор + /// + /// Объект класса DrawningBulldozer + public MoveableBulldozer(DrawningBulldozer bulldozer) + { + _bulldozer = bulldozer; + } + + public ObjectParameters? GetObjectPosition + { + get + { + if (_bulldozer == null || _bulldozer.EntityBulldozer == null || !_bulldozer.GetPosX.HasValue || !_bulldozer.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_bulldozer.GetPosX.Value, _bulldozer.GetPosY.Value, _bulldozer.GetWidth, _bulldozer.GetHeight); + } + } + + public int GetStep => (int)(_bulldozer?.EntityBulldozer?.Step ?? 0); + + public bool TryMoveObject(MovementDirection direction) + { + if (_bulldozer == null || _bulldozer.EntityBulldozer == null) + { + return false; + } + + return _bulldozer.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, + }; + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..f6651a1 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/MovementDirection.cs @@ -0,0 +1,27 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Направление перемещения +/// +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..c0c0b50 --- /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; + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs b/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..eb706e9 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,22 @@ +namespace ProjectExcavator.MovementStrategy; + +/// +/// Статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +} \ No newline at end of file -- 2.25.1 From 1a2512473cb2c6ec38e84f2c19272c1c0ecf656f Mon Sep 17 00:00:00 2001 From: insideq Date: Sun, 18 Feb 2024 13:38:40 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectExcavator/Drawnings/DrawningBulldozer.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs index 65b2d32..7fa5983 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs @@ -2,6 +2,9 @@ namespace ProjectExcavator.Drawnings; +/// +/// Класс, отвечающий за прорисовку и перемещения базового объекта-сущности +/// public class DrawningBulldozer { /// -- 2.25.1