From f6797078a89f7045f12fffe9a7d9cd6255507190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Sun, 9 Oct 2022 17:36:10 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=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 --- Bus/Bus/DrawingBus.cs | 5 ++--- Bus/Bus/EntityBus.cs | 2 +- Bus/Bus/FormBus.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Bus/Bus/DrawingBus.cs b/Bus/Bus/DrawingBus.cs index 958cb34..00a4a2c 100644 --- a/Bus/Bus/DrawingBus.cs +++ b/Bus/Bus/DrawingBus.cs @@ -16,10 +16,9 @@ namespace Bus protected readonly int _busWidth = 157; protected readonly int _busHeight = 65; - public void Init(int speed, float weight, Color bodyColor) + public DrawingBus(int speed, float weight, Color bodyColor) { - Bus = new EntityBus(); - Bus.Init(speed, weight, bodyColor); + Bus = new EntityBus(speed, weight, bodyColor); } public void SetPosition(int x, int y, int width, int height) diff --git a/Bus/Bus/EntityBus.cs b/Bus/Bus/EntityBus.cs index c479713..d69a43a 100644 --- a/Bus/Bus/EntityBus.cs +++ b/Bus/Bus/EntityBus.cs @@ -13,7 +13,7 @@ namespace Bus 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/Bus/Bus/FormBus.cs b/Bus/Bus/FormBus.cs index 5cd241b..49fa996 100644 --- a/Bus/Bus/FormBus.cs +++ b/Bus/Bus/FormBus.cs @@ -21,8 +21,7 @@ namespace Bus private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _bus = new DrawingBus(); - _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 DrawingBus(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}"; From 1b9308c71221dd98a0792b72a0c66a2bc037dd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Sun, 9 Oct 2022 21:08:29 +0400 Subject: [PATCH 2/5] =?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 --- Bus/Bus/DrawingBus.cs | 16 ++++++-- Bus/Bus/DrawingSportBus.cs | 81 +++++++++++++++++++++++++++++++++++++ Bus/Bus/EntitySportBus.cs | 25 ++++++++++++ Bus/Bus/FormBus.Designer.cs | 13 ++++++ Bus/Bus/FormBus.cs | 26 ++++++++++-- 5 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 Bus/Bus/DrawingSportBus.cs create mode 100644 Bus/Bus/EntitySportBus.cs diff --git a/Bus/Bus/DrawingBus.cs b/Bus/Bus/DrawingBus.cs index 00a4a2c..ab1cb38 100644 --- a/Bus/Bus/DrawingBus.cs +++ b/Bus/Bus/DrawingBus.cs @@ -8,9 +8,9 @@ namespace Bus { internal class DrawingBus { - public EntityBus Bus { get; private set; } - private float _startPosX; - private float _startPosY; + public EntityBus Bus { get; protected set; } + protected float _startPosX; + protected float _startPosY; private int? _pictureWidth = null; private int? _pictureHeight = null; protected readonly int _busWidth = 157; @@ -21,6 +21,14 @@ namespace Bus 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) { if (x < 0 || y < 0 || width < x+_busWidth || height < y + _busHeight) @@ -71,7 +79,7 @@ namespace Bus } - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) { diff --git a/Bus/Bus/DrawingSportBus.cs b/Bus/Bus/DrawingSportBus.cs new file mode 100644 index 0000000..7d20d4c --- /dev/null +++ b/Bus/Bus/DrawingSportBus.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + internal class DrawingSportBus : DrawingBus + { + public DrawingSportBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor) + { + Bus = new EntitySportBus(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); + } + + public override void DrawTransport(Graphics g) + { + if (Bus is not EntitySportBus sportBus) + { + return; + } + Pen pen = new Pen(Color.Black); + Brush dopBrush = new SolidBrush(sportBus.DopColor); + + if (sportBus.BodyKit) + { + + + 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); + } + + _startPosX += 10; + _startPosY += 5; + base.DrawTransport(g); + _startPosX -= 10; + _startPosY -= 5; + + if (sportBus.Sportline) + { + 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); + } + + if (sportBus.Wing) + { + 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); + } + + + + + } + } +} diff --git a/Bus/Bus/EntitySportBus.cs b/Bus/Bus/EntitySportBus.cs new file mode 100644 index 0000000..8e06a6a --- /dev/null +++ b/Bus/Bus/EntitySportBus.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + internal class EntitySportBus : EntityBus + { + 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 EntitySportBus(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/Bus/Bus/FormBus.Designer.cs b/Bus/Bus/FormBus.Designer.cs index 73895eb..57ee227 100644 --- a/Bus/Bus/FormBus.Designer.cs +++ b/Bus/Bus/FormBus.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -143,11 +144,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(111, 384); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(141, 29); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormBus // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(827, 455); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -178,5 +190,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/Bus/Bus/FormBus.cs b/Bus/Bus/FormBus.cs index 49fa996..3d0f408 100644 --- a/Bus/Bus/FormBus.cs +++ b/Bus/Bus/FormBus.cs @@ -18,14 +18,21 @@ namespace Bus pictureBoxBus.Image = bmp; } + private 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 ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); _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))); - _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}"; + SetData(); Draw(); } private void ButtonMove_Click(object sender, EventArgs e) @@ -54,5 +61,16 @@ namespace Bus _bus?.ChangeBorbers(pictureBoxBus.Width, pictureBoxBus.Height); Draw(); } + + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _bus = new DrawingSportBus(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, 1)), Convert.ToBoolean(rnd.Next(0,1)), Convert.ToBoolean(rnd.Next(0,1))); + SetData(); + Draw(); + } } } \ No newline at end of file From efab0dd09a81608b38adb330a69d78545ccbbc4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Sun, 9 Oct 2022 21:38:46 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bus/Bus/DrawingBus.cs | 7 ++++++- Bus/Bus/DrawingObjectBus.cs | 39 +++++++++++++++++++++++++++++++++++++ Bus/Bus/IDrawingObject.cs | 17 ++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 Bus/Bus/DrawingObjectBus.cs create mode 100644 Bus/Bus/IDrawingObject.cs diff --git a/Bus/Bus/DrawingBus.cs b/Bus/Bus/DrawingBus.cs index ab1cb38..c9591ae 100644 --- a/Bus/Bus/DrawingBus.cs +++ b/Bus/Bus/DrawingBus.cs @@ -1,4 +1,4 @@ - using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -135,5 +135,10 @@ namespace Bus _startPosY = _pictureHeight.Value - _busHeight; } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY + _busHeight); + } + } } diff --git a/Bus/Bus/DrawingObjectBus.cs b/Bus/Bus/DrawingObjectBus.cs new file mode 100644 index 0000000..0ad505e --- /dev/null +++ b/Bus/Bus/DrawingObjectBus.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + internal class DrawingObjectBus : IDrawingObject + { + private DrawingBus _bus = null; + public float Step => _bus?.Bus?.Step ?? 0; + + public DrawingObjectBus(DrawingBus bus) + { + _bus = bus; + } + + 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) + { + _bus.DrawTransport(g); + } + } +} diff --git a/Bus/Bus/IDrawingObject.cs b/Bus/Bus/IDrawingObject.cs new file mode 100644 index 0000000..e0771e9 --- /dev/null +++ b/Bus/Bus/IDrawingObject.cs @@ -0,0 +1,17 @@ + using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + 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 4948e39b427990cd256f91a7eadb84a7e205c1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Sun, 9 Oct 2022 22:52:36 +0400 Subject: [PATCH 4/5] =?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 --- Bus/Bus/AbstractMap.cs | 140 ++++++++++++++++++++++++ Bus/Bus/Direction.cs | 1 + Bus/Bus/FormMap.Designer.cs | 208 ++++++++++++++++++++++++++++++++++++ Bus/Bus/FormMap.cs | 87 +++++++++++++++ Bus/Bus/FormMap.resx | 63 +++++++++++ Bus/Bus/Program.cs | 2 +- Bus/Bus/SimpleMap.cs | 47 ++++++++ 7 files changed, 547 insertions(+), 1 deletion(-) create mode 100644 Bus/Bus/AbstractMap.cs create mode 100644 Bus/Bus/FormMap.Designer.cs create mode 100644 Bus/Bus/FormMap.cs create mode 100644 Bus/Bus/FormMap.resx create mode 100644 Bus/Bus/SimpleMap.cs diff --git a/Bus/Bus/AbstractMap.cs b/Bus/Bus/AbstractMap.cs new file mode 100644 index 0000000..e34b7e1 --- /dev/null +++ b/Bus/Bus/AbstractMap.cs @@ -0,0 +1,140 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + 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) + { + // proverka + _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() + { + 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); + //////////////////////////////// proverka + 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; + + } + + + + 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; } + + + + for (int y = startY; y < endY; y++) + { + for (int x = startX; x < endX; x++) + { + if (_map[x, y] == _barrier) + { + return true; + } + } + } + + return false; + } + + 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/Bus/Bus/Direction.cs b/Bus/Bus/Direction.cs index 7aecfb9..64530e7 100644 --- a/Bus/Bus/Direction.cs +++ b/Bus/Bus/Direction.cs @@ -8,6 +8,7 @@ namespace Bus { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/Bus/Bus/FormMap.Designer.cs b/Bus/Bus/FormMap.Designer.cs new file mode 100644 index 0000000..499aed8 --- /dev/null +++ b/Bus/Bus/FormMap.Designer.cs @@ -0,0 +1,208 @@ +namespace Bus +{ + 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.pictureBoxBus = new System.Windows.Forms.PictureBox(); + 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.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.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxBus + // + this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); + this.pictureBoxBus.Name = "pictureBoxBus"; + this.pictureBoxBus.Size = new System.Drawing.Size(827, 429); + this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxBus.TabIndex = 0; + this.pictureBoxBus.TabStop = false; + // + // 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, 429); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(827, 26); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); + 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(11, 384); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(94, 29); + 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::Bus.Properties.Resources.Frame_3; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(744, 346); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(40, 40); + this.buttonUp.TabIndex = 3; + 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::Bus.Properties.Resources.Frame_6; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(704, 386); + this.buttonLeft.Name = "buttonLeft"; + 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); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Bus.Properties.Resources.Frame_5; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(744, 386); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(40, 40); + this.buttonDown.TabIndex = 5; + 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::Bus.Properties.Resources.Frame_4; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(784, 386); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(40, 40); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(111, 384); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(141, 29); + 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(9, 8); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(827, 455); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + 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"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxBus; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/Bus/Bus/FormMap.cs b/Bus/Bus/FormMap.cs new file mode 100644 index 0000000..9bbfb0a --- /dev/null +++ b/Bus/Bus/FormMap.cs @@ -0,0 +1,87 @@ +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 Bus +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + + 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 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 ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var bus = new DrawingSportBus(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, 1)), Convert.ToBoolean(rnd.Next(0, 1)), Convert.ToBoolean(rnd.Next(0, 1))); + SetData(bus); + + } + + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/Bus/Bus/FormMap.resx b/Bus/Bus/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/Bus/Bus/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/Bus/Bus/Program.cs b/Bus/Bus/Program.cs index 0058b25..eab9d18 100644 --- a/Bus/Bus/Program.cs +++ b/Bus/Bus/Program.cs @@ -11,7 +11,7 @@ namespace Bus // 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/Bus/Bus/SimpleMap.cs b/Bus/Bus/SimpleMap.cs new file mode 100644 index 0000000..1a9e515 --- /dev/null +++ b/Bus/Bus/SimpleMap.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + internal class SimpleMap : AbstractMap + { + Brush barrierColor = new SolidBrush(Color.Black); + 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 b57c2bf5cb2cee3a8681537427bf72cae15360ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D0=B8=D1=80=20=D0=9D=D1=83=D0=B3=D0=B0?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Tue, 11 Oct 2022 16:01:02 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=A1=D0=B4=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=2002=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bus/Bus/AbstractMap.cs | 70 +++++++++++++++++++++++++------------ Bus/Bus/DrawingSportBus.cs | 51 +++++++++------------------ Bus/Bus/EntitySportBus.cs | 6 ++-- Bus/Bus/FormBus.cs | 2 +- Bus/Bus/FormMap.Designer.cs | 3 +- Bus/Bus/FormMap.cs | 3 ++ Bus/Bus/MyMap.cs | 49 ++++++++++++++++++++++++++ 7 files changed, 122 insertions(+), 62 deletions(-) create mode 100644 Bus/Bus/MyMap.cs diff --git a/Bus/Bus/AbstractMap.cs b/Bus/Bus/AbstractMap.cs index e34b7e1..3e4ceb3 100644 --- a/Bus/Bus/AbstractMap.cs +++ b/Bus/Bus/AbstractMap.cs @@ -32,37 +32,61 @@ namespace Bus } - public Bitmap MoveObject(Direction direction) + public bool CheckBarriers(float Left, float Right, float Top, float Bottom) { - // proverka - _drawingObject.MoveObject(direction); + int startX = (int)(Left / _size_x); + int startY = (int)(Right / _size_y); + int endX = (int)(Top / _size_x); + int endY = (int)(Bottom / _size_y); - bool collision = CheckCollision(); - - if (collision) + for (int i = startX; i <= endX; i++) { - switch (direction) + for (int j = startY; j <= endY; j++) { - 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; + if (_map[i, j] == _barrier) + { + return true; + } } } + return false; + } + public Bitmap MoveObject(Direction direction) + { + + _drawingObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawingObject.GetCurrentPosition(); + bool isTrue = true; + bool collision = CheckCollision(); + if (CheckBarriers(Left, Right, Top, Bottom)) + { + _drawingObject.MoveObject(MoveObjectBack(direction)); + } return DrawMapWithObject(); + + + + + } - + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + case Direction.Down: + return Direction.Up; + case Direction.Left: + return Direction.Right; + case Direction.Right: + return Direction.Left; + } + return Direction.None; + } private bool SetObjectOnMap() @@ -71,10 +95,10 @@ namespace Bus { return false; } - int x = _random.Next(0, 10); - int y = _random.Next(0, 10); + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); _drawingObject.SetObject(x, y, _width, _height); - //////////////////////////////// proverka + if (!CheckBarriers(0, 0, 0, 0)) return false; return true; } diff --git a/Bus/Bus/DrawingSportBus.cs b/Bus/Bus/DrawingSportBus.cs index 7d20d4c..b1ebefb 100644 --- a/Bus/Bus/DrawingSportBus.cs +++ b/Bus/Bus/DrawingSportBus.cs @@ -25,57 +25,40 @@ namespace Bus if (sportBus.BodyKit) { - - - 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 br = new SolidBrush(Bus?.BodyColor ?? Color.Black); + Brush fireBrush = new SolidBrush(Color.Red); + Pen pen1 = new(Color.Black); + g.DrawRectangle(pen1, _startPosX + 20, _startPosY, 150, 50); + g.FillRectangle(br, _startPosX + 21, _startPosY+1, 149, 49); + - 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); } _startPosX += 10; - _startPosY += 5; + _startPosY += 15; base.DrawTransport(g); _startPosX -= 10; - _startPosY -= 5; + _startPosY -= 15; if (sportBus.Sportline) { - 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.LightBlue); + g.FillRectangle(brBlue, _startPosX + 30, _startPosY + 5, 10, 14); + g.DrawRectangle(pen, _startPosX + 29, _startPosY + 4, 10, 15); - - 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); + g.FillRectangle(brBlue, _startPosX + 60, _startPosY + 5, 10, 14); + g.DrawRectangle(pen, _startPosX + 59, _startPosY + 4, 10, 15); } if (sportBus.Wing) { - 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.DrawRectangle(pen, _startPosX + 112, _startPosY + 7, 6,50); + g.DrawRectangle(pen, _startPosX + 112, _startPosY + 17, 6, 40); + g.DrawRectangle(pen, _startPosX + 112, _startPosY + 27, 6, 10); + g.DrawRectangle(pen, _startPosX + 112, _startPosY + 37, 6, 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); - g.FillEllipse(brBlue, _startPosX + 70, _startPosY + 15, 10, 15); - g.FillEllipse(brBlue, _startPosX + 90, _startPosY + 15, 10, 15); } - - - - } } } diff --git a/Bus/Bus/EntitySportBus.cs b/Bus/Bus/EntitySportBus.cs index 8e06a6a..cdc78e8 100644 --- a/Bus/Bus/EntitySportBus.cs +++ b/Bus/Bus/EntitySportBus.cs @@ -17,9 +17,9 @@ namespace Bus base(speed, weight, bodyColor) { DopColor = dopColor; - BodyKit = bodyKit; - Wing = wing; - Sportline = sportline; + BodyKit = bodyKit = true; + Wing = wing = true; + Sportline = sportline = true; } } } diff --git a/Bus/Bus/FormBus.cs b/Bus/Bus/FormBus.cs index 3d0f408..6a98108 100644 --- a/Bus/Bus/FormBus.cs +++ b/Bus/Bus/FormBus.cs @@ -21,7 +21,7 @@ namespace Bus private void SetData() { Random rnd = new(); - _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height); + _bus.SetPosition(rnd.Next(20, 100), rnd.Next(20, 100), pictureBoxBus.Width, pictureBoxBus.Height); toolStripStatusLabelSpeed.Text = $": {_bus.Bus?.Speed}"; toolStripStatusLabelWeight.Text = $": {_bus.Bus?.Weight}"; toolStripStatusLabelBodyColor.Text = $": {_bus.Bus?.BodyColor.Name}"; diff --git a/Bus/Bus/FormMap.Designer.cs b/Bus/Bus/FormMap.Designer.cs index 499aed8..5e989ab 100644 --- a/Bus/Bus/FormMap.Designer.cs +++ b/Bus/Bus/FormMap.Designer.cs @@ -159,7 +159,8 @@ 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(9, 8); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); diff --git a/Bus/Bus/FormMap.cs b/Bus/Bus/FormMap.cs index 9bbfb0a..f1ee503 100644 --- a/Bus/Bus/FormMap.cs +++ b/Bus/Bus/FormMap.cs @@ -81,6 +81,9 @@ namespace Bus case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Ёще одна карта": + _abstractMap = new MyMap(); + break; } } } diff --git a/Bus/Bus/MyMap.cs b/Bus/Bus/MyMap.cs new file mode 100644 index 0000000..f0f4f79 --- /dev/null +++ b/Bus/Bus/MyMap.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + internal class MyMap : AbstractMap + { + + private readonly Brush barrierColor = new SolidBrush(Color.White); + private readonly Brush roadColor = new SolidBrush(Color.SkyBlue); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y); + + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y); + } + 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 < 25) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + + } +}