diff --git a/ProjectSportCar/ProjectSportCar/DrawningLinkor.cs b/ProjectSportCar/ProjectSportCar/DrawningLinkor.cs deleted file mode 100644 index 317c331..0000000 --- a/ProjectSportCar/ProjectSportCar/DrawningLinkor.cs +++ /dev/null @@ -1,271 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectLinkor; - -/// -/// Класс отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningLinkor -{ - /// - /// Класс-сущность - /// - public EntityLinkor? EntityLinkor { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая кордината прорисовки линкора - /// - private int? _startPosX; - - /// - /// Верхняя кордината прорисовки линкора - /// - private int? _startPosY; - - /// - /// Ширина прорисовки линкора - /// - private readonly int _drawningLinkorWidth = 150; - - /// - /// Высота прорисовки линкора - /// - private readonly int _drawningLinkorHeight = 80; - - /// - /// Иницилизация полей объекта-класса линкора - /// - /// Скорость - /// Вес линкора - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия орудийной башни - /// Признак наличия отсека под ракеты - /// Признак наличия - public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) - { - EntityLinkor = new EntityLinkor(); - EntityLinkor.Init(speed, weigth, bodyColor, additionalColor, gunTurret, compartment, linkorMotor); - _pictureWidth = null; - _pictureHeight = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// Ширина поля - /// Высота поля - /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - public bool SetPictureSize(int width, int height) - { - // TODO проверка, что объект "влезает" в размеры поля - // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже устоновлена - if (_drawningLinkorWidth <= width && _drawningLinkorHeight <= height) - { - _pictureWidth = width; - _pictureHeight = height; - - if (_startPosX.HasValue && _startPosY.HasValue) - { - if (_startPosX + _drawningLinkorWidth > _pictureWidth ) - { - _startPosX = _pictureWidth - _drawningLinkorWidth; - } - - if (_startPosY + _drawningLinkorWidth <= _pictureHeight) - { - _startPosY = _pictureHeight - _drawningLinkorHeight; - } - - } - return true; - } - return false; - } - - /// - /// Установка позиции - /// - /// Кордината X - /// Кордината Y - public void SetPosition(int x, int y) - { - if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы - // то надо изменить координаты, чтобы он оставался в этих границах - - if (x < 0) - { - x = 0; - } - - else if (x + _drawningLinkorWidth > _pictureWidth) - { - x = _pictureWidth.Value - _drawningLinkorWidth; - } - - if (y < 0) - { - y = 0; - } - else if (y + _drawningLinkorHeight > _pictureHeight) - { - y = _pictureHeight.Value - _drawningLinkorHeight; - } - - _startPosX = x; - _startPosY = y; - } - - /// - /// изменение направления перемещения - /// - /// Направление - /// true - перемещение выполнено, false - перемещение невозможно - public bool MoveTransport(DirectionType direction) - { - if (EntityLinkor == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - //влево - case DirectionType.Left: - if (_startPosX.Value - EntityLinkor.Step > 0) - { - _startPosX -= (int)EntityLinkor.Step; - } - return true; - //вверх - case DirectionType.Up: - if (_startPosY.Value - EntityLinkor.Step > 0) - { - _startPosY -= (int)EntityLinkor.Step; - } - return true; - //вправо - case DirectionType.Right: - if (_startPosX.Value+_drawningLinkorWidth + EntityLinkor.Step < _pictureWidth) - { - _startPosX += (int)EntityLinkor.Step; - } - return true; - //вниз - case DirectionType.Down: - if (_startPosY.Value+_drawningLinkorHeight + EntityLinkor.Step < _pictureHeight) - { - _startPosY += (int)EntityLinkor.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityLinkor == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityLinkor.AdditionalColor); - Brush bodybrush = new SolidBrush(EntityLinkor.BodyColor); - - - //Заливка лодки - Point point1 = new Point(_startPosX.Value + 5, _startPosY.Value + 5); - Point point2 = new Point(_startPosX.Value + 110, _startPosY.Value + 5); - Point point3 = new Point(_startPosX.Value + 150, _startPosY.Value + 42); - Point point4 = new Point(_startPosX.Value + 110, _startPosY.Value + 80); - Point point5 = new Point(_startPosX.Value + 5, _startPosY.Value + 80); - Point point6 = new Point(_startPosX.Value + 5, _startPosY.Value + 5); - - Point[] LinkorLine = { point1, point2, point3, point4, point5, point6 }; - g.FillPolygon(additionalBrush, LinkorLine); - - //границы линкора - g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 5, _startPosX.Value + 110, _startPosY.Value + 5); - g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 110, _startPosY.Value + 80); - g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 5, _startPosX.Value + 5, _startPosY.Value + 80); - g.DrawLine(pen, _startPosX.Value + 110, _startPosY.Value + 5, _startPosX.Value + 150, _startPosY.Value + 42); - g.DrawLine(pen, _startPosX.Value + 110, _startPosY.Value + 80, _startPosX.Value + 150, _startPosY.Value + 42); - g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 59, 15, 15); - g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 64, 15, 5); - g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 12, 15, 15); - g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 17, 15, 5); - //Парус - g.DrawArc(pen, _startPosX.Value + 45, _startPosY.Value + 15, 35, 60, 280, 160); - g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value + 17, _startPosX.Value + 67, _startPosY.Value + 72); - g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 72); - g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 17); - g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 45); - g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 35); - g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 55); - - - //заливка ракет - Brush br = new SolidBrush(Color.Black); - g.FillRectangle(bodybrush, _startPosX.Value + 25, _startPosY.Value + 59, 15, 15); - g.FillRectangle(bodybrush, _startPosX.Value + 10, _startPosY.Value + 64, 15, 5); - g.FillRectangle(bodybrush, _startPosX.Value + 25, _startPosY.Value + 12, 15, 15); - g.FillRectangle(bodybrush, _startPosX.Value + 10, _startPosY.Value + 17, 15, 5); - - //Орудийная башня - if (EntityLinkor.GunTurret) - { - Brush bri = new SolidBrush(Color.Gray); - g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 27, 30, 30); - g.DrawEllipse(pen, _startPosX.Value + 95, _startPosY.Value + 32, 20, 20); - g.FillEllipse(bri, _startPosX.Value + 90, _startPosY.Value + 27, 30, 30); - g.FillEllipse(br, _startPosX.Value + 95, _startPosY.Value + 32, 20, 20); - } - - //Дополнительная ракета - if (EntityLinkor.Сompartment) - { - Brush brfara = new SolidBrush(Color.Blue); - g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 35, 15, 15); - g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 40, 15, 5); - g.FillRectangle(brfara, _startPosX.Value + 25, _startPosY.Value + 35, 15, 15); - g.FillRectangle(brfara, _startPosX.Value + 10, _startPosY.Value + 40, 15, 5); - - } - - //Мотор - if (EntityLinkor.LinkorMotor) - { - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 59, 5, 15); - g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 59, 5, 15); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 5, 15); - g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 5, 15); - } - - } -} diff --git a/ProjectSportCar/ProjectSportCar/DirectionType.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DirectionType.cs similarity index 91% rename from ProjectSportCar/ProjectSportCar/DirectionType.cs rename to ProjectSportCar/ProjectSportCar/Drawnings/DirectionType.cs index 0aaf8c7..14bf3f2 100644 --- a/ProjectSportCar/ProjectSportCar/DirectionType.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ProjectLinkor; +namespace ProjectLinkor.Drawnings; /// /// Направление перемещения diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs new file mode 100644 index 0000000..5353fe9 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs @@ -0,0 +1,273 @@ +using ProjectLinkor.Entities; +using static System.Windows.Forms.LinkLabel; + +namespace ProjectLinkor.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности +/// +public class DrawingWarship +{ + /// + /// Класс-сущность + /// + public EntityWarship? EntityWarship { get; protected set; } + + /// + /// Ширина + /// + private int? _pictureWidth; + + /// + /// Высота + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки военного корабля + /// + protected int? _startPosX; + + /// + /// Верхняя координата прорисовки военного корабля + /// + protected int? _startPosY; + + /// + /// Ширина прорисовки военного корабля + /// + private readonly int _drawingWarshipWidth = 148; + + /// + /// Высота прорисовки военного корабля + /// + private readonly int _drawingWarshipHeight = 75; + + /// + /// Координата Х объекта + /// + public int? GetPosX => _startPosX; + + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + + /// + /// Ширина объекта + /// + public int GetWidth => _drawingWarshipWidth; + + /// + /// Высота объекта + /// + public int GetHeight => _drawingWarshipHeight; + + /// + /// Пустой конструктор + /// + private DrawingWarship() + { + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawingWarship(int speed, double weight, Color bodyColor) : this() + { + EntityWarship = new EntityWarship(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки военного корабля + /// Высота прорисовки военного корабля + protected DrawingWarship(int drawingWarshipWidth, int drawingWarshipHeight) : this() + { + _drawingWarshipWidth = drawingWarshipWidth; + _drawingWarshipHeight = drawingWarshipHeight; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + + public bool SetPictureSize(int width, int height) + { + //TODO проверка, что объект "влезает" в размеры поля + //если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена + + if (_drawingWarshipWidth > width || _drawingWarshipHeight > height) + { + return false; + } + _pictureWidth = width; + _pictureHeight = height; + + if (_startPosX.HasValue || _startPosY.HasValue) + { + + if (_startPosX + _drawingWarshipWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawingWarshipWidth; + } + else if (_startPosX < 0) _startPosX = 0; + if (_startPosY + _drawingWarshipHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawingWarshipHeight; + } + 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 + _drawingWarshipWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawingWarshipWidth; + } + else if (x < 0) _startPosX = 0; + else _startPosX = x; + + if (y + _drawingWarshipHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawingWarshipHeight; + } + else if (y < 0) _startPosY = 0; + else _startPosY = y; + + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещение выполнено, false - перемещение невозможно + + public bool MoveTransport(DirectionType direction) + { + if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityWarship.Step > 0) + { + _startPosX -= (int)EntityWarship.Step; + } + return true; + + //вправо + case DirectionType.Right: + if (_startPosX.Value + EntityWarship.Step + _drawingWarshipWidth < _pictureWidth) + { + _startPosX += (int)EntityWarship.Step; + } + return true; + + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityWarship.Step > 0) + { + _startPosY -= (int)EntityWarship.Step; + } + return true; + + //вниз + case DirectionType.Down: + if (_startPosY.Value + EntityWarship.Step + _drawingWarshipHeight < _pictureHeight) + { + _startPosY += (int)EntityWarship.Step; + } + return true; + + default: + return false; + } + + } + + /// + /// Прорисовка объекта + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (EntityWarship == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + + Brush main = new SolidBrush(EntityWarship.BodyColor); + //Заливка линкора + Point point1 = new Point(_startPosX.Value + 5, _startPosY.Value + 5); + Point point2 = new Point(_startPosX.Value + 110, _startPosY.Value + 5); + Point point3 = new Point(_startPosX.Value + 150, _startPosY.Value + 42); + Point point4 = new Point(_startPosX.Value + 110, _startPosY.Value + 80); + Point point5 = new Point(_startPosX.Value + 5, _startPosY.Value + 80); + Point point6 = new Point(_startPosX.Value + 5, _startPosY.Value + 5); + + Point[] LinkorLine = { point1, point2, point3, point4, point5, point6 }; + g.FillPolygon(main, LinkorLine); + + //границы линкора + g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 5, _startPosX.Value + 110, _startPosY.Value + 5); + g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 80, _startPosX.Value + 110, _startPosY.Value + 80); + g.DrawLine(pen, _startPosX.Value + 5, _startPosY.Value + 5, _startPosX.Value + 5, _startPosY.Value + 80); + g.DrawLine(pen, _startPosX.Value + 110, _startPosY.Value + 5, _startPosX.Value + 150, _startPosY.Value + 42); + g.DrawLine(pen, _startPosX.Value + 110, _startPosY.Value + 80, _startPosX.Value + 150, _startPosY.Value + 42); + + + //ракета + Brush brfara = new SolidBrush(Color.Blue); + g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 35, 15, 15); + g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 40, 15, 5); + g.FillRectangle(brfara, _startPosX.Value + 25, _startPosY.Value + 35, 15, 15); + g.FillRectangle(brfara, _startPosX.Value + 10, _startPosY.Value + 40, 15, 5); + + //Парус + g.DrawArc(pen, _startPosX.Value + 45, _startPosY.Value + 15, 35, 60, 280, 160); + g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value + 17, _startPosX.Value + 67, _startPosY.Value + 72); + g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 72); + g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 17); + g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 45); + g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 35); + g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 55); + + } + + +} diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs new file mode 100644 index 0000000..59bbcd5 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs @@ -0,0 +1,75 @@ +using ProjectLinkor.Entities; + +namespace ProjectLinkor.Drawnings; +/// +/// Класс отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningLinkor : DrawingWarship +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес линкора + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия орудийной башни + /// Признак наличия отсека под ракеты + /// Признак наличия + public DrawningLinkor(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) : base(148, 75) + { + EntityWarship = new EntityLinkor(speed, weigth, bodyColor, additionalColor, gunTurret, compartment, linkorMotor); + } + + /// + /// Прорисовка объекта + /// + /// + public override void DrawTransport(Graphics g) + { + if (EntityWarship == null || EntityWarship is not EntityLinkor linkor || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(linkor.AdditionalColor); + + base.DrawTransport(g); + + //Орудийная башня + if (linkor.GunTurret) + { + g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 27, 30, 30); + g.DrawEllipse(pen, _startPosX.Value + 95, _startPosY.Value + 32, 20, 20); + g.FillEllipse(additionalBrush, _startPosX.Value + 90, _startPosY.Value + 27, 30, 30); + g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 32, 20, 20); + } + + //Дополнительнst ракетs + if (linkor.Сompartment) + { + //границы ракет + g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 59, 15, 15); + g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 64, 15, 5); + g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 12, 15, 15); + g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 17, 15, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 59, 15, 15); + g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 64, 15, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 12, 15, 15); + g.FillRectangle(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 17, 15, 5); + + } + + //Мотор + if (linkor.LinkorMotor) + { + Brush br = new SolidBrush(Color.Black); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 59, 5, 15); + g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 59, 5, 15); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 5, 15); + g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 5, 15); + } + + } +} diff --git a/ProjectSportCar/ProjectSportCar/EntityLinkor.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs similarity index 78% rename from ProjectSportCar/ProjectSportCar/EntityLinkor.cs rename to ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs index 9f433ec..9d5f749 100644 --- a/ProjectSportCar/ProjectSportCar/EntityLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs @@ -1,23 +1,20 @@ -namespace ProjectLinkor; +namespace ProjectLinkor.Entities; /// /// Класс-сущность "Линкор" /// -public class EntityLinkor +public class EntityLinkor : EntityWarship { - /// /// Скорость /// public int Speed { get; private set; } - /// /// Вес /// - public double Weigth { get; private set; } - + public double Weight { get; private set; } /// - /// Основной цвет + /// Основной цвет /// public Color BodyColor { get; private set; } @@ -42,12 +39,12 @@ public class EntityLinkor public bool LinkorMotor { get; private set; } /// - /// Шаг перемещения линкора + /// Перемещение линкора /// - public double Step => Speed * 100 / Weigth; + public double Step => Speed * 100 / Weight; /// - /// Иницилизация полей объекта-класса линкора + /// Конструктор /// /// /// Скорость @@ -57,10 +54,10 @@ public class EntityLinkor /// Признак наличия орудийной башни /// Признак наличия отсека под ракеты /// Признак наличия - public void Init(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) + public EntityLinkor(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) : base(speed, weigth, bodyColor) { Speed = speed; - Weigth = weigth; + Weight = weigth; BodyColor = bodyColor; AdditionalColor = additionalColor; GunTurret = gunTurret; diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs new file mode 100644 index 0000000..6e22d99 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs @@ -0,0 +1,37 @@ +namespace ProjectLinkor.Entities; + +/// +/// Класс-сущность "Военный корабль" +/// +public class EntityWarship +{ + /// + /// Скорость + /// + 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 EntityWarship(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectSportCar/ProjectSportCar/FormLinkor.Designer.cs b/ProjectSportCar/ProjectSportCar/FormLinkor.Designer.cs index 4597716..1e5b884 100644 --- a/ProjectSportCar/ProjectSportCar/FormLinkor.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormLinkor.Designer.cs @@ -34,6 +34,7 @@ buttonRight = new Button(); buttonUp = new Button(); buttonDown = new Button(); + buttonWarship = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxLinkor).BeginInit(); SuspendLayout(); // @@ -51,9 +52,9 @@ buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreate.Location = new Point(12, 433); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(94, 29); + buttonCreate.Size = new Size(191, 29); buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать"; + buttonCreate.Text = "Создать Линкор"; buttonCreate.UseVisualStyleBackColor = true; buttonCreate.Click += ButtonCreate_Click; // @@ -105,11 +106,22 @@ buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // + // buttonWarship + // + buttonWarship.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonWarship.Location = new Point(209, 433); + buttonWarship.Name = "buttonWarship"; + buttonWarship.Size = new Size(216, 29); + buttonWarship.TabIndex = 6; + buttonWarship.Text = "Создать Военный корабль"; + buttonWarship.UseVisualStyleBackColor = true; + // // FormLinkor // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(857, 474); + Controls.Add(buttonWarship); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonRight); @@ -130,5 +142,6 @@ private Button buttonRight; private Button buttonUp; private Button buttonDown; + private Button buttonWarship; } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormLinkor.cs b/ProjectSportCar/ProjectSportCar/FormLinkor.cs index a7c126b..09b1cb8 100644 --- a/ProjectSportCar/ProjectSportCar/FormLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/FormLinkor.cs @@ -1,81 +1,100 @@ -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 ProjectLinkor.Drawnings; -namespace ProjectLinkor +namespace ProjectLinkor; + +public partial class FormLinkor : Form { - public partial class FormLinkor : Form + private DrawingWarship? _drawningWarship; + + public FormLinkor() { - private DrawningLinkor? _drawningLinkor; + InitializeComponent(); + } - public FormLinkor() + private void Draw() + { + + if (_drawningWarship == null) { - InitializeComponent(); + return; } - private void Draw() + Bitmap bmp = new(pictureBoxLinkor.Width, pictureBoxLinkor.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningWarship.DrawTransport(gr); + pictureBoxLinkor.Image = bmp; + } + + private void CreateObject(string type) + { + Random random = new(); + switch (type) { - - if (_drawningLinkor == null) - { - return; - } - - Bitmap bmp = new(pictureBoxLinkor.Width, pictureBoxLinkor.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningLinkor.DrawTransport(gr); - pictureBoxLinkor.Image = bmp; - } - - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningLinkor = new DrawningLinkor(); - _drawningLinkor.Init(random.Next(100, 300), random.Next(1000, 3000), + case nameof(DrawingWarship): + _drawningWarship = new DrawingWarship(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(DrawningLinkor): + _drawningWarship = new DrawningLinkor(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))); - _drawningLinkor.SetPictureSize(pictureBoxLinkor.Width, pictureBoxLinkor.Height); - _drawningLinkor.SetPosition(random.Next(10, 100), random.Next(10, 100)); + break; + default: + return; + } + _drawningWarship.SetPictureSize(pictureBoxLinkor.Width, pictureBoxLinkor.Height); + _drawningWarship.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxLinkor.Width, pictureBoxLinkor.Height); + Draw(); + } - Draw(); + /// + /// обработка нажатия кнопки "создать линкор" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLinkor)); + /// + /// обработка нажатия кнопки "создать военный корабль" + /// + /// + /// + private void ButtonWarship_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingWarship)); + + /// + /// кнопки вверх/вниз/влево/вправо + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningWarship == null) + { + return; } - private void ButtonMove_Click(object sender, EventArgs e) + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) { - if (_drawningLinkor == null) - { - return; - } - - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningLinkor.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningLinkor.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningLinkor.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningLinkor.MoveTransport(DirectionType.Right); - break; - } - if (result) - { - Draw(); - } + case "buttonUp": + result = _drawningWarship.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningWarship.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningWarship.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningWarship.MoveTransport(DirectionType.Right); + break; + } + if (result) + { + Draw(); } } + }