From 6d5e7b10c083f4e25db60c49537ef24f7deb7c76 Mon Sep 17 00:00:00 2001 From: shadowik Date: Mon, 19 Sep 2022 21:52:12 +0400 Subject: [PATCH 1/8] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20init=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80?= =?UTF-8?q?=D1=83=D0=BA=D1=82=D0=BE=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs | 7 ++----- DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs | 2 +- DoubleDeckerBus/DoubleDeckerBus/FormBus.cs | 4 +--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs index 1ec2432..06c6ed7 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs @@ -18,7 +18,7 @@ namespace DoubleDeckerBus private readonly int _busWidth = 100; private readonly int _busHeight = 50; - public void Init(int speed, float weight, Color bodyColor) { + public DrawningBus(int speed, float weight, Color bodyColor) { Bus = new EntityBus(); Bus.Init(speed, weight, bodyColor); } @@ -74,23 +74,20 @@ namespace DoubleDeckerBus return; } Pen pen = new(Color.Black); - //границы автобсуса + g.DrawRectangle(pen, _startPosX - 1, _startPosY + 11, 100, 30); Brush brBodyColor = new SolidBrush(Bus.BodyColor); g.FillRectangle(brBodyColor, _startPosX, _startPosY + 10, 100, 30); - //Дверь g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20); Brush brBlack = new SolidBrush(Color.Black); g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20); - //Колеса g.DrawEllipse(pen, _startPosX + 7, _startPosY + 35, 10, 10); g.DrawEllipse(pen, _startPosX + 77, _startPosY + 35, 10, 10); g.FillEllipse(brBlack, _startPosX + 7, _startPosY + 35, 10, 10); g.FillEllipse(brBlack, _startPosX + 77, _startPosY + 35, 10, 10); - //окна Brush brBlue = new SolidBrush(Color.Blue); g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15); g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15); diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs index 11c1050..45ee91a 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs @@ -12,7 +12,7 @@ namespace DoubleDeckerBus 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 EntityBus(int speed, float weight, Color bodyColor) { Random rnd = new Random(); Speed = (speed <= 0) ? rnd.Next(50, 150) : speed; diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs index c4b4ce5..439fa64 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs @@ -19,8 +19,7 @@ namespace DoubleDeckerBus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _bus = new DrawningBus(); - _bus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _bus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); toolStripStatusLabelSpeed.Text = $": {_bus.Bus.Speed}"; toolStripStatusLabelWeight.Text = $": {_bus.Bus.Weight}"; @@ -30,7 +29,6 @@ namespace DoubleDeckerBus private void ButtonMove_Click(object sender, EventArgs e) { - // string name = ((Button)sender)?.Name ?? string.Empty; switch (name) { From 55351a628cb72601ffde1de3d6b2313516e4e105 Mon Sep 17 00:00:00 2001 From: shadowik Date: Tue, 20 Sep 2022 04:44:29 +0400 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DrawningBus.cs => DrawingBus.cs} | 25 +++++--- DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs | 58 +++++++++++++++++++ DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs | 24 ++++++++ .../DoubleDeckerBus/FormBus.Designer.cs | 57 ++++++++++++------ DoubleDeckerBus/DoubleDeckerBus/FormBus.cs | 34 +++++++---- 5 files changed, 161 insertions(+), 37 deletions(-) rename DoubleDeckerBus/DoubleDeckerBus/{DrawningBus.cs => DrawingBus.cs} (85%) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs similarity index 85% rename from DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs rename to DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs index 06c6ed7..198539c 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawningBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs @@ -7,20 +7,27 @@ using System.Threading.Tasks; namespace DoubleDeckerBus { - internal class DrawningBus + internal class DrawingBus { - public EntityBus Bus { get; private set; } + public EntityBus Bus { get; protected set; } - private float _startPosX; - private float _startPosY; + protected float _startPosX; + protected float _startPosY; private int? _pictureWidth = null; private int? _pictureHeight = null; private readonly int _busWidth = 100; - private readonly int _busHeight = 50; + private readonly int _busHeight = 30; - public DrawningBus(int speed, float weight, Color bodyColor) { - Bus = new EntityBus(); - Bus.Init(speed, weight, bodyColor); + + + public DrawingBus(int speed, float weight, Color bodyColor) { + Bus = new EntityBus(speed, weight, bodyColor); + } + + protected DrawingBus(int speed, float weight, Color bodyColor, int busWidth, int busHeight) : this(speed, weight, bodyColor) + { + _busWidth = busWidth; + _busHeight = busHeight; } public void SetPosition(int x, int y, int width, int height) { @@ -66,7 +73,7 @@ namespace DoubleDeckerBus } } - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs new file mode 100644 index 0000000..6ca076f --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class DrawingDDB : DrawingBus + { + public DrawingDDB(int speed, float weight, Color bodyColor, Color extraColor, bool ledder, bool secondStage) : base(speed, weight, bodyColor, 100, 100) { + Bus = new EntityDDB(speed, weight, bodyColor, extraColor, ledder, secondStage); + } + + public override void DrawTransport(Graphics g) + { + if (Bus is not EntityDDB doubleDeckerBus) + { + return; + } + + Pen pen = new(Color.Black); + Brush extraBrush = new SolidBrush(doubleDeckerBus.ExtraColor); + + if (doubleDeckerBus.SecondStage) { + g.FillRectangle(extraBrush, _startPosX, _startPosY + 10, 100, 30); + + g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 10, 20); + Brush brBlack = new SolidBrush(Color.Black); + g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 20, 10, 20); + + + Brush brBlue = new SolidBrush(Color.Blue); + g.FillEllipse(brBlue, _startPosX + 10, _startPosY + 15, 10, 15); + g.FillEllipse(brBlue, _startPosX + 50, _startPosY + 15, 10, 15); + g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15); + g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15); + } + + _startPosY += 30; + base.DrawTransport(g); + _startPosY -= 30; + + if (doubleDeckerBus.Ledder) { + //Вертикальные прямые + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 70)), new Point((int)(_startPosX), (int)(_startPosY + 10))); + g.DrawLine(pen, new Point((int)(_startPosX + 10), (int)(_startPosY + 70)), new Point((int)(_startPosX + 10), (int)(_startPosY + 10))); + + //Горизонтальные прямые + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 20)), new Point((int)(_startPosX + 10), (int)(_startPosY + 20))); + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 30)), new Point((int)(_startPosX + 10), (int)(_startPosY + 30))); + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 40)), new Point((int)(_startPosX + 10), (int)(_startPosY + 40))); + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 50)), new Point((int)(_startPosX + 10), (int)(_startPosY + 50))); + g.DrawLine(pen, new Point((int)(_startPosX), (int)(_startPosY + 60)), new Point((int)(_startPosX + 10), (int)(_startPosY + 60))); + } + } + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs new file mode 100644 index 0000000..5756987 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class EntityDDB : EntityBus + { + public Color ExtraColor { get; private set; } + + public bool Ledder { get; private set; } + + public bool SecondStage { get; private set; } + + public EntityDDB(int speed, float height, Color bodyColor, Color extraColor, bool ledder, bool secondStage) : base(speed, height, bodyColor) + { + ExtraColor = extraColor; + Ledder = ledder; + SecondStage = secondStage; + } + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs index 023e3ce..5c67b4e 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs @@ -38,6 +38,7 @@ this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.pictureBoxBus = new System.Windows.Forms.PictureBox(); + this.buttonСreateExtra = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); this.SuspendLayout(); @@ -49,36 +50,38 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 425); + this.statusStrip1.Location = new System.Drawing.Point(0, 316); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(800, 26); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip1.Size = new System.Drawing.Size(700, 22); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); this.toolStripStatusLabelSpeed.Text = "Скорость: "; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); this.toolStripStatusLabelWeight.Text = "Вес: "; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17); this.toolStripStatusLabelBodyColor.Text = "Цвет: "; // // 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(0, 396); + this.buttonCreate.Location = new System.Drawing.Point(0, 297); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(99, 28); + this.buttonCreate.Size = new System.Drawing.Size(87, 21); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -89,9 +92,10 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(718, 337); + this.buttonUp.Location = new System.Drawing.Point(628, 253); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 29); + this.buttonUp.Size = new System.Drawing.Size(26, 22); this.buttonUp.TabIndex = 3; this.buttonUp.Text = " "; this.buttonUp.UseVisualStyleBackColor = true; @@ -102,9 +106,10 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.LeftArrow; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(693, 363); + this.buttonLeft.Location = new System.Drawing.Point(606, 272); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 29); + this.buttonLeft.Size = new System.Drawing.Size(26, 22); this.buttonLeft.TabIndex = 4; this.buttonLeft.Text = " "; this.buttonLeft.UseVisualStyleBackColor = true; @@ -115,9 +120,10 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.DownArrow; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(719, 388); + this.buttonDown.Location = new System.Drawing.Point(629, 291); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 29); + this.buttonDown.Size = new System.Drawing.Size(26, 22); this.buttonDown.TabIndex = 5; this.buttonDown.Text = " "; this.buttonDown.UseVisualStyleBackColor = true; @@ -128,9 +134,10 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(745, 363); + this.buttonRight.Location = new System.Drawing.Point(652, 272); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 29); + this.buttonRight.Size = new System.Drawing.Size(26, 22); this.buttonRight.TabIndex = 6; this.buttonRight.Text = " "; this.buttonRight.UseVisualStyleBackColor = true; @@ -140,18 +147,30 @@ // this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBoxBus.Name = "pictureBoxBus"; - this.pictureBoxBus.Size = new System.Drawing.Size(800, 425); + this.pictureBoxBus.Size = new System.Drawing.Size(700, 316); this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxBus.TabIndex = 7; this.pictureBoxBus.TabStop = false; this.pictureBoxBus.Resize += new System.EventHandler(this.PictureBoxBus_Resize); // + // buttonСreateExtra + // + this.buttonСreateExtra.Location = new System.Drawing.Point(103, 297); + this.buttonСreateExtra.Name = "buttonСreateExtra"; + this.buttonСreateExtra.Size = new System.Drawing.Size(99, 21); + this.buttonСreateExtra.TabIndex = 8; + this.buttonСreateExtra.Text = "Модификация"; + this.buttonСreateExtra.UseVisualStyleBackColor = true; + this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click); + // // FormBus // - 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(800, 451); + this.ClientSize = new System.Drawing.Size(700, 338); + this.Controls.Add(this.buttonСreateExtra); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -159,6 +178,7 @@ this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxBus); this.Controls.Add(this.statusStrip1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormBus"; this.Text = "Двухэтажный автобус"; this.Resize += new System.EventHandler(this.PictureBoxBus_Resize); @@ -181,5 +201,6 @@ private Button buttonDown; private Button buttonRight; private PictureBox pictureBoxBus; + private Button buttonСreateExtra; } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs index 439fa64..e594915 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBus.cs @@ -2,7 +2,7 @@ namespace DoubleDeckerBus { public partial class FormBus : Form { - private DrawningBus _bus; + private DrawingBus _bus; public FormBus() { InitializeComponent(); @@ -19,16 +19,12 @@ namespace DoubleDeckerBus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _bus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); - toolStripStatusLabelSpeed.Text = $": {_bus.Bus.Speed}"; - toolStripStatusLabelWeight.Text = $": {_bus.Bus.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_bus.Bus.BodyColor.Name}"; + _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(); Draw(); } - private void ButtonMove_Click(object sender, EventArgs e) - { + private void ButtonMove_Click(object sender, EventArgs e) { string name = ((Button)sender)?.Name ?? string.Empty; switch (name) { @@ -48,10 +44,28 @@ namespace DoubleDeckerBus Draw(); } - private void PictureBoxBus_Resize(object sender, EventArgs e) - { + public void SetData() { + Random rnd = new(); + _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); + toolStripStatusLabelSpeed.Text = $": {_bus.Bus.Speed}"; + toolStripStatusLabelWeight.Text = $": {_bus.Bus.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_bus.Bus.BodyColor.Name}"; + } + + private void PictureBoxBus_Resize(object sender, EventArgs e) { _bus?.ChangeBorders(pictureBoxBus.Width, pictureBoxBus.Height); Draw(); } + + private void ButtonreateExtra_Click(object sender, EventArgs e) + { + Random rnd = new(); + _bus = new DrawingDDB(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))); + SetData(); + Draw(); + } } } \ No newline at end of file From 791f7ad61c0083625aefcc17a3f38ec574f5e596 Mon Sep 17 00:00:00 2001 From: shadowik Date: Tue, 20 Sep 2022 05:06:01 +0400 Subject: [PATCH 3/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs | 4 ++ .../DoubleDeckerBus/DrawingObjectBus.cs | 40 +++++++++++++++++++ .../DoubleDeckerBus/IDrawingObject.cs | 22 ++++++++++ 3 files changed, 66 insertions(+) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs index 198539c..fa8b154 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs @@ -117,5 +117,9 @@ namespace DoubleDeckerBus _startPosY = _pictureHeight.Value - _busHeight; } } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { + return (_startPosX, _startPosX + _busWidth, _startPosY, _startPosY + _busHeight) + } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs new file mode 100644 index 0000000..9c09def --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class DrawingObjectBus : IDrawingObject + { + private DrawingBus _bus = null; + + public DrawingObjectBus(DrawingBus bus) + { + _bus = bus; + } + + public float Step => _bus?.Bus?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _bus?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _bus?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _bus.SetPosition(x, y, width, height); + } + + void IDrawingObject.DrawingObject(Graphics g) + { + // TODO + } + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs b/DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs new file mode 100644 index 0000000..c54ed57 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal interface IDrawingObject + { + public float Step { get; } + + void SetObject(int x, int y, int width, int height); + + void MoveObject(Direction direction); + + void DrawingObject(Graphics g); + + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + + } +} From ecbbda947716061231001f820ed5577c0d742f55 Mon Sep 17 00:00:00 2001 From: shadowik Date: Tue, 20 Sep 2022 06:14:17 +0400 Subject: [PATCH 4/8] =?UTF-8?q?=D0=90=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoubleDeckerBus/AbstractMap.cs | 84 +++++++ DoubleDeckerBus/DoubleDeckerBus/Direction.cs | 1 + DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs | 4 +- .../DoubleDeckerBus/FormMap.Designer.cs | 217 ++++++++++++++++++ DoubleDeckerBus/DoubleDeckerBus/FormMap.cs | 83 +++++++ DoubleDeckerBus/DoubleDeckerBus/FormMap.resx | 63 +++++ DoubleDeckerBus/DoubleDeckerBus/Program.cs | 2 +- DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs | 47 ++++ 8 files changed, 498 insertions(+), 3 deletions(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.cs create mode 100644 DoubleDeckerBus/DoubleDeckerBus/FormMap.resx create mode 100644 DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs new file mode 100644 index 0000000..44ac9ad --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal abstract class AbstractMap + { + private IDrawingObject _drawingObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new Random(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + + public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawingObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawingObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawingObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawingObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawingObject == 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); + } + } + } + _drawingObject.DrawingObject(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/DoubleDeckerBus/DoubleDeckerBus/Direction.cs b/DoubleDeckerBus/DoubleDeckerBus/Direction.cs index 41d2633..dab6276 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Direction.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Direction.cs @@ -8,6 +8,7 @@ namespace DoubleDeckerBus { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs index fa8b154..9a66019 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs @@ -118,8 +118,8 @@ namespace DoubleDeckerBus } } - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosX + _busWidth, _startPosY, _startPosY + _busHeight) + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { + return (_startPosX, _startPosX + _busWidth, _startPosY, _startPosY + _busHeight); } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs new file mode 100644 index 0000000..da91884 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs @@ -0,0 +1,217 @@ +namespace DoubleDeckerBus +{ + 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.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.pictureBoxBus = new System.Windows.Forms.PictureBox(); + this.buttonСreateExtra = new System.Windows.Forms.Button(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // 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(0, 292); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(87, 21); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(628, 253); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(26, 22); + this.buttonUp.TabIndex = 3; + this.buttonUp.Text = " "; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.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::DoubleDeckerBus.Properties.Resources.LeftArrow; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(606, 272); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(26, 22); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.Text = " "; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.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::DoubleDeckerBus.Properties.Resources.DownArrow; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(629, 291); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(26, 22); + this.buttonDown.TabIndex = 5; + this.buttonDown.Text = " "; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(652, 272); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(26, 22); + this.buttonRight.TabIndex = 6; + this.buttonRight.Text = " "; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // pictureBoxBus + // + this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBoxBus.Name = "pictureBoxBus"; + this.pictureBoxBus.Size = new System.Drawing.Size(700, 316); + this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxBus.TabIndex = 7; + this.pictureBoxBus.TabStop = false; + // + // buttonСreateExtra + // + this.buttonСreateExtra.Location = new System.Drawing.Point(103, 291); + this.buttonСreateExtra.Name = "buttonСreateExtra"; + this.buttonСreateExtra.Size = new System.Drawing.Size(99, 21); + this.buttonСreateExtra.TabIndex = 8; + this.buttonСreateExtra.Text = "Модификация"; + this.buttonСreateExtra.UseVisualStyleBackColor = true; + this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click); + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; + // + // 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, 316); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip1.Size = new System.Drawing.Size(700, 22); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // 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(0, 0); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 9; + 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(700, 338); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonСreateExtra); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxBus); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private PictureBox pictureBoxBus; + private Button buttonСreateExtra; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private StatusStrip statusStrip1; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs new file mode 100644 index 0000000..7b59c17 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs @@ -0,0 +1,83 @@ +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 DoubleDeckerBus +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(bus); + } + + 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; + } + pictureBoxBus.Image = _abstractMap?.MoveObject(dir); + } + + private void SetData(DrawingBus bus) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {bus.Bus.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {bus.Bus.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {bus.Bus.BodyColor.Name}"; + pictureBoxBus.Image = _abstractMap.CreateMap(pictureBoxBus.Width, pictureBoxBus.Height, + new DrawingObjectBus(bus)); + } + + private void ButtonСreateExtra_Click(object sender, EventArgs e) + { + Random rnd = new(); + var bus = new DrawingDDB(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))); + SetData(bus); + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } + + +} + diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.resx b/DoubleDeckerBus/DoubleDeckerBus/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/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/DoubleDeckerBus/DoubleDeckerBus/Program.cs b/DoubleDeckerBus/DoubleDeckerBus/Program.cs index cecbba3..7d6fd56 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Program.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Program.cs @@ -11,7 +11,7 @@ namespace DoubleDeckerBus // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormBus()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs b/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs new file mode 100644 index 0000000..2905246 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/SimpleMap.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + 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++; + } + } + } + } +} From c38737fa61c55fa44eab3f4e952e22c6c100027a Mon Sep 17 00:00:00 2001 From: shadowik Date: Fri, 23 Sep 2022 14:34:19 +0400 Subject: [PATCH 5/8] Collision --- .../DoubleDeckerBus/AbstractMap.cs | 67 ++++++++++++++++++- .../DoubleDeckerBus/DrawingObjectBus.cs | 2 +- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index 44ac9ad..7ca2613 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.AccessControl; using System.Text; using System.Threading.Tasks; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.ScrollBar; namespace DoubleDeckerBus { @@ -18,6 +20,7 @@ namespace DoubleDeckerBus protected readonly int _freeRoad = 0; protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) { _width = width; @@ -33,10 +36,28 @@ namespace DoubleDeckerBus public Bitmap MoveObject(Direction direction) { // TODO проверка, что объект может переместится в требуемом направлении - if (true) - { - _drawingObject.MoveObject(direction); + + _drawingObject.MoveObject(direction); + + bool collision = CheckCollision(); + + if (collision) { + switch (direction) { + case Direction.Left: + _drawingObject.MoveObject(Direction.Right); + break; + case Direction.Right: + _drawingObject.MoveObject(Direction.Left); + break; + case Direction.Up: + _drawingObject.MoveObject(Direction.Down); + break; + case Direction.Down: + _drawingObject.MoveObject(Direction.Up); + break; + } } + return DrawMapWithObject(); } private bool SetObjectOnMap() @@ -48,7 +69,15 @@ namespace DoubleDeckerBus int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawingObject.SetObject(x, y, _width, _height); + + // TODO првоерка, что объект не "накладывается" на закрытые участки + + while (CheckCollision()) { + x = _random.Next(0, 10); + y = _random.Next(0, 10); + _drawingObject.SetObject(x, y, _width, _height); + } return true; } private Bitmap DrawMapWithObject() @@ -75,6 +104,38 @@ namespace DoubleDeckerBus } _drawingObject.DrawingObject(gr); return bmp; + + } + + private bool CheckCollision() { + var pos = _drawingObject.GetCurrentPosition(); + int startX = (int)((pos.Left) / _size_x); + int endX = (int)((pos.Right) / _size_x); + int startY = (int)((pos.Top) / _size_y); + int endY = (int)((pos.Bottom) / _size_y); + + if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; } + + /* startX = (int)((pos.Left - 5) / _size_x); + endX = (int)((pos.Right + 5) / _size_x); + startY = (int)((pos.Top - 5) / _size_y); + endY = (int)((pos.Bottom + 5) / _size_y);*/ + + + + for (int y = startY - 1; y <= endY + 1; y++) + { + for (int x = startX - 1; x <= endX + 1; x++) + { + if (_map[x, y] == _barrier) + { + return true; + break; + } + } + } + + return false; } protected abstract void GenerateMap(); diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs index 9c09def..9ed77ea 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs @@ -34,7 +34,7 @@ namespace DoubleDeckerBus void IDrawingObject.DrawingObject(Graphics g) { - // TODO + _bus.DrawTransport(g); } } } From 5ee4ef719cac3349b3369f9d1f93816fab95fc9a Mon Sep 17 00:00:00 2001 From: shadowik Date: Fri, 23 Sep 2022 14:53:53 +0400 Subject: [PATCH 6/8] New Map --- .../DoubleDeckerBus/AbstractMap.cs | 9 +-- .../DoubleDeckerBus/FormMap.Designer.cs | 55 +++++++++---------- DoubleDeckerBus/DoubleDeckerBus/FormMap.cs | 4 ++ DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs | 54 ++++++++++++++++++ 4 files changed, 86 insertions(+), 36 deletions(-) create mode 100644 DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index 7ca2613..f3cfe3f 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -116,16 +116,11 @@ namespace DoubleDeckerBus if (startX < 0 || startY < 0 || endX > _map.GetLength(1) || endY > _map.GetLength(0)) { return false; } - /* startX = (int)((pos.Left - 5) / _size_x); - endX = (int)((pos.Right + 5) / _size_x); - startY = (int)((pos.Top - 5) / _size_y); - endY = (int)((pos.Bottom + 5) / _size_y);*/ - - for (int y = startY - 1; y <= endY + 1; y++) + for (int y = startY; y <= endY + 1; y++) { - for (int x = startX - 1; x <= endX + 1; x++) + for (int x = startX; x <= endX + 1; x++) { if (_map[x, y] == _barrier) { diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs index da91884..ac03d26 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs @@ -47,10 +47,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(0, 292); - this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreate.Location = new System.Drawing.Point(0, 389); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(87, 21); + this.buttonCreate.Size = new System.Drawing.Size(99, 28); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -61,10 +60,9 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(628, 253); - this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Location = new System.Drawing.Point(718, 337); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(26, 22); + this.buttonUp.Size = new System.Drawing.Size(30, 29); this.buttonUp.TabIndex = 3; this.buttonUp.Text = " "; this.buttonUp.UseVisualStyleBackColor = true; @@ -75,10 +73,9 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.LeftArrow; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(606, 272); - this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Location = new System.Drawing.Point(693, 363); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(26, 22); + this.buttonLeft.Size = new System.Drawing.Size(30, 29); this.buttonLeft.TabIndex = 4; this.buttonLeft.Text = " "; this.buttonLeft.UseVisualStyleBackColor = true; @@ -89,10 +86,9 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.DownArrow; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(629, 291); - this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Location = new System.Drawing.Point(719, 388); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(26, 22); + this.buttonDown.Size = new System.Drawing.Size(30, 29); this.buttonDown.TabIndex = 5; this.buttonDown.Text = " "; this.buttonDown.UseVisualStyleBackColor = true; @@ -103,10 +99,9 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(652, 272); - this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Location = new System.Drawing.Point(745, 363); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(26, 22); + this.buttonRight.Size = new System.Drawing.Size(30, 29); this.buttonRight.TabIndex = 6; this.buttonRight.Text = " "; this.buttonRight.UseVisualStyleBackColor = true; @@ -116,18 +111,18 @@ // this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); - this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBoxBus.Name = "pictureBoxBus"; - this.pictureBoxBus.Size = new System.Drawing.Size(700, 316); + this.pictureBoxBus.Size = new System.Drawing.Size(800, 425); this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxBus.TabIndex = 7; this.pictureBoxBus.TabStop = false; // // buttonСreateExtra // - this.buttonСreateExtra.Location = new System.Drawing.Point(103, 291); + this.buttonСreateExtra.Location = new System.Drawing.Point(118, 388); + this.buttonСreateExtra.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonСreateExtra.Name = "buttonСreateExtra"; - this.buttonСreateExtra.Size = new System.Drawing.Size(99, 21); + this.buttonСreateExtra.Size = new System.Drawing.Size(113, 28); this.buttonСreateExtra.TabIndex = 8; this.buttonСreateExtra.Text = "Модификация"; this.buttonСreateExtra.UseVisualStyleBackColor = true; @@ -136,19 +131,19 @@ // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 17); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20); this.toolStripStatusLabelSpeed.Text = "Скорость: "; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20); this.toolStripStatusLabelWeight.Text = "Вес: "; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(39, 17); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20); this.toolStripStatusLabelBodyColor.Text = "Цвет: "; // // statusStrip1 @@ -158,10 +153,9 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 316); + this.statusStrip1.Location = new System.Drawing.Point(0, 425); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); - this.statusStrip1.Size = new System.Drawing.Size(700, 22); + this.statusStrip1.Size = new System.Drawing.Size(800, 26); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // @@ -170,18 +164,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(0, 0); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.Size = new System.Drawing.Size(138, 28); this.comboBoxSelectorMap.TabIndex = 9; 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(700, 338); + this.ClientSize = new System.Drawing.Size(800, 451); this.Controls.Add(this.comboBoxSelectorMap); this.Controls.Add(this.buttonСreateExtra); this.Controls.Add(this.buttonRight); @@ -191,6 +187,7 @@ this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxBus); this.Controls.Add(this.statusStrip1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormMap"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit(); this.statusStrip1.ResumeLayout(false); diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs index 7b59c17..533606f 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs @@ -17,6 +17,7 @@ namespace DoubleDeckerBus { InitializeComponent(); _abstractMap = new SimpleMap(); + comboBoxSelectorMap.SelectedIndex = 0; } private void ButtonCreate_Click(object sender, EventArgs e) @@ -74,6 +75,9 @@ namespace DoubleDeckerBus case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Водная карта": + _abstractMap = new WaterMap(); + break; } } } diff --git a/DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs b/DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs new file mode 100644 index 0000000..8ed438d --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/WaterMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DoubleDeckerBus +{ + internal class WaterMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Blue); + private readonly Brush grassColor = new SolidBrush(Color.Green); + private readonly Brush lightGrassColor = new SolidBrush(Color.LightGreen); + 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) + { + Random rnd = new Random(); + if (rnd.Next(0, 7) == 6) + { + g.FillRectangle(grassColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + else { + g.FillRectangle(lightGrassColor, 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++; + } + } + } + } +} From 7decc64f31a5588340ee2d639aae254707bc4ac2 Mon Sep 17 00:00:00 2001 From: Mark Zaharchenko Date: Sat, 1 Oct 2022 03:48:51 +0400 Subject: [PATCH 7/8] Fast fix --- DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index f3cfe3f..036661e 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -118,14 +118,13 @@ namespace DoubleDeckerBus - for (int y = startY; y <= endY + 1; y++) + for (int y = startY; y < endY; y++) { - for (int x = startX; x <= endX + 1; x++) + for (int x = startX; x < endX; x++) { if (_map[x, y] == _barrier) { return true; - break; } } } From e9d4b2f39b8c35bfbb37bc09d489916cef24cb3e Mon Sep 17 00:00:00 2001 From: shadowik Date: Tue, 4 Oct 2022 02:06:23 +0400 Subject: [PATCH 8/8] Fix --- DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs index f3cfe3f..149f58a 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs @@ -35,7 +35,6 @@ namespace DoubleDeckerBus } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении _drawingObject.MoveObject(direction); @@ -69,16 +68,8 @@ namespace DoubleDeckerBus int x = _random.Next(0, 10); int y = _random.Next(0, 10); _drawingObject.SetObject(x, y, _width, _height); - - - // TODO првоерка, что объект не "накладывается" на закрытые участки - while (CheckCollision()) { - x = _random.Next(0, 10); - y = _random.Next(0, 10); - _drawingObject.SetObject(x, y, _width, _height); - } - return true; + return !CheckCollision(); } private Bitmap DrawMapWithObject() {