diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/AbstractStrategy.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/AbstractStrategy.cs
new file mode 100644
index 0000000..55bb611
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/AbstractStrategy.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using projectDoubleDeckerBus.Drawings;
+using projectDoubleDeckerBus.Entity;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public abstract class AbstractStrategy
+ {
+ ///
+ /// Перемещаемый объект
+ ///
+ private IMoveableObject? _moveableObject;
+ ///
+ /// Статус перемещения
+ ///
+ private Status _state = Status.NotInit;
+ ///
+ /// Ширина поля
+ ///
+ protected int FieldWidth { get; private set; }
+ ///
+ /// Высота поля
+ ///
+ protected int FieldHeight { get; private set; }
+ ///
+ /// Статус перемещения
+ ///
+ public Status GetStatus() { return _state; }
+ ///
+ /// Установка данных
+ ///
+ /// Перемещаемый объект
+ /// Ширина поля
+ /// Высота поля
+ public void SetData(IMoveableObject moveableObject, int width, int
+ height)
+ {
+ if (moveableObject == null)
+ {
+ _state = Status.NotInit;
+ return;
+ }
+ _state = Status.InProgress;
+ _moveableObject = moveableObject;
+ FieldWidth = width;
+ FieldHeight = height;
+ }
+ ///
+ /// Шаг перемещения
+ ///
+ public void MakeStep()
+ {
+ if (_state != Status.InProgress)
+ {
+ return;
+ }
+ if (IsTargetDestinaion())
+ {
+ _state = Status.Finish;
+ return;
+ }
+ MoveToTarget();
+ }
+ ///
+ /// Перемещение влево
+ ///
+ /// Результат перемещения (true - удалось переместиться, false -
+ ///неудача)
+ protected bool MoveLeft() => MoveTo(Direction.Left);
+ ///
+ /// Перемещение вправо
+ ///
+ /// Результат перемещения (true - удалось переместиться,
+ ///false - неудача)
+ protected bool MoveRight() => MoveTo(Direction.Right);
+ ///
+ /// Перемещение вверх
+ ///
+ /// Результат перемещения (true - удалось переместиться,
+ ///false - неудача)
+ protected bool MoveUp() => MoveTo(Direction.Up);
+ ///
+ /// Перемещение вниз
+ ///
+ /// Результат перемещения (true - удалось переместиться,
+ ///false - неудача)
+ protected bool MoveDown() => MoveTo(Direction.Down);
+ ///
+ /// Параметры объекта
+ ///
+ protected ObjectParameters? GetObjectParameters =>
+ _moveableObject?.GetObjectPosition;
+ ///
+ /// Шаг объекта
+ ///
+ ///
+ protected int? GetStep()
+ {
+ if (_state != Status.InProgress)
+ {
+ return null;
+ }
+ return _moveableObject?.GetStep;
+ }
+ ///
+ /// Перемещение к цели
+ ///
+ protected abstract void MoveToTarget();
+ ///
+ /// Достигнута ли цель
+ ///
+ ///
+ protected abstract bool IsTargetDestinaion();
+ ///
+ /// Попытка перемещения в требуемом направлении
+ ///
+ /// Направление
+ /// Результат попытки (true - удалось переместиться, false -
+ ///неудача)
+ private bool MoveTo(Direction directionType)
+ {
+ if (_state != Status.InProgress)
+ {
+ return false;
+ }
+ if (_moveableObject?.CheckCanMove(directionType) ?? false)
+ {
+ _moveableObject.MoveObject(directionType);
+ return true;
+ }
+ return false;
+ }
+ }
+}
+
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/Direction.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/Direction.cs
index 3daf4f7..882b2fa 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/Direction.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/Direction.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace projectDoubleDeckerBus
+namespace projectDoubleDeckerBus.Drawings
{
public enum Direction
{
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningBus.cs
new file mode 100644
index 0000000..11d1431
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningBus.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using projectDoubleDeckerBus;
+using System.Drawing;
+using projectDoubleDeckerBus.Entity;
+
+namespace projectDoubleDeckerBus.Drawings
+{
+ public class DrawningBus
+ {
+ ///
+ /// Класс-сущность
+ ///
+ public EntityBus? EntityBus { get; protected set; }
+ ///
+ /// Ширина окна
+ ///
+ private int _pictureWidth;
+ ///
+ /// Высота окна
+ ///
+ private int _pictureHeight;
+ ///
+ ///
+ /// Левая координата прорисовки автобуса
+ ///
+ protected int _startPosX;
+ ///
+ /// Верхняя кооридната прорисовки автобуса
+ ///
+ protected int _startPosY;
+ ///
+ /// Ширина прорисовки автобуса
+ ///
+ protected readonly int _busWidth = 172;
+ ///
+ /// Высота прорисовки автобуса
+ ///
+ protected readonly int _busHeight = 112;
+ ///
+ /// Координата X объекта
+ ///
+ public int GetPosX => _startPosX;
+ ///
+ /// Координата Y объекта
+ ///
+ public int GetPosY => _startPosY;
+ ///
+ /// Ширина объекта
+ ///
+ public int GetWidth => _busWidth;
+ ///
+ /// Высота объекта
+ ///
+ public int GetHeight => _busHeight;
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес
+ /// Цвет кузова
+ /// Ширина картинки
+ /// Высота картинки
+ /// true - объект создан, false - проверка не пройдена,
+ ///
+ public bool CanMove(Direction direction)
+ {
+ if (EntityBus == null)
+ {
+ return false;
+ }
+ return direction switch
+ {
+ //влево
+ Direction.Left => _startPosX - EntityBus.Step > 0,
+ //вверх
+ Direction.Up => _startPosY - EntityBus.Step > 0,
+ //Down
+ Direction.Down => _startPosY + EntityBus.Step < _pictureHeight,
+ //Right
+ Direction.Right => _startPosX + EntityBus.Step < _pictureWidth
+ };
+ }
+
+ public void MoveTransport(Direction direction)
+ {
+ if (EntityBus == null)
+ {
+ return;
+ }
+ switch (direction)
+ {
+ //влево
+ case Direction.Left:
+ if (_startPosX - EntityBus.Step > 0)
+ {
+ _startPosX -= (int)EntityBus.Step;
+ }
+ break;
+ //вверх
+ case Direction.Up:
+ if (_startPosY - EntityBus.Step > 0)
+ {
+ _startPosY -= (int)EntityBus.Step;
+ }
+ break;
+ // вправо
+ case Direction.Right:
+ if (_startPosX + _busWidth + EntityBus.Step < _pictureWidth)
+ {
+ _startPosX += (int)EntityBus.Step;
+ }
+ break;
+ //вниз
+ case Direction.Down:
+ if (_startPosY + _busHeight + EntityBus.Step < _pictureHeight)
+ {
+ _startPosY += (int)EntityBus.Step;
+ }
+ break;
+ }
+ }
+ public DrawningBus(int speed, double weight, Color bodyColor, int width, int height)
+ {
+ _pictureWidth = width;
+ _pictureHeight = height;
+ EntityBus = new EntityBus(speed, weight, bodyColor);
+
+ ///
+ /// Проверка на вместимость обьекта в рамки сцены
+ ///
+ if ((_busWidth >= _pictureWidth) || (_busHeight >= _pictureHeight))
+ {
+ Console.WriteLine("проверка не пройдена, нельзя создать объект в этих размерах");
+ if (_busWidth >= _pictureWidth)
+ {
+ _busWidth = _pictureWidth - _busWidth;
+ }
+ if (_busHeight >= _pictureWidth)
+ {
+ _busHeight = _pictureWidth - _busHeight;
+ }
+ }
+ else
+ Console.WriteLine("объект создан");
+ }
+ ///
+ /// Конструктор
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Ширина картинки
+ /// Высота картинки
+ /// Ширина прорисовки автомобиля
+ /// Высота прорисовки автомобиля
+ protected DrawningBus(int speed, double weight, Color bodyColor, int
+ width, int height, int busWidth, int busHeight)
+ {
+ if (busWidth >= width || busHeight >= height)
+ {
+ if (busWidth >= width)
+ {
+ busWidth = width - busWidth;
+ }
+ if (busHeight >= height)
+ {
+ busHeight = height - busHeight;
+ }
+ }
+ else
+
+ _pictureWidth = width;
+ _pictureHeight = height;
+ _busWidth = busWidth;
+ _busHeight = busHeight;
+ EntityBus = new EntityBus(speed, weight, bodyColor);
+ }
+
+ public void SetPosition(int x, int y)
+ {
+ if (((x + _busWidth > _pictureWidth)) || ((y >= 0) && (y + _busHeight > _pictureHeight)))
+ {
+ _startPosX = _pictureWidth - _busWidth;
+ _startPosY = _pictureHeight - _busHeight;
+ }
+
+ else
+ {
+ _startPosX = x;
+ _startPosY = y;
+ }
+ }
+
+ public void MoveBus(Direction direction)
+ {
+ if (EntityBus == null)
+ {
+ return;
+ }
+
+ switch (direction)
+ {
+ //влево
+ case Direction.Left:
+ if (_startPosX - EntityBus.Step > 0)
+ {
+ _startPosX -= (int)EntityBus.Step;
+ }
+ break;
+ //вверх
+ case Direction.Up:
+ if (_startPosY - EntityBus.Step > 0)
+ {
+ _startPosY -= (int)EntityBus.Step;
+ }
+ break;
+ // вправо
+ case Direction.Right:
+ if (_startPosX + EntityBus.Step + _busWidth < _pictureWidth)
+ {
+ _startPosX += (int)EntityBus.Step;
+ }
+ break;
+ //вниз
+ case Direction.Down:
+ if (_startPosY + EntityBus.Step + _busHeight < _pictureHeight)
+ {
+ _startPosY += (int)EntityBus.Step;
+ }
+ break;
+ }
+ }
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public virtual void DrawTransport(Graphics g)
+ {
+ if (EntityBus == null)
+ {
+ return;
+ }
+
+ int windowSize = 15;
+ Brush brBlack = new SolidBrush(Color.Black);
+ Brush brRed = new SolidBrush(Color.Red);
+
+ Pen pen = new(Color.Black);
+
+ Brush br = new SolidBrush(EntityBus?.BodyColor ?? Color.Black);
+ g.FillRectangle(br, _startPosX + 40, _startPosY + 34, 130, 52);
+
+ g.DrawEllipse(pen, _startPosX + 46, _startPosY + 50, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 62, _startPosY + 50, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 100, _startPosY + 50, windowSize, windowSize);
+
+ g.DrawEllipse(pen, _startPosX + 115, _startPosY + 50, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 145, _startPosY + 50, windowSize, windowSize);
+
+ g.FillRectangle(brBlack, _startPosX + 80, _startPosY + 46, 15, 40);
+ g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 75, 20, 20);
+ g.FillEllipse(brBlack, _startPosX + 140, _startPosY + 75, 20, 20);
+
+ Brush brBlue = new SolidBrush(Color.LightBlue);
+ g.FillEllipse(brBlue, _startPosX + 46, _startPosY + 50, windowSize, windowSize);
+ g.FillEllipse(brBlue, _startPosX + 62, _startPosY + 50, windowSize, windowSize);
+ g.FillEllipse(brBlue, _startPosX + 100, _startPosY + 50, windowSize, windowSize);
+ g.FillEllipse(brBlue, _startPosX + 115, _startPosY + 50, windowSize, windowSize);
+ g.FillEllipse(brBlue, _startPosX + 130, _startPosY + 50, windowSize, windowSize);
+ g.FillEllipse(brBlue, _startPosX + 145, _startPosY + 50, windowSize, windowSize);
+
+ }
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningDoubleDeckerBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningDoubleDeckerBus.cs
index 0bbc6aa..3b5b8a2 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningDoubleDeckerBus.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningDoubleDeckerBus.cs
@@ -3,207 +3,80 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using projectDoubleDeckerBus.Entity;
+using System.Drawing;
-namespace projectDoubleDeckerBus
+namespace projectDoubleDeckerBus.Drawings
{
- public class DrawningDoubleDeckerBus
+ public class DrawningDoubleDeckerBus : DrawningBus
{
///
- /// Класс-сущность
- ///
- public EntityDoubleDeckerBus? EntityDoubleDeckerBus { get; private set; }
- ///
- /// Ширина окна
- ///
- private int _pictureWidth;
- ///
- /// Высота окна
- ///
- private int _pictureHeight;
- ///
- ///
- /// Левая координата прорисовки автобуса
- ///
- private int _startPosX;
- ///
- /// Верхняя кооридната прорисовки автобуса
- ///
- private int _startPosY;
- ///
- /// Ширина прорисовки автобуса
- ///
- private readonly int _busWidth = 172;
- ///
- /// Высота прорисовки автобуса
- ///
- private readonly int _busHeight = 113;
- ///
- /// Инициализация свойств
+ /// Конструктор
///
/// Скорость
/// Вес
- /// Цвет кузова
- /// Дополнительный цвет
- /// Признак наличия фары
- /// Признак наличия этажа
- /// Признак наличия выхлопа
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
/// Ширина картинки
/// Высота картинки
- /// true - объект создан, false - проверка не пройдена,
+ public DrawningDoubleDeckerBus(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool floor, bool tailpipe, int width, int height) :
- public bool Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool headlight, bool floor, bool tailpipe, int width, int height)
+ base(speed, weight, bodyColor, width, height, 172, 112)
{
- _pictureWidth = width;
- _pictureHeight = height;
- EntityDoubleDeckerBus = new EntityDoubleDeckerBus();
- EntityDoubleDeckerBus.Init(speed, weight, bodyColor, additionalColor, headlight, floor, tailpipe);
- /// Проверка на вместимость обьекта в рамки сцены
- ///
- if ((_busWidth >= _pictureWidth) || (_busHeight >= _pictureHeight))
+ if (EntityBus != null)
{
- Console.WriteLine("проверка не пройдена, нельзя создать объект в этих размерах");
- return false;
- }
- else
- Console.WriteLine("объект создан");
- return true;
- }
- ///
- /// Установка позиции
- ///
- /// Координата X
- /// Координата Y
- public void SetPosition(int x, int y)
- {
- if (((x >= 0) && (x + _busWidth > _pictureWidth)) || ((y >= 0) && (y + _busHeight > _pictureHeight)))
- {
- _startPosX = _pictureWidth - _busWidth;
- _startPosY = _pictureHeight - _busHeight;
- }
-
- else
- {
- _startPosX = x;
- _startPosY = y;
+ EntityBus = new EntityDoubleDeckerBus(speed, weight, bodyColor,
+ additionalColor, floor, tailpipe);
}
}
- ///
- /// Изменение направления перемещения
- ///
- /// Направление
- public void MoveTransport(Direction direction)
+ public override void DrawTransport(Graphics g)
{
- if (EntityDoubleDeckerBus == null)
+ if (EntityBus is not EntityDoubleDeckerBus doubleDeckerBus)
{
return;
}
- switch (direction)
- {
- //влево
- case Direction.Left:
- if (_startPosX - EntityDoubleDeckerBus.Step > 0)
- {
- _startPosX -= (int)EntityDoubleDeckerBus.Step;
- }
- break;
- //вверх
- case Direction.Up:
- if (_startPosY - EntityDoubleDeckerBus.Step > 0)
- {
- _startPosY -= (int)EntityDoubleDeckerBus.Step;
- }
- break;
- // вправо
- case Direction.Right:
- if (_startPosX + _busWidth + EntityDoubleDeckerBus.Step < _pictureWidth)
- {
- _startPosX += (int)EntityDoubleDeckerBus.Step;
- }
- break;
- //вниз
- case Direction.Down:
- if (_startPosY + _busHeight + EntityDoubleDeckerBus.Step < _pictureHeight)
- {
- _startPosY += (int)EntityDoubleDeckerBus.Step;
- }
- break;
- }
- }
- ///
- /// Прорисовка объекта
- ///
- ///
- public void DrawTransport(Graphics g)
- {
- if (EntityDoubleDeckerBus == null)
- {
- return;
- }
-
- int windowSize = 15;
- Brush brBlack = new SolidBrush(Color.Black);
- Brush brRed = new SolidBrush(Color.Red);
-
Pen pen = new(Color.Black);
- Brush additionalBrush = new SolidBrush(EntityDoubleDeckerBus.AdditionalColor);
+ Brush additionalBrush = new
+ SolidBrush(doubleDeckerBus.AdditionalColor);
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ ///
+ int windowSize = 15;
- Brush br = new SolidBrush(EntityDoubleDeckerBus?.BodyColor ?? Color.Black);
- g.FillRectangle(br, _startPosX + 40, _startPosY + 34, 130, 52);
-
- g.DrawEllipse(pen, _startPosX + 46, _startPosY + 50, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 62, _startPosY + 50, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 100, _startPosY + 50, windowSize, windowSize);
-
- g.DrawEllipse(pen, _startPosX + 115, _startPosY + 50, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 145, _startPosY + 50, windowSize, windowSize);
-
- //колеса
- g.FillRectangle(brBlack, _startPosX + 80, _startPosY + 46, 15, 40);
- g.FillEllipse(brBlack, _startPosX + 50, _startPosY + 75, 20, 20);
- g.FillEllipse(brBlack, _startPosX + 140, _startPosY + 75, 20, 20);
-
- Brush brBlue = new SolidBrush(Color.LightBlue);
- g.FillEllipse(brBlue, _startPosX + 46, _startPosY + 50, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 62, _startPosY + 50, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 100, _startPosY + 50, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 115, _startPosY + 50, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 130, _startPosY + 50, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 145, _startPosY + 50, windowSize, windowSize);
-
- if (EntityDoubleDeckerBus.Floor)
+ if (doubleDeckerBus.Floor)
{
- g.DrawEllipse(pen, _startPosX + 46, _startPosY + 10, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 62, _startPosY + 10, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 100, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 46, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 62, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 100, _startPosY + 10, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 115, _startPosY + 10, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 130, _startPosY + 10, windowSize, windowSize);
- g.DrawEllipse(pen, _startPosX + 145, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 115, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 130, _startPosY + 10, windowSize, windowSize);
+ g.DrawEllipse(pen, _startPosX + 145, _startPosY + 10, windowSize, windowSize);
g.FillRectangle(additionalBrush, _startPosX + 40,
- _startPosY + 1, 130, 32);
+ _startPosY + 2, 130, 32);
Brush brBlue1 = new SolidBrush(Color.LightBlue);
- g.FillEllipse(brBlue, _startPosX + 46, _startPosY + 10, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 62, _startPosY + 10, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 100, _startPosY + 10, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 115, _startPosY + 10, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 130, _startPosY + 10, windowSize, windowSize);
- g.FillEllipse(brBlue, _startPosX + 145, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 46, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 62, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 100, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 115, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 130, _startPosY + 10, windowSize, windowSize);
+ g.FillEllipse(brBlue1, _startPosX + 145, _startPosY + 10, windowSize, windowSize);
}
- if (EntityDoubleDeckerBus.Headlight)
- {
- g.FillEllipse(additionalBrush, _startPosX + 162, _startPosY + 78, 10, 10);
- }
-
- if (EntityDoubleDeckerBus.Tailpipe)
+ if (doubleDeckerBus.Tailpipe)
{
g.FillRectangle(additionalBrush, _startPosX, _startPosY + 76, 40, 10);
}
- }
+ base.DrawTransport(g);
+ }
}
}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningObjectBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningObjectBus.cs
new file mode 100644
index 0000000..bbead80
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/DrawningObjectBus.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using projectDoubleDeckerBus.Entity;
+using projectDoubleDeckerBus.Drawings;
+using System.Drawing;
+using projectDoubleDeckerBus;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public class DrawningObjectBus : IMoveableObject
+ {
+ private readonly DrawningBus? _drawningBus = null;
+ public DrawningObjectBus(DrawningBus drawningBus)
+ {
+ _drawningBus = drawningBus;
+ }
+ public ObjectParameters? GetObjectPosition
+ {
+ get
+ {
+ if (_drawningBus == null || _drawningBus.EntityBus ==
+ null)
+ {
+ return null;
+ }
+ return new ObjectParameters(_drawningBus.GetPosX,
+ _drawningBus.GetPosY, _drawningBus.GetWidth, _drawningBus.GetHeight);
+ }
+ }
+ public int GetStep => (int)(_drawningBus?.EntityBus?.Step ?? 0);
+ public bool CheckCanMove(Direction direction) =>
+ _drawningBus?.CanMove(direction) ?? false;
+ public void MoveObject(Direction direction) =>
+ _drawningBus?.MoveTransport(direction);
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityBus.cs
new file mode 100644
index 0000000..d0dcd93
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityBus.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Drawing;
+
+namespace projectDoubleDeckerBus.Entity
+{
+ public class EntityBus
+ {
+ ///
+ /// Скорость
+ ///
+ public int Speed { get; private set; }
+ ///
+ /// Вес
+ ///
+ public double Weight { get; private set; }
+ ///
+ /// Основной цвет
+ ///
+ public Color BodyColor { get; private set; }
+ ///
+ /// Шаг перемещения автомобиля
+ ///
+ public double Step => (double)Speed * 100 / Weight;
+ ///
+ /// Конструктор с параметрами
+ ///
+ /// Скорость
+ /// Вес автомобиля
+ /// Основной цвет
+ public EntityBus(int speed, double weight, Color bodyColor)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ }
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityDoubleDeckerBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityDoubleDeckerBus.cs
index c9401ba..cb92a35 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityDoubleDeckerBus.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/EntityDoubleDeckerBus.cs
@@ -3,23 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Drawing;
-namespace projectDoubleDeckerBus
+namespace projectDoubleDeckerBus.Entity
{
- public class EntityDoubleDeckerBus
+
+ public class EntityDoubleDeckerBus : EntityBus
{
- ///
- /// Скорость
- ///
- public int Speed { get; private set; }
- ///
- /// Вес
- ///
- public double Weight { get; private set; }
- ///
- /// Основной цвет
- ///
- public Color BodyColor { get; private set; }
///
/// Дополнительный цвет (для опциональных элементов)
///
@@ -27,39 +17,30 @@ namespace projectDoubleDeckerBus
///
/// Признак (опция) наличия фары
///
- public bool Headlight { get; private set; }
- ///
- /// Признак (опция) наличия второго этажа
- ///
public bool Floor { get; private set; }
///
/// Признак (опция) наличия выхлопа
///
public bool Tailpipe { get; private set; }
///
- /// Шаг перемещения автобуса
- ///
- public double Step => (double)Speed * 100 / Weight;
- ///
/// Инициализация полей объекта-класса спортивного автобуса
+ ///
+ /// ///
+ /// Инициализация полей объекта-класса спортивного автомобиля
///
/// Скорость
- /// Вес автобуса
+ /// Вес автомобиля
/// Основной цвет
/// Дополнительный цвет
/// Признак наличия фары
/// Признак наличия второго этажаы
/// Признак наличия выхлопа
- public void Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool headlight, bool floor, bool tailpipe)
+ public EntityDoubleDeckerBus(int speed, double weight, Color bodyColor, Color additionalColor, bool floor, bool tailpipe)
+ : base(speed, weight, bodyColor)
{
- Speed = speed;
- Weight = weight;
- BodyColor = bodyColor;
AdditionalColor = additionalColor;
- Headlight = headlight;
Floor = floor;
Tailpipe = tailpipe;
}
}
-}
+}
\ No newline at end of file
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.Designer.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.Designer.cs
index be60cb5..660786e 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.Designer.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.Designer.cs
@@ -29,17 +29,15 @@
private void InitializeComponent()
{
pictureBoxDoubleDeckerBus = new PictureBox();
- buttonCreate = new Button();
+ buttonCreateDoubleDeckerBus = new Button();
buttonDown = new Button();
buttonLeft = new Button();
buttonUp = new Button();
buttonRight = new Button();
- statusStrip1 = new StatusStrip();
- toolStripStatusLabelSpeed = new ToolStripStatusLabel();
- toolStripStatusLabelWeight = new ToolStripStatusLabel();
- toolStripStatusLabelColor = new ToolStripStatusLabel();
+ ButtonCreateBus = new Button();
+ buttonStep = new Button();
+ comboBoxStrategy = new ComboBox();
((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).BeginInit();
- statusStrip1.SuspendLayout();
SuspendLayout();
//
// pictureBoxDoubleDeckerBus
@@ -52,22 +50,22 @@
pictureBoxDoubleDeckerBus.TabIndex = 0;
pictureBoxDoubleDeckerBus.TabStop = false;
//
- // buttonCreate
+ // buttonCreateDoubleDeckerBus
//
- buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
- buttonCreate.Location = new Point(12, 399);
- buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(75, 23);
- buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Create";
- buttonCreate.UseVisualStyleBackColor = true;
- buttonCreate.Click += ButtonCreate_Click;
+ buttonCreateDoubleDeckerBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonCreateDoubleDeckerBus.Location = new Point(12, 414);
+ buttonCreateDoubleDeckerBus.Name = "buttonCreateDoubleDeckerBus";
+ buttonCreateDoubleDeckerBus.Size = new Size(158, 23);
+ buttonCreateDoubleDeckerBus.TabIndex = 1;
+ buttonCreateDoubleDeckerBus.Text = "CreateDoubleDeckerBus";
+ buttonCreateDoubleDeckerBus.UseVisualStyleBackColor = true;
+ buttonCreateDoubleDeckerBus.Click += buttonCreateDoubleDeckerBus_Click;
//
// buttonDown
//
buttonDown.BackgroundImage = Properties.Resources.вниз;
buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
- buttonDown.Location = new Point(692, 392);
+ buttonDown.Location = new Point(696, 407);
buttonDown.Name = "buttonDown";
buttonDown.Size = new Size(30, 30);
buttonDown.TabIndex = 2;
@@ -78,7 +76,7 @@
//
buttonLeft.BackgroundImage = Properties.Resources.влево;
buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
- buttonLeft.Location = new Point(656, 392);
+ buttonLeft.Location = new Point(660, 407);
buttonLeft.Name = "buttonLeft";
buttonLeft.Size = new Size(30, 30);
buttonLeft.TabIndex = 3;
@@ -89,7 +87,7 @@
//
buttonUp.BackgroundImage = Properties.Resources.вверх;
buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
- buttonUp.Location = new Point(692, 356);
+ buttonUp.Location = new Point(696, 371);
buttonUp.Name = "buttonUp";
buttonUp.Size = new Size(30, 30);
buttonUp.TabIndex = 4;
@@ -100,71 +98,72 @@
//
buttonRight.BackgroundImage = Properties.Resources.вправо;
buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
- buttonRight.Location = new Point(728, 392);
+ buttonRight.Location = new Point(732, 407);
buttonRight.Name = "buttonRight";
buttonRight.Size = new Size(30, 30);
buttonRight.TabIndex = 5;
buttonRight.UseVisualStyleBackColor = true;
buttonRight.Click += ButtonMove_Click;
//
- // statusStrip1
+ // ButtonCreateBus
//
- statusStrip1.Items.AddRange(new ToolStripItem[] { toolStripStatusLabelSpeed, toolStripStatusLabelWeight, toolStripStatusLabelColor });
- statusStrip1.Location = new Point(0, 428);
- statusStrip1.Name = "statusStrip1";
- statusStrip1.Size = new Size(800, 22);
- statusStrip1.TabIndex = 6;
- statusStrip1.Text = "statusStrip1";
+ ButtonCreateBus.Location = new Point(190, 414);
+ ButtonCreateBus.Name = "ButtonCreateBus";
+ ButtonCreateBus.Size = new Size(128, 23);
+ ButtonCreateBus.TabIndex = 7;
+ ButtonCreateBus.Text = "CreateBus";
+ ButtonCreateBus.UseVisualStyleBackColor = true;
+ ButtonCreateBus.Click += buttonCreateBus_Click;
//
- // toolStripStatusLabelSpeed
+ // buttonStep
//
- toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
- toolStripStatusLabelSpeed.Size = new Size(39, 17);
- toolStripStatusLabelSpeed.Text = "Speed";
+ buttonStep.Location = new Point(671, 33);
+ buttonStep.Name = "buttonStep";
+ buttonStep.Size = new Size(117, 26);
+ buttonStep.TabIndex = 8;
+ buttonStep.Text = "Step";
+ buttonStep.UseVisualStyleBackColor = true;
+ buttonStep.Click += buttonStep_Click;
//
- // toolStripStatusLabelWeight
+ // comboBoxStrategy
//
- toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
- toolStripStatusLabelWeight.Size = new Size(45, 17);
- toolStripStatusLabelWeight.Text = "Weight";
- //
- // toolStripStatusLabelColor
- //
- toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
- toolStripStatusLabelColor.Size = new Size(36, 17);
- toolStripStatusLabelColor.Text = "Color";
+ comboBoxStrategy.FormattingEnabled = true;
+ comboBoxStrategy.Items.AddRange(new object[] { "MoveToCenter", "MoveToBorder" });
+ comboBoxStrategy.Location = new Point(671, 82);
+ comboBoxStrategy.Name = "comboBoxStrategy";
+ comboBoxStrategy.Size = new Size(117, 23);
+ comboBoxStrategy.TabIndex = 9;
//
// FormDoubleDeckerBus
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
- Controls.Add(statusStrip1);
+ Controls.Add(comboBoxStrategy);
+ Controls.Add(buttonStep);
+ Controls.Add(ButtonCreateBus);
Controls.Add(buttonRight);
Controls.Add(buttonUp);
Controls.Add(buttonLeft);
Controls.Add(buttonDown);
- Controls.Add(buttonCreate);
+ Controls.Add(buttonCreateDoubleDeckerBus);
Controls.Add(pictureBoxDoubleDeckerBus);
Name = "FormDoubleDeckerBus";
StartPosition = FormStartPosition.CenterScreen;
Text = "DoubleDeckerBus";
((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).EndInit();
- statusStrip1.ResumeLayout(false);
- statusStrip1.PerformLayout();
ResumeLayout(false);
PerformLayout();
}
#endregion
private PictureBox pictureBoxDoubleDeckerBus;
- private Button buttonCreate;
+ private Button buttonCreateDoubleDeckerBus;
private Button buttonDown;
private Button buttonLeft;
private Button buttonUp;
private Button buttonRight;
- private StatusStrip statusStrip1;
- private ToolStripStatusLabel toolStripStatusLabelSpeed;
- private ToolStripStatusLabel toolStripStatusLabelWeight;
- private ToolStripStatusLabel toolStripStatusLabelColor;
+ private Button ButtonCreateBus;
+ private Button buttonStep;
+ private ComboBox comboBoxStrategy;
}
}
\ No newline at end of file
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.cs
index 110e02f..3611786 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.cs
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.cs
@@ -1,8 +1,14 @@
+using projectDoubleDeckerBus.Drawings;
+using projectDoubleDeckerBus.Entity;
+using projectDouble_Decker_Bus.MovementStrategy;
+
namespace projectDoubleDeckerBus
{
public partial class FormDoubleDeckerBus : Form
{
- private DrawningDoubleDeckerBus? _drawningDoubleDeckerBus;
+ private DrawningBus? _drawningBus;
+
+ private AbstractStrategy? _abstractStrategy;
public FormDoubleDeckerBus()
{
InitializeComponent();
@@ -10,39 +16,35 @@ namespace projectDoubleDeckerBus
private void Draw()
{
- if (_drawningDoubleDeckerBus == null)
+ if (_drawningBus == null)
{
return;
}
Bitmap bmp = new(pictureBoxDoubleDeckerBus.Width,
pictureBoxDoubleDeckerBus.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawningDoubleDeckerBus.DrawTransport(gr);
+ _drawningBus.DrawTransport(gr);
pictureBoxDoubleDeckerBus.Image = bmp;
}
- private void ButtonCreate_Click(object sender, EventArgs e)
+ private void buttonCreateDoubleDeckerBus_Click(object sender, EventArgs e)
{
Random random = new();
- _drawningDoubleDeckerBus = new DrawningDoubleDeckerBus();
- _drawningDoubleDeckerBus.Init(random.Next(100, 300),
+ _drawningBus = new DrawningDoubleDeckerBus(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)),
+ random.Next(0, 256)),
Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)),
-
pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
- _drawningDoubleDeckerBus.SetPosition(random.Next(10, 100),
- random.Next(10, 100));
+ _drawningBus.SetPosition(random.Next(10, 100), random.Next(10,
+ 100));
Draw();
-
}
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawningDoubleDeckerBus == null)
+ if (_drawningBus == null)
{
return;
}
@@ -50,21 +52,70 @@ namespace projectDoubleDeckerBus
switch (name)
{
case "buttonUp":
- _drawningDoubleDeckerBus.MoveTransport(Direction.Up);
+ _drawningBus.MoveTransport(Direction.Up);
break;
case "buttonDown":
- _drawningDoubleDeckerBus.MoveTransport(Direction.Down);
+ _drawningBus.MoveTransport(Direction.Down);
break;
case "buttonLeft":
- _drawningDoubleDeckerBus.MoveTransport(Direction.Left);
+ _drawningBus.MoveTransport(Direction.Left);
break;
case "buttonRight":
- _drawningDoubleDeckerBus.MoveTransport(Direction.Right);
+ _drawningBus.MoveTransport(Direction.Right);
break;
}
Draw();
+ }
+
+ private void buttonCreateBus_Click(object sender, EventArgs e)
+ {
+ Random random = new();
+ _drawningBus = new DrawningBus(random.Next(100, 300),
+ random.Next(1000, 3000),
+ Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+ random.Next(0, 256)),
+ pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height);
+ _drawningBus.SetPosition(random.Next(10, 100), random.Next(10,
+ 100));
+ Draw();
+ }
+
+ private void buttonStep_Click(object sender, EventArgs e)
+ {
+ if (_drawningBus == null)
+ {
+ return;
+ }
+ if (comboBoxStrategy.Enabled)
+ {
+ _abstractStrategy = comboBoxStrategy.SelectedIndex
+ switch
+ {
+ 0 => new MoveToCenter(),
+ 1 => new MoveToBorder(),
+ _ => null,
+ };
+ if (_abstractStrategy == null)
+ {
+ return;
+ }
+ _abstractStrategy.SetData(new
+ DrawningObjectBus(_drawningBus), pictureBoxDoubleDeckerBus.Width,
+ pictureBoxDoubleDeckerBus.Height);
+ comboBoxStrategy.Enabled = false;
+ }
+ if (_abstractStrategy == null)
+ {
+ return;
+ }
+ _abstractStrategy.MakeStep();
+ Draw();
+ if (_abstractStrategy.GetStatus() == Status.Finish)
+ {
+ comboBoxStrategy.Enabled = true;
+ _abstractStrategy = null;
+ }
}
-
}
}
\ No newline at end of file
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.resx b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.resx
index 22c1b7a..28e1061 100644
--- a/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.resx
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/FormDoubleDeckerBus.resx
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
25
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/IMoveableObject.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/IMoveableObject.cs
new file mode 100644
index 0000000..875ce5f
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/IMoveableObject.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using projectDoubleDeckerBus;
+using projectDoubleDeckerBus.Drawings;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public interface IMoveableObject
+ {
+ ///
+ /// Получение координаты X объекта
+ ///
+ ObjectParameters? GetObjectPosition { get; }
+ ///
+ /// Шаг объекта
+ ///
+ int GetStep { get; }
+ ///
+ /// Проверка, можно ли переместиться по нужному направлению
+ ///
+ ///
+ ///
+ bool CheckCanMove(Direction direction);
+ ///
+ /// Изменение направления пермещения объекта
+ ///
+ /// Направление
+ void MoveObject(Direction direction);
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToBorder.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToBorder.cs
new file mode 100644
index 0000000..e6d1e7c
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToBorder.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ class MoveToBorder : AbstractStrategy
+ {
+ protected override bool IsTargetDestinaion()
+ {
+ var objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.RightBorder <= FieldWidth &&
+ objParams.RightBorder + GetStep() >= FieldWidth &&
+ objParams.DownBorder <= FieldHeight &&
+ objParams.DownBorder + GetStep() >= FieldHeight;
+ }
+
+ protected override void MoveToTarget()
+ {
+ var objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ var diffX = FieldWidth - objParams.RightBorder;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ MoveRight();
+ }
+ var diffY = FieldHeight - objParams.DownBorder;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ MoveDown();
+ }
+ }
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToCenter.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToCenter.cs
new file mode 100644
index 0000000..1b1fc3a
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/MoveToCenter.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using projectDoubleDeckerBus.Drawings;
+using projectDoubleDeckerBus.Entity;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public class MoveToCenter : AbstractStrategy
+ {
+ protected override bool IsTargetDestinaion()
+ {
+ var objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return false;
+ }
+ return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
+ objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+ objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
+ objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+ }
+ protected override void MoveToTarget()
+ {
+ var objParams = GetObjectParameters;
+ if (objParams == null)
+ {
+ return;
+ }
+ var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+ if (Math.Abs(diffX) > GetStep())
+ {
+ if (diffX > 0)
+ {
+ MoveLeft();
+ }
+ else
+ {
+ MoveRight();
+ }
+ }
+ var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+ if (Math.Abs(diffY) > GetStep())
+ {
+ if (diffY > 0)
+ {
+ MoveUp();
+ }
+ else
+ {
+ MoveDown();
+ }
+ }
+ }
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/ObjectParameters.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/ObjectParameters.cs
new file mode 100644
index 0000000..d14bc05
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/ObjectParameters.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public class ObjectParameters
+ {
+ private readonly int _x;
+
+ private readonly int _y;
+ private readonly int _width;
+ private readonly int _height;
+ ///
+ /// Левая граница
+ ///
+ public int LeftBorder => _x;
+ ///
+ /// Верхняя граница
+ ///
+ public int TopBorder => _y;
+ ///
+ /// Правая граница
+ ///
+ public int RightBorder => _x + _width;
+ ///
+ /// Нижняя граница
+ ///
+ public int DownBorder => _y + _height;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleHorizontal => _x + _width / 2;
+ ///
+ /// Середина объекта
+ ///
+ public int ObjectMiddleVertical => _y + _height / 2;
+ ///
+ /// Конструктор
+ ///
+ /// Координата X
+ /// Координата Y
+ /// Ширина
+ /// Высота
+ public ObjectParameters(int x, int y, int width, int height)
+ {
+ _x = x;
+ _y = y;
+ _width = width;
+ _height = height;
+ }
+ }
+}
diff --git a/projectDoubleDeckerBus/projectDoubleDeckerBus/Status.cs b/projectDoubleDeckerBus/projectDoubleDeckerBus/Status.cs
new file mode 100644
index 0000000..17b02fc
--- /dev/null
+++ b/projectDoubleDeckerBus/projectDoubleDeckerBus/Status.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace projectDouble_Decker_Bus.MovementStrategy
+{
+ public enum Status
+ {
+ NotInit = 0,
+ InProgress = 1,
+ Finish = 2
+ }
+}