diff --git a/AirFighter/AirFighter/DirectionType.cs b/AirFighter/AirFighter/DirectionType.cs deleted file mode 100644 index b8b90c5..0000000 --- a/AirFighter/AirFighter/DirectionType.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ProjectAirFighter; - -public enum DirectionType -{ - Up = 1, - - Down = 2, - - Left = 3, - - Right = 4 -} \ No newline at end of file diff --git a/AirFighter/AirFighter/Drawnings/DirectionType.cs b/AirFighter/AirFighter/Drawnings/DirectionType.cs new file mode 100644 index 0000000..5839437 --- /dev/null +++ b/AirFighter/AirFighter/Drawnings/DirectionType.cs @@ -0,0 +1,28 @@ +namespace ProjectAirFighter.Drawnings; + +/// +/// Направление перемещения +/// + +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs b/AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs new file mode 100644 index 0000000..192246b --- /dev/null +++ b/AirFighter/AirFighter/Drawnings/DrawningAirFighter.cs @@ -0,0 +1,77 @@ +using ProjectAirFighter.Entities; + +namespace ProjectAirFighter.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningAirFighter : DrawningFighter +{ + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия доп крыльев + /// Признак наличия ракет + public DrawningAirFighter (int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base (70, 70) + { + EntityFighter = new EntityAirFighter(speed, weight, bodyColor, additionalColor, wings, rockets); + } + + public override void DrawTransport(Graphics g) + { + if (EntityFighter == null || EntityFighter is not EntityAirFighter airFighter || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(airFighter.AdditionalColor); + + base.DrawTransport(g); + + if (airFighter.Wings) + { + Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30); + Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15); + Point wings3 = new Point(_startPosX.Value + 50, _startPosY.Value + 15); + Point wings4 = new Point(_startPosX.Value + 55, _startPosY.Value + 30); + Point[] UpWing = { wings1, wings2, wings3, wings4 }; + g.FillPolygon(additionalBrush, UpWing); + g.DrawPolygon(pen, UpWing); + + Point wings5 = new Point(_startPosX.Value + 45, _startPosY.Value + 40); + Point wings6 = new Point(_startPosX.Value + 45, _startPosY.Value + 55); + Point wings7 = new Point(_startPosX.Value + 50, _startPosY.Value + 55); + Point wings8 = new Point(_startPosX.Value + 55, _startPosY.Value + 40); + Point[] DownWing = { wings5, wings6, wings7, wings8 }; + g.FillPolygon(additionalBrush, DownWing); + g.DrawPolygon(pen, DownWing); + } + + if (airFighter.Rockets) + { + Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5); + Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5); + Point rocket3 = new Point(_startPosX.Value + 10, _startPosY.Value + 10); + Point rocket4 = new Point(_startPosX.Value + 15, _startPosY.Value + 15); + Point rocket5 = new Point(_startPosX.Value + 40, _startPosY.Value + 15); + Point[] Rocket1 = { rocket1, rocket2, rocket3, rocket4, rocket5 }; + g.FillPolygon(additionalBrush, Rocket1); + g.DrawPolygon(pen, Rocket1); + + Point rocket6 = new Point(_startPosX.Value + 40, _startPosY.Value + 55); + Point rocket7 = new Point(_startPosX.Value + 15, _startPosY.Value + 55); + Point rocket8 = new Point(_startPosX.Value + 10, _startPosY.Value + 60); + Point rocket9 = new Point(_startPosX.Value + 15, _startPosY.Value + 65); + Point rocket10 = new Point(_startPosX.Value + 40, _startPosY.Value + 65); + Point[] Rocket2 = { rocket6, rocket7, rocket8, rocket9, rocket10 }; + g.FillPolygon(additionalBrush, Rocket2); + g.DrawPolygon(pen, Rocket2); + } + } +} \ No newline at end of file diff --git a/AirFighter/AirFighter/DrawningAirFighter.cs b/AirFighter/AirFighter/Drawnings/DrawningFighter.cs similarity index 57% rename from AirFighter/AirFighter/DrawningAirFighter.cs rename to AirFighter/AirFighter/Drawnings/DrawningFighter.cs index 4d796bd..612c1f7 100644 --- a/AirFighter/AirFighter/DrawningAirFighter.cs +++ b/AirFighter/AirFighter/Drawnings/DrawningFighter.cs @@ -1,31 +1,80 @@ -namespace ProjectAirFighter; +using ProjectAirFighter.Entities; -public class DrawningAirFighter +namespace ProjectAirFighter.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности +/// +public class DrawningFighter { - public EntityAirFighter? EntityAirFighter { get; private set; } + /// + /// Класс-сущность + /// + public EntityFighter? EntityFighter { get; protected set; } + /// + /// Ширина окна + /// private int? _pictureWidth; + /// + /// Высота окна + /// private int? _pictureHeight; - private int? _startPosX; + /// + /// Левая координата прорисовки самолёта + /// + protected int? _startPosX; - private int? _startPosY; + /// + /// Верхняя кооридната прорисовки самолёта + /// + protected int? _startPosY; + /// + /// Ширина прорисовки самолёта + /// private readonly int _drawningFighterWidth = 70; + /// + /// Высота прорисовки самолёта + /// private readonly int _drawningFighterHeight = 70; - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) + /// + /// Пустой конструктор + /// + private DrawningFighter() { - EntityAirFighter = new EntityAirFighter(); - EntityAirFighter.Init(speed, weight, bodyColor, additionalColor, wings, rockets); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningFighter (int speed, double weight, Color bodyColor) : this() + { + EntityFighter = new EntityFighter(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки самолёта + /// Высота прорисовки самолёта + protected DrawningFighter(int drawningFighterWidth, int drawningFighterHeight) : this() + { + _drawningFighterWidth = drawningFighterWidth; + _drawningFighterHeight = drawningFighterHeight; + } + public bool SetPictureSize(int width, int height) { if (_drawningFighterWidth < width && _drawningFighterHeight < height) @@ -48,7 +97,7 @@ public class DrawningAirFighter { return; } - + if (x + _drawningFighterWidth > _pictureWidth) { _startPosX = _pictureWidth - _drawningFighterWidth; @@ -69,15 +118,15 @@ public class DrawningAirFighter { _startPosY = 0; } - else - { + else + { _startPosY = y; } } public bool MoveTransport(DirectionType direction) { - if (EntityAirFighter == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityFighter == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -85,27 +134,27 @@ public class DrawningAirFighter switch (direction) { case DirectionType.Left: - if (_startPosX.Value - EntityAirFighter.Step > 0) + if (_startPosX.Value - EntityFighter.Step > 0) { - _startPosX -= (int)EntityAirFighter.Step; + _startPosX -= (int)EntityFighter.Step; } return true; case DirectionType.Up: - if (_startPosY.Value - EntityAirFighter.Step > 0) + if (_startPosY.Value - EntityFighter.Step > 0) { - _startPosY -= (int)EntityAirFighter.Step; + _startPosY -= (int)EntityFighter.Step; } return true; case DirectionType.Right: - if (_startPosX.Value + _drawningFighterWidth + EntityAirFighter.Step < _pictureWidth) + if (_startPosX.Value + _drawningFighterWidth + EntityFighter.Step < _pictureWidth) { - _startPosX += (int)EntityAirFighter.Step; + _startPosX += (int)EntityFighter.Step; } return true; case DirectionType.Down: - if (_startPosY.Value + _drawningFighterHeight + EntityAirFighter.Step < _pictureHeight) + if (_startPosY.Value + _drawningFighterHeight + EntityFighter.Step < _pictureHeight) { - _startPosY += (int)EntityAirFighter.Step; + _startPosY += (int)EntityFighter.Step; } return true; default: @@ -113,16 +162,15 @@ public class DrawningAirFighter } } - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityAirFighter == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityFighter == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush br = new SolidBrush(EntityAirFighter.BodyColor); - Brush additionalBrush = new SolidBrush(EntityAirFighter.AdditionalColor); + Brush br = new SolidBrush(EntityFighter.BodyColor); g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10); g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 30, 60, 10); @@ -167,45 +215,5 @@ public class DrawningAirFighter Point[] HvostDown = { point13, point14, point15, point16 }; g.FillPolygon(brPink, HvostDown); g.DrawPolygon(pen, HvostDown); - - if (EntityAirFighter.Wings) - { - Point wings1 = new Point(_startPosX.Value + 45, _startPosY.Value + 30); - Point wings2 = new Point(_startPosX.Value + 45, _startPosY.Value + 15); - Point wings3 = new Point(_startPosX.Value + 50, _startPosY.Value + 15); - Point wings4 = new Point(_startPosX.Value + 55, _startPosY.Value + 30); - Point[] UpWing = { wings1, wings2, wings3, wings4 }; - g.FillPolygon(additionalBrush, UpWing); - g.DrawPolygon(pen, UpWing); - - Point wings5 = new Point(_startPosX.Value + 45, _startPosY.Value + 40); - Point wings6 = new Point(_startPosX.Value + 45, _startPosY.Value + 55); - Point wings7 = new Point(_startPosX.Value + 50, _startPosY.Value + 55); - Point wings8 = new Point(_startPosX.Value + 55, _startPosY.Value + 40); - Point[] DownWing = { wings5, wings6, wings7, wings8 }; - g.FillPolygon(additionalBrush, DownWing); - g.DrawPolygon(pen, DownWing); - } - - if (EntityAirFighter.Rockets) - { - Point rocket1 = new Point(_startPosX.Value + 40, _startPosY.Value + 5); - Point rocket2 = new Point(_startPosX.Value + 15, _startPosY.Value + 5); - Point rocket3 = new Point(_startPosX.Value + 10, _startPosY.Value + 10); - Point rocket4 = new Point(_startPosX.Value + 15, _startPosY.Value + 15); - Point rocket5 = new Point(_startPosX.Value + 40, _startPosY.Value + 15); - Point[] Rocket1 = { rocket1, rocket2, rocket3, rocket4, rocket5 }; - g.FillPolygon(additionalBrush, Rocket1); - g.DrawPolygon(pen, Rocket1); - - Point rocket6 = new Point(_startPosX.Value + 40, _startPosY.Value + 55); - Point rocket7 = new Point(_startPosX.Value + 15, _startPosY.Value + 55); - Point rocket8 = new Point(_startPosX.Value + 10, _startPosY.Value + 60); - Point rocket9 = new Point(_startPosX.Value + 15, _startPosY.Value + 65); - Point rocket10 = new Point(_startPosX.Value + 40, _startPosY.Value + 65); - Point[] Rocket2 = { rocket6, rocket7, rocket8, rocket9, rocket10 }; - g.FillPolygon(additionalBrush, Rocket2); - g.DrawPolygon(pen, Rocket2); - } } -} \ No newline at end of file +} diff --git a/AirFighter/AirFighter/Entities/EntityAirFighter.cs b/AirFighter/AirFighter/Entities/EntityAirFighter.cs new file mode 100644 index 0000000..5821924 --- /dev/null +++ b/AirFighter/AirFighter/Entities/EntityAirFighter.cs @@ -0,0 +1,20 @@ +namespace ProjectAirFighter.Entities; + +/// +/// Класс-сущность "Истребитель" +/// +public class EntityAirFighter : EntityFighter +{ + public Color AdditionalColor { get; private set; } + + public bool Wings { get; private set; } + + public bool Rockets { get; private set; } + + public EntityAirFighter(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) : base(5, 45, Color.Black) + { + AdditionalColor = additionalColor; + Rockets = rockets; + Wings = wings; + } +} \ No newline at end of file diff --git a/AirFighter/AirFighter/Entities/EntityFighter.cs b/AirFighter/AirFighter/Entities/EntityFighter.cs new file mode 100644 index 0000000..34694a6 --- /dev/null +++ b/AirFighter/AirFighter/Entities/EntityFighter.cs @@ -0,0 +1,29 @@ +namespace ProjectAirFighter.Entities; + +/// +/// Класс-сущность "Истребитель" +/// +public class EntityFighter +{ + 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 EntityFighter (int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/AirFighter/AirFighter/EntityAirFighter.cs b/AirFighter/AirFighter/EntityAirFighter.cs deleted file mode 100644 index b5e3d5d..0000000 --- a/AirFighter/AirFighter/EntityAirFighter.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace ProjectAirFighter; - -public class EntityAirFighter -{ - 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 Wings { get; private set; } - - public bool Rockets { get; private set; } - - public double Step => Speed * 100 / Weight; - - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool wings, bool rockets) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - - Rockets = rockets; - Wings = wings; - } -} \ No newline at end of file diff --git a/AirFighter/AirFighter/FormAirFighter.Designer.cs b/AirFighter/AirFighter/FormAirFighter.Designer.cs index b05f845..3189eb7 100644 --- a/AirFighter/AirFighter/FormAirFighter.Designer.cs +++ b/AirFighter/AirFighter/FormAirFighter.Designer.cs @@ -21,32 +21,33 @@ /// private void InitializeComponent() { - pictureBox1 = new PictureBox(); + pictureBoxAirFighter = new PictureBox(); buttonCreateAirFighter = new Button(); buttonDown = new Button(); buttonRight = new Button(); buttonLeft = new Button(); buttonUp = new Button(); - ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); + buttonCreateFighter = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxAirFighter).BeginInit(); SuspendLayout(); // - // pictureBox1 + // pictureBoxAirFighter // - pictureBox1.Dock = DockStyle.Fill; - pictureBox1.Location = new Point(0, 0); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new Size(800, 450); - pictureBox1.TabIndex = 0; - pictureBox1.TabStop = false; + pictureBoxAirFighter.Dock = DockStyle.Fill; + pictureBoxAirFighter.Location = new Point(0, 0); + pictureBoxAirFighter.Name = "pictureBoxAirFighter"; + pictureBoxAirFighter.Size = new Size(800, 450); + pictureBoxAirFighter.TabIndex = 0; + pictureBoxAirFighter.TabStop = false; // // buttonCreateAirFighter // buttonCreateAirFighter.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateAirFighter.Location = new Point(12, 409); buttonCreateAirFighter.Name = "buttonCreateAirFighter"; - buttonCreateAirFighter.Size = new Size(94, 29); + buttonCreateAirFighter.Size = new Size(169, 29); buttonCreateAirFighter.TabIndex = 1; - buttonCreateAirFighter.Text = "Создать"; + buttonCreateAirFighter.Text = "Создать истребитель"; buttonCreateAirFighter.UseVisualStyleBackColor = true; buttonCreateAirFighter.Click += buttonCreateAirFighter_Click; // @@ -98,30 +99,43 @@ buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // + // buttonCreateFighter + // + buttonCreateFighter.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateFighter.Location = new Point(196, 409); + buttonCreateFighter.Name = "buttonCreateFighter"; + buttonCreateFighter.Size = new Size(169, 29); + buttonCreateFighter.TabIndex = 6; + buttonCreateFighter.Text = "Создать самолёт"; + buttonCreateFighter.UseVisualStyleBackColor = true; + buttonCreateFighter.Click += buttonCreateAir_Click; + // // FormAirFighter // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); + Controls.Add(buttonCreateFighter); Controls.Add(buttonUp); Controls.Add(buttonLeft); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonCreateAirFighter); - Controls.Add(pictureBox1); + Controls.Add(pictureBoxAirFighter); Name = "FormAirFighter"; Text = "Истребитель"; - ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxAirFighter).EndInit(); ResumeLayout(false); } #endregion - private PictureBox pictureBox1; + private PictureBox pictureBoxAirFighter; private Button buttonCreateAirFighter; private Button buttonDown; private Button buttonRight; private Button buttonLeft; private Button buttonUp; + private Button buttonCreateFighter; } } \ No newline at end of file diff --git a/AirFighter/AirFighter/FormAirFighter.cs b/AirFighter/AirFighter/FormAirFighter.cs index c987e99..cdfe174 100644 --- a/AirFighter/AirFighter/FormAirFighter.cs +++ b/AirFighter/AirFighter/FormAirFighter.cs @@ -1,8 +1,10 @@ -namespace ProjectAirFighter; +using ProjectAirFighter.Drawnings; + +namespace ProjectAirFighter; public partial class FormAirFighter : Form { - private DrawningAirFighter? _drawningAirFighter; + private DrawningFighter? _drawningFighter; public FormAirFighter() { @@ -11,33 +13,48 @@ public partial class FormAirFighter : Form private void Draw() { - if (_drawningAirFighter == null) + if (_drawningFighter == null) { return; } - Bitmap bmp = new(pictureBox1.Width, pictureBox1.Height); + Bitmap bmp = new(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningAirFighter.DrawTransport(gr); - pictureBox1.Image = bmp; + _drawningFighter.DrawTransport(gr); + pictureBoxAirFighter.Image = bmp; } - private void buttonCreateAirFighter_Click(object sender, EventArgs e) + private void CreateObject(string type) { Random random = new(); - _drawningAirFighter = new DrawningAirFighter(); - _drawningAirFighter.Init(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - _drawningAirFighter.SetPictureSize(pictureBox1.Width, pictureBox1.Height); - _drawningAirFighter.SetPosition(random.Next(10, 100), random.Next(10, 100)); + switch (type) + { + case nameof(DrawningFighter): + _drawningFighter = new DrawningFighter(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(DrawningAirFighter): + _drawningFighter = new DrawningAirFighter(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + + _drawningFighter.SetPictureSize(pictureBoxAirFighter.Width, pictureBoxAirFighter.Height); + _drawningFighter.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); } + private void buttonCreateAirFighter_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirFighter)); + + private void buttonCreateAir_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningFighter)); + private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningAirFighter == null) + if (_drawningFighter == null) { return; } @@ -47,16 +64,16 @@ public partial class FormAirFighter : Form switch (name) { case "buttonUp": - result = _drawningAirFighter.MoveTransport(DirectionType.Up); + result = _drawningFighter.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningAirFighter.MoveTransport(DirectionType.Down); + result = _drawningFighter.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningAirFighter.MoveTransport(DirectionType.Left); + result = _drawningFighter.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningAirFighter.MoveTransport(DirectionType.Right); + result = _drawningFighter.MoveTransport(DirectionType.Right); break; }