From 8f21a3d0c468f5b7f14903d894e0b237947ad3d0 Mon Sep 17 00:00:00 2001 From: Zyzf Date: Sun, 25 Sep 2022 13:16:55 +0400 Subject: [PATCH 1/6] added constructors --- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs | 5 ++--- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs | 2 +- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs index 707c66d..dbaba21 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs @@ -42,10 +42,9 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// Скорость /// Вес автомобиля /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningBoat(int speed, float weight, Color bodyColor) { - Boat = new EntityBoat(); - Boat.Init(speed, weight, bodyColor); + Boat = new EntityBoat(speed, weight, bodyColor); } /// /// Установка позиции автомобиля diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs index 2e68e8e..cc06a28 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntityBoat.cs @@ -12,7 +12,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base public float Weight { get; private set; } public Color BodyColor { get; private set; } public float Step => Speed * 100 / Weight; - public void Init(int speed, float weight, Color bodyColor) + public EntityBoat(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(5, 30) : speed; diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs index 11cea2d..12c9297 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs @@ -26,8 +26,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _boat = new DrawningBoat(); - _boat.Init(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _boat = new DrawningBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBoat.Width, pictureBoxBoat.Height); toolStripStatusLabelSpeed.Text = $": {_boat.Boat.Speed}"; toolStripStatusLabelWeight.Text = $": {_boat.Boat.Weight}"; -- 2.25.1 From 8f9347bf3e489ec1d802fa94e60423105294a3db Mon Sep 17 00:00:00 2001 From: Zyzf Date: Sun, 25 Sep 2022 16:33:29 +0400 Subject: [PATCH 2/6] added interface --- .../DrawningBoat.cs | 30 ++++++-- .../DrawningObjectBoat.cs | 38 ++++++++++ .../DrawningSportBoat.cs | 72 +++++++++++++++++++ .../EntitySportBoat.cs | 46 ++++++++++++ .../FormBoat.Designer.cs | 58 ++++++++++----- .../FormBoat.cs | 29 ++++++-- .../IDrawningObject.cs | 41 +++++++++++ 7 files changed, 286 insertions(+), 28 deletions(-) create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntitySportBoat.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/IDrawningObject.cs diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs index dbaba21..331603a 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs @@ -11,15 +11,15 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// /// Класс-сущность /// - public EntityBoat Boat { private set; get; } + public EntityBoat Boat { protected set; get; } /// /// Левая координата отрисовки автомобиля /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки автомобиля /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -47,6 +47,21 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base Boat = new EntityBoat(speed, weight, bodyColor); } /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Ширина отрисовки автомобиля + /// Высота отрисовки автомобиля + protected DrawningBoat(int speed, float weight, Color bodyColor, int boatWidth, int boatHeight) : + this(speed, weight, bodyColor) + { + _boatWidth = boatWidth; + _boatHeight = boatHeight; + } + /// + /// /// Установка позиции автомобиля /// /// Координата X @@ -109,7 +124,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// Отрисовка лодки /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -118,7 +133,6 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base } Pen pen = new(Color.Black, 3); Brush br = new SolidBrush(Boat?.BodyColor ?? Color.Black); - Brush brBrown = new SolidBrush(Color.Brown); // Внешняя часть лодки g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 120, _startPosY + 0); g.DrawLine(pen, _startPosX + 120, _startPosY, _startPosX + 170, _startPosY + 30); @@ -132,7 +146,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base PointF pt5 = new PointF(_startPosX, _startPosY + 60); g.FillPolygon(br, new PointF[] { pt1, pt2, pt3, pt4, pt5}); // Внутренняя часть лодки - g.FillEllipse(brBrown, _startPosX + 10, _startPosY + 10, 110, 40); + g.FillEllipse(new SolidBrush(Color.Brown), _startPosX + 10, _startPosY + 10, 110, 40); } /// /// Смена границ формы отрисовки @@ -158,5 +172,9 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base _startPosY = _pictureHeight.Value - _boatHeight; } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight); + } } } diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs new file mode 100644 index 0000000..54f6375 --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal class DrawningObjectBoat : IDrawningObject + { + private DrawningBoat _boat = null; + public DrawningObjectBoat(DrawningBoat boat) + { + _boat = boat; + } + public float Step => _boat?.Boat?.Step ?? 0; + + public void DrawningObject(Graphics g) + { + // TODO + } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _boat?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _boat.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _boat.SetPosition(x, y, width, height); + } + } +} diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs new file mode 100644 index 0000000..b610506 --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal class DrawningSportBoat : DrawningBoat + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public DrawningSportBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor, 195, 60) + { + Boat = new EntitySportBoat(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); + } + public override void DrawTransport(Graphics g) + { + if (Boat is not EntitySportBoat sportBoat) + { + return; + } + Pen pen = new(Color.Black); + Brush baseBrush = new SolidBrush(sportBoat?.BodyColor ?? Color.Black); + Brush dopBrush = new SolidBrush(sportBoat?.DopColor ?? Color.Black); + _startPosX += 25; + _startPosY += 10; + base.DrawTransport(g); + _startPosX -= 25; + _startPosY -= 10; + if (sportBoat.Wing) + { + g.FillRectangle(dopBrush, _startPosX, _startPosY, 20, 80); + g.DrawRectangle(pen, _startPosX, _startPosY, 20, 80); + g.FillRectangle(baseBrush, _startPosX + 20, _startPosY + 20, 10, 40); + g.DrawRectangle(pen, _startPosX + 20, _startPosY + 20, 10, 40); + } + _startPosX += 25; + _startPosY += 10; + if (sportBoat.BodyKit) + { + PointF pt1 = new PointF(_startPosX + 120, _startPosY + 10); + PointF pt2 = new PointF(_startPosX + 155, _startPosY + 30); + PointF pt3 = new PointF(_startPosX + 120, _startPosY + 50); + PointF pt4 = new PointF(_startPosX + 120, _startPosY + 45); + PointF pt5 = new PointF(_startPosX + 145, _startPosY + 30); + PointF pt6 = new PointF(_startPosX + 120, _startPosY + 15); + g.FillPolygon(dopBrush, new PointF[] { pt1, pt2, pt3, pt4, pt5, pt6 }); + } + if (sportBoat.SportLine) + { + PointF pt1 = new PointF(_startPosX + 70, _startPosY); + PointF pt2 = new PointF(_startPosX + 80, _startPosY); + PointF pt3 = new PointF(_startPosX + 120, _startPosY + 60); + PointF pt4 = new PointF(_startPosX + 110, _startPosY + 60); + g.FillPolygon(dopBrush, new PointF[] { pt1, pt2, pt3, pt4 }); + g.FillEllipse(new SolidBrush(Color.Brown), _startPosX + 10, _startPosY + 10, 110, 40); + } + _startPosX -= 25; + _startPosY -= 10; + } + } +} diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntitySportBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntitySportBoat.cs new file mode 100644 index 0000000..3d48c1c --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/EntitySportBoat.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal class EntitySportBoat : EntityBoat + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия обвеса + /// + public bool BodyKit { get; private set; } + /// + /// Признак наличия антикрыла + /// + public bool Wing { get; private set; } + /// + /// Признак наличия гоночной полосы + /// + public bool SportLine { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public EntitySportBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + BodyKit = bodyKit; + Wing = wing; + SportLine = sportLine; + } + } +} diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.Designer.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.Designer.cs index 39b526d..3b3e808 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.Designer.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonUp = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit(); this.SuspendLayout(); @@ -49,28 +50,29 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 427); + this.statusStrip1.Location = new System.Drawing.Point(0, 318); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(882, 26); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip1.Size = new System.Drawing.Size(772, 22); this.statusStrip1.TabIndex = 0; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); this.toolStripStatusLabelSpeed.Text = "Скорость:"; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); this.toolStripStatusLabelWeight.Text = "Вес:"; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); this.toolStripStatusLabelBodyColor.Text = "Цвет:"; // // pictureBoxBoat @@ -78,8 +80,9 @@ this.pictureBoxBoat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBoat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBoxBoat.Name = "pictureBoxBoat"; - this.pictureBoxBoat.Size = new System.Drawing.Size(882, 427); + this.pictureBoxBoat.Size = new System.Drawing.Size(772, 318); this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxBoat.TabIndex = 1; this.pictureBoxBoat.TabStop = false; @@ -89,9 +92,10 @@ // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(12, 385); + this.buttonCreate.Location = new System.Drawing.Point(10, 289); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.Size = new System.Drawing.Size(82, 22); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -102,9 +106,10 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.right; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(820, 374); + this.buttonRight.Location = new System.Drawing.Point(718, 280); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(40, 40); + this.buttonRight.Size = new System.Drawing.Size(35, 30); this.buttonRight.TabIndex = 3; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); @@ -114,9 +119,10 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.left; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(728, 374); + this.buttonLeft.Location = new System.Drawing.Point(637, 280); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(40, 40); + this.buttonLeft.Size = new System.Drawing.Size(35, 30); this.buttonLeft.TabIndex = 4; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); @@ -126,9 +132,10 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.up; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(774, 328); + this.buttonUp.Location = new System.Drawing.Point(677, 246); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(40, 40); + this.buttonUp.Size = new System.Drawing.Size(35, 30); this.buttonUp.TabIndex = 5; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); @@ -138,18 +145,31 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.down; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(774, 374); + this.buttonDown.Location = new System.Drawing.Point(677, 280); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(40, 40); + this.buttonDown.Size = new System.Drawing.Size(35, 30); this.buttonDown.TabIndex = 6; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(98, 289); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(99, 22); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // // FormBoat // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(882, 453); + this.ClientSize = new System.Drawing.Size(772, 340); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonUp); this.Controls.Add(this.buttonLeft); @@ -157,6 +177,7 @@ this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxBoat); this.Controls.Add(this.statusStrip1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormBoat"; this.Text = "Лодка"; this.statusStrip1.ResumeLayout(false); @@ -179,5 +200,6 @@ private Button buttonLeft; private Button buttonUp; private Button buttonDown; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs index 12c9297..ef721fe 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs @@ -18,6 +18,17 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git _boat?.DrawTransport(gr); pictureBoxBoat.Image = bmp; } + /// + /// + /// + private void SetData() + { + Random rnd = new Random(); + _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBoat.Width, pictureBoxBoat.Height); + toolStripStatusLabelSpeed.Text = $": {_boat.Boat.Speed}"; + toolStripStatusLabelWeight.Text = $": {_boat.Boat.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_boat.Boat.BodyColor.Name}"; + } /// /// "" /// @@ -27,10 +38,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git { Random rnd = new(); _boat = new DrawningBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _boat.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBoat.Width, pictureBoxBoat.Height); - toolStripStatusLabelSpeed.Text = $": {_boat.Boat.Speed}"; - toolStripStatusLabelWeight.Text = $": {_boat.Boat.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_boat.Boat.BodyColor.Name}"; + SetData(); Draw(); } /// @@ -69,5 +77,18 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git _boat?.ChangeBorders(pictureBoxBoat.Width, pictureBoxBoat.Height); Draw(); } + /// + /// "" + /// + /// + /// + private void buttonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _boat = new DrawningSportBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + + SetData(); + Draw(); + } } } \ No newline at end of file diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/IDrawningObject.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/IDrawningObject.cs new file mode 100644 index 0000000..282547e --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/IDrawningObject.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) + GetCurrentPosition(); + } + +} \ No newline at end of file -- 2.25.1 From 117a3f56594a89cfa1d6e360d5f5e357a2c690a4 Mon Sep 17 00:00:00 2001 From: Zyzf Date: Sun, 25 Sep 2022 17:08:14 +0400 Subject: [PATCH 3/6] abstract class --- .../AbstractMap.cs | 82 +++++++ .../Direction.cs | 1 + .../FormMap.Designer.cs | 217 ++++++++++++++++++ .../FormMap.cs | 100 ++++++++ .../FormMap.resx | 63 +++++ .../Program.cs | 2 +- .../SimpleMap.cs | 54 +++++ 7 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.resx create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs new file mode 100644 index 0000000..3cdcd3f --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal abstract class AbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawningObject.DrawningObject(gr); + return bmp; + } + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + } +} diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Direction.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Direction.cs index 08bdb41..c202e3c 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Direction.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Direction.cs @@ -8,6 +8,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs new file mode 100644 index 0000000..c7dc6f0 --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs @@ -0,0 +1,217 @@ +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + partial class FormMap + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.pictureBoxBoat = new System.Windows.Forms.PictureBox(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).BeginInit(); + this.SuspendLayout(); + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 318); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip1.Size = new System.Drawing.Size(772, 22); + this.statusStrip1.TabIndex = 0; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // pictureBoxBoat + // + this.pictureBoxBoat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBoat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBoxBoat.Name = "pictureBoxBoat"; + this.pictureBoxBoat.Size = new System.Drawing.Size(772, 318); + this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxBoat.TabIndex = 1; + this.pictureBoxBoat.TabStop = false; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(10, 289); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(82, 22); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonRight.Location = new System.Drawing.Point(718, 280); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(35, 30); + this.buttonRight.TabIndex = 3; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonLeft.Location = new System.Drawing.Point(637, 280); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(35, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonUp.Location = new System.Drawing.Point(677, 246); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(35, 30); + this.buttonUp.TabIndex = 5; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonDown.Location = new System.Drawing.Point(677, 280); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(35, 30); + this.buttonDown.TabIndex = 6; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(98, 289); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(99, 22); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(10, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(114, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(772, 340); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxBoat); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "Карта"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBoat)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private PictureBox pictureBoxBoat; + private Button buttonCreate; + private Button buttonRight; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs new file mode 100644 index 0000000..f87b40e --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs @@ -0,0 +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; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningBoat boat) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {boat.Boat.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {boat.Boat.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {boat.Boat.BodyColor.Name}"; + pictureBoxBoat.Image = _abstractMap.CreateMap(pictureBoxBoat.Width, pictureBoxBoat.Height, new DrawningObjectBoat(boat)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(car); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBoxBoat.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var boat = new DrawningSportBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(boat); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.resx b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Program.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Program.cs index 443c576..5aa05ff 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Program.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/Program.cs @@ -11,7 +11,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormBoat()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs new file mode 100644 index 0000000..2b92899 --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 99aa437848e13c68a400c089b13171b32778e3be Mon Sep 17 00:00:00 2001 From: Zyzf Date: Sun, 25 Sep 2022 19:03:41 +0400 Subject: [PATCH 4/6] todo #1 --- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs | 2 +- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs | 2 +- .../DrawningObjectBoat.cs | 6 +----- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs | 1 - PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs | 5 ++--- PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs | 6 ++---- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs index 3cdcd3f..028cc6c 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs @@ -32,7 +32,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base public Bitmap MoveObject(Direction direction) { // TODO проверка, что объект может переместится в требуемом направлении - if (true) + if (true) { _drawningObject.MoveObject(direction); } diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs index 331603a..39c1573 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs @@ -174,7 +174,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base } public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight); + return (_startPosX, _startPosX + _boatWidth, _startPosY, _startPosY + _boatHeight); } } } diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs index 54f6375..ac982cb 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs @@ -14,22 +14,18 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base _boat = boat; } public float Step => _boat?.Boat?.Step ?? 0; - public void DrawningObject(Graphics g) { - // TODO + _boat?.DrawTransport(g); } - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { return _boat?.GetCurrentPosition() ?? default; } - public void MoveObject(Direction direction) { _boat.MoveTransport(direction); } - public void SetObject(int x, int y, int width, int height) { _boat.SetPosition(x, y, width, height); diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs index ef721fe..46ad07a 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs @@ -86,7 +86,6 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git { Random rnd = new(); _boat = new DrawningSportBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); - SetData(); Draw(); } diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs index f87b40e..08c4558 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs @@ -37,9 +37,8 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - var car = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(car); + var boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(boat); } /// /// Изменение размеров формы diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs index 2b92899..73e16b4 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs @@ -18,13 +18,11 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base private readonly Brush roadColor = new SolidBrush(Color.Gray); protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + - 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + - 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } protected override void GenerateMap() { -- 2.25.1 From 99379b81f14e95bfbbcbf93287df112d67db377c Mon Sep 17 00:00:00 2001 From: Zyzf Date: Mon, 26 Sep 2022 05:22:25 +0400 Subject: [PATCH 5/6] add #2 TODO --- .../AbstractMap.cs | 28 +++++++++ .../FormMap.Designer.cs | 57 +++++++++---------- .../FormMap.cs | 3 + .../MySecondMap.cs | 54 ++++++++++++++++++ 4 files changed, 112 insertions(+), 30 deletions(-) create mode 100644 PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/MySecondMap.cs diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs index 028cc6c..c29ea9e 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs @@ -48,6 +48,34 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base int y = _random.Next(0, 10); _drawningObject.SetObject(x, y, _width, _height); // TODO првоерка, что объект не "накладывается" на закрытые участки + while (!CheckEnoughPlace()) + { + x += 10; + if (x >= _width) + { + y += 10; + x = 0; + } + _drawningObject.SetObject(x, y, _width, _height); + } + return true; + } + private bool CheckEnoughPlace() + { + int right = Convert.ToInt32(_drawningObject.GetCurrentPosition().Right / _size_x); + int left = Convert.ToInt32(_drawningObject.GetCurrentPosition().Left / _size_x); + int up = Convert.ToInt32(_drawningObject.GetCurrentPosition().Top / _size_y); + int down = Convert.ToInt32(_drawningObject.GetCurrentPosition().Bottom / _size_y); + for (int i = left; i <= right; i++) + { + for (int j = up; j <= down; j++) + { + if (_map[i, j] == _barrier) + { + return false; + } + } + } return true; } private Bitmap DrawMapWithObject() diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs index c7dc6f0..c535860 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.Designer.cs @@ -51,29 +51,28 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 318); + this.statusStrip1.Location = new System.Drawing.Point(0, 427); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); - this.statusStrip1.Size = new System.Drawing.Size(772, 22); + this.statusStrip1.Size = new System.Drawing.Size(882, 26); this.statusStrip1.TabIndex = 0; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); this.toolStripStatusLabelSpeed.Text = "Скорость:"; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); this.toolStripStatusLabelWeight.Text = "Вес:"; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); this.toolStripStatusLabelBodyColor.Text = "Цвет:"; // // pictureBoxBoat @@ -81,9 +80,8 @@ this.pictureBoxBoat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.pictureBoxBoat.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxBoat.Location = new System.Drawing.Point(0, 0); - this.pictureBoxBoat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBoxBoat.Name = "pictureBoxBoat"; - this.pictureBoxBoat.Size = new System.Drawing.Size(772, 318); + this.pictureBoxBoat.Size = new System.Drawing.Size(882, 427); this.pictureBoxBoat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxBoat.TabIndex = 1; this.pictureBoxBoat.TabStop = false; @@ -91,10 +89,9 @@ // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(10, 289); - this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreate.Location = new System.Drawing.Point(11, 385); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(82, 22); + this.buttonCreate.Size = new System.Drawing.Size(94, 29); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -105,10 +102,9 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.right; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(718, 280); - this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Location = new System.Drawing.Point(821, 373); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(35, 30); + this.buttonRight.Size = new System.Drawing.Size(40, 40); this.buttonRight.TabIndex = 3; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); @@ -118,10 +114,9 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.left; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(637, 280); - this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Location = new System.Drawing.Point(728, 373); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(35, 30); + this.buttonLeft.Size = new System.Drawing.Size(40, 40); this.buttonLeft.TabIndex = 4; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); @@ -131,10 +126,9 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.up; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(677, 246); - this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Location = new System.Drawing.Point(774, 328); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(35, 30); + this.buttonUp.Size = new System.Drawing.Size(40, 40); this.buttonUp.TabIndex = 5; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); @@ -144,10 +138,9 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::PIbd_22_Kalyshev_Y_V_MotorBoat_Base.Properties.Resources.down; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(677, 280); - this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Location = new System.Drawing.Point(774, 373); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(35, 30); + this.buttonDown.Size = new System.Drawing.Size(40, 40); this.buttonDown.TabIndex = 6; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); @@ -155,9 +148,10 @@ // buttonCreateModif // this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateModif.Location = new System.Drawing.Point(98, 289); + this.buttonCreateModif.Location = new System.Drawing.Point(112, 385); + this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(99, 22); + this.buttonCreateModif.Size = new System.Drawing.Size(113, 29); this.buttonCreateModif.TabIndex = 7; this.buttonCreateModif.Text = "Модификация"; this.buttonCreateModif.UseVisualStyleBackColor = true; @@ -168,18 +162,20 @@ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(10, 12); + "Простая карта", + "Своя карта"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(11, 16); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(114, 23); + this.comboBoxSelectorMap.Size = new System.Drawing.Size(130, 28); this.comboBoxSelectorMap.TabIndex = 8; this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // FormMap // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(772, 340); + this.ClientSize = new System.Drawing.Size(882, 453); this.Controls.Add(this.comboBoxSelectorMap); this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonDown); @@ -189,6 +185,7 @@ this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxBoat); this.Controls.Add(this.statusStrip1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormMap"; this.Text = "Карта"; this.statusStrip1.ResumeLayout(false); diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs index 08c4558..1d0777d 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs @@ -93,6 +93,9 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Своя карта": + _abstractMap = new MySecondMap(); + break; } } } diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/MySecondMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/MySecondMap.cs new file mode 100644 index 0000000..7ea60a4 --- /dev/null +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/MySecondMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base +{ + internal class MySecondMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Red); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.FromArgb(242, 242, 242)); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + + protected override void GenerateMap() + { + _map = new int[150, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 10) + { + int x = _random.Next(0, _map.GetLength(0)); + int y = _random.Next(0, _map.GetLength(1)); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From ad63e118aaac05b7577e04081d0e22b966428085 Mon Sep 17 00:00:00 2001 From: Zyzf Date: Mon, 26 Sep 2022 06:18:31 +0400 Subject: [PATCH 6/6] final --- .../AbstractMap.cs | 41 +++++++++++++++---- .../DrawningSportBoat.cs | 2 +- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs index c29ea9e..db52a5e 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -32,7 +33,23 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base public Bitmap MoveObject(Direction direction) { // TODO проверка, что объект может переместится в требуемом направлении - if (true) + bool enoughPlace = false; + switch (direction) + { + case Direction.Up: + enoughPlace = CheckEnoughPlace(0, _drawningObject.Step * -1); + break; + case Direction.Down: + enoughPlace = CheckEnoughPlace(0, _drawningObject.Step); + break; + case Direction.Left: + enoughPlace = CheckEnoughPlace(_drawningObject.Step * -1, 0); + break; + case Direction.Right: + enoughPlace = CheckEnoughPlace(_drawningObject.Step, 0); + break; + } + if (enoughPlace) { _drawningObject.MoveObject(direction); } @@ -48,24 +65,30 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base int y = _random.Next(0, 10); _drawningObject.SetObject(x, y, _width, _height); // TODO првоерка, что объект не "накладывается" на закрытые участки - while (!CheckEnoughPlace()) + while (!CheckEnoughPlace(0, 0)) { x += 10; if (x >= _width) { - y += 10; - x = 0; + if (y <= _height) + { + y += 10; + x = 0; + } else + { + return false; + } } _drawningObject.SetObject(x, y, _width, _height); } return true; } - private bool CheckEnoughPlace() + private bool CheckEnoughPlace(float x, float y) { - int right = Convert.ToInt32(_drawningObject.GetCurrentPosition().Right / _size_x); - int left = Convert.ToInt32(_drawningObject.GetCurrentPosition().Left / _size_x); - int up = Convert.ToInt32(_drawningObject.GetCurrentPosition().Top / _size_y); - int down = Convert.ToInt32(_drawningObject.GetCurrentPosition().Bottom / _size_y); + int right = Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + x) / _size_x) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + x) / _size_x) : 0; + int left = Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + x) / _size_x) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + x) / _size_x) : 0; + int up = Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + y) / _size_y) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + y) / _size_y) : 0; + int down = Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + y) / _size_y) > 0 ? Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + y) / _size_y) : 0; for (int i = left; i <= right; i++) { for (int j = up; j <= down; j++) diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs index b610506..cae3fca 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningSportBoat.cs @@ -19,7 +19,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// Признак наличия антикрыла /// Признак наличия гоночной полосы public DrawningSportBoat(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : - base(speed, weight, bodyColor, 195, 60) + base(speed, weight, bodyColor, 195, 80) { Boat = new EntitySportBoat(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); } -- 2.25.1