From f9ff52e57b2e1d42d8b69c08b07d5a983db495f1 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Fri, 23 Sep 2022 18:29:37 +0400 Subject: [PATCH 1/6] =?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 --- WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs | 5 ++--- WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs | 2 +- WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs index 24aeb64..7ffcbe6 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs @@ -45,10 +45,9 @@ namespace WarmlyLocomotive /// Скорость /// Вес локомотива /// Цвет кузова - public void Init(int speed, float weight, Color bodyColor) + public DrawningLocomotive(int speed, float weight, Color bodyColor) { - Locomotive = new EntityLocomotive(); - Locomotive.Init(speed, weight, bodyColor); + Locomotive = new EntityLocomotive(speed, weight, bodyColor); } /// /// Установка позиции локомотива diff --git a/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs index bbd2bd4..36ee67c 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs @@ -31,7 +31,7 @@ namespace WarmlyLocomotive /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs index b7fd364..9e6d19f 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs @@ -25,8 +25,7 @@ namespace WarmlyLocomotive private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _locomotive = new DrawningLocomotive(); - _locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); toolStripStatusLabelSpeed.Text = $": {_locomotive.Locomotive.Speed}"; toolStripStatusLabelWeight.Text = $": {_locomotive.Locomotive.Weight}"; -- 2.25.1 From 227307519b07a09d7eae4d4fa093651140453687 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Fri, 23 Sep 2022 20:24:49 +0400 Subject: [PATCH 2/6] =?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 --- .../WarmlyLocomotive/DrawningLocomotive.cs | 13 ++++-- .../DrawningWarmlyLocomotive.cs | 46 +++++++++++++++++++ .../EntityWarmlyLocomotive.cs | 37 +++++++++++++++ .../FormLocomotive.Designer.cs | 14 ++++++ .../WarmlyLocomotive/FormLocomotive.cs | 26 +++++++++-- 5 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 WarmlyLocomotive/WarmlyLocomotive/DrawningWarmlyLocomotive.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs index 7ffcbe6..b6eba80 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs @@ -14,15 +14,15 @@ namespace WarmlyLocomotive /// /// Класс-сущность /// - public EntityLocomotive Locomotive { get; private set; } + public EntityLocomotive Locomotive { get; protected set; } /// /// Левая координата отрисовки локомотива /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки локомотива /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -49,6 +49,11 @@ namespace WarmlyLocomotive { Locomotive = new EntityLocomotive(speed, weight, bodyColor); } + protected DrawningLocomotive(int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight) : this(speed, weight, bodyColor) + { + _locomotiveWidth = locomotiveWidth; + _locomotiveHeight = locomotiveHeight; + } /// /// Установка позиции локомотива /// @@ -112,7 +117,7 @@ namespace WarmlyLocomotive /// Отрисовка локомотива /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningWarmlyLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningWarmlyLocomotive.cs new file mode 100644 index 0000000..2b4123d --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningWarmlyLocomotive.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class DrawningWarmlyLocomotive : DrawningLocomotive + { + public DrawningWarmlyLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool pipe, bool fuelCompartment, bool warmlyLines): base(speed, weight, bodyColor, 210, 120) + { + Locomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, dopColor, pipe, fuelCompartment, warmlyLines); + } + public override void DrawTransport(Graphics g) + { + if(Locomotive is not EntityWarmlyLocomotive warmlyLocomotive) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(warmlyLocomotive.DopColor); + if (warmlyLocomotive.Pipe) + { + g.FillRectangle(dopBrush, _startPosX + 125, _startPosY + 5, 35, 10); + g.FillRectangle(dopBrush, _startPosX + 130, _startPosY, 25, 5); + g.DrawRectangle(pen, _startPosX + 125, _startPosY + 5, 35, 10); + g.DrawRectangle(pen, _startPosX + 130, _startPosY, 25, 5); + } + if (warmlyLocomotive.FuelCompartment) + { + g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 85, 50, 25); + g.DrawRectangle(pen, _startPosX + 90, _startPosY + 85, 50, 25); + g.FillEllipse(new SolidBrush(Color.Black), _startPosX + 115, _startPosY + 100, 5, 5); + } + _startPosY += 15; + base.DrawTransport(g); + _startPosY -= 15; + if (warmlyLocomotive.WarmlyLines) + { + g.FillRectangle(dopBrush, _startPosX + 180, _startPosY + 60, 30, 5); + g.FillRectangle(dopBrush, _startPosX + 180, _startPosY + 80, 30, 5); + } + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs new file mode 100644 index 0000000..0b5707a --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.NetworkInformation; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class EntityWarmlyLocomotive : EntityLocomotive + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия трубы + /// + public bool Pipe { get; private set; } + /// + /// Признак наличия отсека под топливо + /// + public bool FuelCompartment { get; private set; } + /// + /// Признак наличия полос на кузове + /// + public bool WarmlyLines { get; private set; } + public EntityWarmlyLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool pipe, bool fuelCompartment, bool warmlyLines) : + base(speed, weight, bodyColor) + { + DopColor = dopColor; + Pipe = pipe; + FuelCompartment = fuelCompartment; + WarmlyLines = warmlyLines; + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.Designer.cs index db07a18..843fe60 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.Designer.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.Designer.cs @@ -38,6 +38,7 @@ this.buttonUp = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -141,11 +142,23 @@ this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_click); // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(105, 418); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // // FormLocomotive // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(837, 483); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonUp); @@ -176,5 +189,6 @@ private Button buttonUp; private Button buttonDown; private Button buttonLeft; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs index 9e6d19f..f46b6f9 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotive.cs @@ -17,6 +17,17 @@ namespace WarmlyLocomotive _locomotive?.DrawTransport(gr); pictureBoxLocomotive.Image = bmp; } + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + toolStripStatusLabelSpeed.Text = $": {_locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $": {_locomotive.Locomotive.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_locomotive.Locomotive.BodyColor.Name}"; + } /// /// "" /// @@ -26,10 +37,7 @@ namespace WarmlyLocomotive { Random rnd = new(); _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); - toolStripStatusLabelSpeed.Text = $": {_locomotive.Locomotive.Speed}"; - toolStripStatusLabelWeight.Text = $": {_locomotive.Locomotive.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_locomotive.Locomotive.BodyColor.Name}"; + SetData(); Draw(); } private void ButtonMove_click(object sender, EventArgs e) @@ -57,5 +65,15 @@ namespace WarmlyLocomotive _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); Draw(); } + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From d0c4dedf44ee6ec168f26e2aacb7bbefcddd25fc Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Sat, 24 Sep 2022 13:56:16 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B8=D1=82.=20=D0=A1=D0=BE=D0=B1=D1=80=D0=B0=D0=BD=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyLocomotive/AbstractMap.cs | 82 +++++++ .../WarmlyLocomotive/Direction.cs | 1 + .../WarmlyLocomotive/DrawningLocomotive.cs | 4 + .../DrawningObjectLocomotive.cs | 35 +++ .../WarmlyLocomotive/FormMap.Designer.cs | 207 ++++++++++++++++++ WarmlyLocomotive/WarmlyLocomotive/FormMap.cs | 84 +++++++ .../WarmlyLocomotive/FormMap.resx | 63 ++++++ .../WarmlyLocomotive/IDrawningObject.cs | 40 ++++ WarmlyLocomotive/WarmlyLocomotive/Program.cs | 2 +- .../WarmlyLocomotive/SimpleMap.cs | 52 +++++ 10 files changed, 569 insertions(+), 1 deletion(-) create mode 100644 WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormMap.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormMap.resx create mode 100644 WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/SimpleMap.cs diff --git a/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs new file mode 100644 index 0000000..81bbd43 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal abstract class AbstractMap + { + private IDrawningObject _drawningObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawningObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawningObject.DrawningObject(gr); + return bmp; + } + protected abstract void GenerateMap(); + protected abstract void DrawRoadPart(Graphics g, int i, int j); + protected abstract void DrawBarrierPart(Graphics g, int i, int j); + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/Direction.cs b/WarmlyLocomotive/WarmlyLocomotive/Direction.cs index 5a70a95..53e0dc8 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/Direction.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/Direction.cs @@ -11,6 +11,7 @@ namespace WarmlyLocomotive /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs index b6eba80..85cefab 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs @@ -178,5 +178,9 @@ namespace WarmlyLocomotive _startPosY = _pictureHeight.Value - _locomotiveHeight; } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight); + } } } diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs new file mode 100644 index 0000000..2eff33f --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class DrawningObjectLocomotive : IDrawningObject + { + private DrawningLocomotive _locomotive = null; + public float Step => _locomotive?.Locomotive?.Step ?? 0; + public DrawningObjectLocomotive(DrawningLocomotive locomotive) + { + _locomotive = locomotive; + } + public void DrawningObject(Graphics g) + { + //ToDo + _locomotive?.DrawTransport(g); + } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _locomotive?.GetCurrentPosition() ?? default; + } + public void MoveObject(Direction direction) + { + _locomotive?.MoveTransport(direction); + } + public void SetObject(int x, int y, int width, int height) + { + _locomotive.SetPosition(x, y, width, height); + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs new file mode 100644 index 0000000..9855737 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs @@ -0,0 +1,207 @@ +namespace WarmlyLocomotive +{ + 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.pictureBoxLocomotive = new System.Windows.Forms.PictureBox(); + this.statusStrip = 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.buttonRight = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxLocomotive + // + this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0); + this.pictureBoxLocomotive.Name = "pictureBoxLocomotive"; + this.pictureBoxLocomotive.Size = new System.Drawing.Size(837, 461); + this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxLocomotive.TabIndex = 0; + this.pictureBoxLocomotive.TabStop = false; + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 461); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(837, 22); + this.statusStrip.TabIndex = 1; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); + this.toolStripStatusLabelWeight.Text = "Вес:"; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(12, 418); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(795, 411); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 3; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(759, 375); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 4; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(759, 411); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.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::WarmlyLocomotive.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(723, 411); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 6; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_click); + // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(105, 418); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(110, 23); + 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(12, 12); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); + this.comboBoxSelectorMap.TabIndex = 8; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(837, 483); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxLocomotive); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxLocomotive; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonRight; + private Button buttonUp; + private Button buttonDown; + private Button buttonLeft; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs new file mode 100644 index 0000000..942a010 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs @@ -0,0 +1,84 @@ +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 WarmlyLocomotive +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawningLocomotive locomotive) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {locomotive.Locomotive.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}"; + pictureBoxLocomotive.Image = _abstractMap.CreateMap(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height, + new DrawningObjectLocomotive(locomotive)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(locomotive); + } + 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; + } + pictureBoxLocomotive.Image = _abstractMap?.MoveObject(dir); + } + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(locomotive); + } + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMap.resx b/WarmlyLocomotive/WarmlyLocomotive/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/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/WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs b/WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs new file mode 100644 index 0000000..7a8d7d1 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal interface IDrawningObject + { + /// + /// Шаг перемещения объекта + /// + public float Step { get; } + /// + /// Установка позиции объекта + /// + /// Координата X + /// Координата Y + /// Ширина полотна + /// Высота полотна + void SetObject(int x, int y, int width, int height); + /// + /// Изменение направления пермещения объекта + /// + /// Направление + /// + void MoveObject(Direction direction); + /// + /// Отрисовка объекта + /// + /// + void DrawningObject(Graphics g); + /// + /// Получение текущей позиции объекта + /// + /// + (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/Program.cs b/WarmlyLocomotive/WarmlyLocomotive/Program.cs index c0d615b..f6449b7 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/Program.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/Program.cs @@ -11,7 +11,7 @@ namespace WarmlyLocomotive // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormLocomotive()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/SimpleMap.cs b/WarmlyLocomotive/WarmlyLocomotive/SimpleMap.cs new file mode 100644 index 0000000..6acf633 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/SimpleMap.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Gray); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + } + protected override void GenerateMap() + { + _map = new int[100, 100]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 50) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From cf067f83de0bd79b8166f34af423a98671794f70 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Sun, 25 Sep 2022 14:09:15 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B8=20=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyLocomotive/AbstractMap.cs | 64 ++++++++++++++++++- .../WarmlyLocomotive/DrawningLocomotive.cs | 19 ++++-- 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs index 81bbd43..f8d36e6 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs @@ -32,20 +32,80 @@ namespace WarmlyLocomotive public Bitmap MoveObject(Direction direction) { // TODO проверка, что объект может переместится в требуемом направлении - if (true) + (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition(); + for (int i = 0; i < _map.GetLength(0); ++i) { - _drawningObject.MoveObject(direction); + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i,j] == _barrier) + { + switch (direction) + { + case Direction.Up: + if(_size_y * (j+1) >= topY - _drawningObject.Step && _size_y * (j+1) < topY && _size_x * (i + 1) > leftX + && _size_x * (i + 1) <= rightX) + { + return DrawMapWithObject(); + } + break; + case Direction.Down: + if (_size_y * j <= bottomY + _drawningObject.Step && _size_y * j > bottomY && _size_x * (i+1) > leftX + && _size_x * (i+1) <= rightX) + { + return DrawMapWithObject(); + } + break; + case Direction.Left: + if (_size_x * (i+1) >= leftX - _drawningObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY + && _size_y * (j + 1) >= topY) + { + return DrawMapWithObject(); + } + break; + case Direction.Right: + if (_size_x * i <= rightX + _drawningObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY + && _size_y * (j + 1) >= topY) + { + return DrawMapWithObject(); + } + break; + } + } + } } + _drawningObject.MoveObject(direction); return DrawMapWithObject(); } private bool SetObjectOnMap() { + (float currentX, float currentY, float locomotiveWidth, float locomotiveHeight) = _drawningObject.GetCurrentPosition(); if (_drawningObject == null || _map == null) { return false; } + if(currentX != 0) + { + locomotiveWidth -= currentX; + } + if (currentY != 0) + { + locomotiveHeight -= currentY; + } int x = _random.Next(0, 10); int y = _random.Next(0, 10); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i,j] == _barrier) + { + if(x + locomotiveWidth >= _size_x * i && x <= _size_x * i && y + locomotiveHeight > _size_y * j && y <= _size_y * j) + { + return false; + } + } + } + } _drawningObject.SetObject(x, y, _width, _height); // TODO првоерка, что объект не "накладывается" на закрытые участки return true; diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs index 85cefab..8145c57 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningLocomotive.cs @@ -127,13 +127,13 @@ namespace WarmlyLocomotive Pen pen = new(Color.Black); Brush br = new SolidBrush(Locomotive?.BodyColor ?? Color.Black); //кузов - PointF[] polygon_points = new PointF[4]; - polygon_points[0] = new PointF(_startPosX + 10, _startPosY); - polygon_points[1] = new PointF(_startPosX + 190, _startPosY); - polygon_points[2] = new PointF(_startPosX + 210, _startPosY + 40); - polygon_points[3] = new PointF(_startPosX + 10, _startPosY + 40); - g.FillPolygon(br, polygon_points); - g.DrawPolygon(pen, polygon_points); + PointF[] polygonPoints = new PointF[4]; + polygonPoints[0] = new PointF(_startPosX + 10, _startPosY); + polygonPoints[1] = new PointF(_startPosX + 190, _startPosY); + polygonPoints[2] = new PointF(_startPosX + 210, _startPosY + 40); + polygonPoints[3] = new PointF(_startPosX + 10, _startPosY + 40); + g.FillPolygon(br, polygonPoints); + g.DrawPolygon(pen, polygonPoints); g.FillRectangle(br, _startPosX + 10, _startPosY + 40, 200, 40); g.DrawRectangle(pen, _startPosX + 10, _startPosY + 40, 200, 40); //колеса @@ -142,6 +142,11 @@ namespace WarmlyLocomotive g.FillEllipse(brGray, _startPosX + 70, _startPosY + 80, 30, 25); g.FillEllipse(brGray, _startPosX + 130, _startPosY + 80, 30, 25); g.FillEllipse(brGray, _startPosX + 170, _startPosY + 80, 30, 25); + Pen dopPen = new(Color.Black, 2); + g.DrawEllipse(dopPen, _startPosX + 30, _startPosY + 80, 30, 25); + g.DrawEllipse(dopPen, _startPosX + 70, _startPosY + 80, 30, 25); + g.DrawEllipse(dopPen, _startPosX + 130, _startPosY + 80, 30, 25); + g.DrawEllipse(dopPen, _startPosX + 170, _startPosY + 80, 30, 25); //стекла и дверь Brush brBrown = new SolidBrush(Color.Brown); g.FillRectangle(brBrown, _startPosX + 100, _startPosY + 20, 25, 45); -- 2.25.1 From 954aa1766668846075d28852228839e6ec56e43b Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Mon, 26 Sep 2022 20:56:39 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B4=D0=B2=D0=B0=20=D0=BD=D0=B0=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=D0=B4=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=B0=D0=B1=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=B0=20AbstractMap.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyLocomotive/AbstractMap.cs | 2 - .../WarmlyLocomotive/BigBarriersMap.cs | 66 ++++++++++++++++++ .../WarmlyLocomotive/CirclesMap.cs | 67 +++++++++++++++++++ .../DrawningObjectLocomotive.cs | 1 - .../WarmlyLocomotive/FormMap.Designer.cs | 4 +- WarmlyLocomotive/WarmlyLocomotive/FormMap.cs | 6 ++ 6 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs diff --git a/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs index f8d36e6..d808c44 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/AbstractMap.cs @@ -31,7 +31,6 @@ namespace WarmlyLocomotive } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition(); for (int i = 0; i < _map.GetLength(0); ++i) { @@ -107,7 +106,6 @@ namespace WarmlyLocomotive } } _drawningObject.SetObject(x, y, _width, _height); - // TODO првоерка, что объект не "накладывается" на закрытые участки return true; } private Bitmap DrawMapWithObject() diff --git a/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs b/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs new file mode 100644 index 0000000..34d191e --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class BigBarriersMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.SandyBrown); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightCyan); + 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 < 15) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (x + 2 < 100 && y + 2 < 100) + { + if (_map[x, y] == _freeRoad && _map[x, y + 1] == _freeRoad && _map[x, y + 2] == _freeRoad && _map[x + 1, y] == _freeRoad && _map[x + 1, y + 1] == _freeRoad + && _map[x + 1, y + 2] == _freeRoad && _map[x + 2, y] == _freeRoad && _map[x + 2, y + 1] == _freeRoad && _map[x + 2, y + 2] == _freeRoad) + { + _map[x, y] = _barrier; + _map[x, y + 1] = _barrier; + _map[x, y + 2] = _barrier; + _map[x + 1, y] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 1, y + 2] = _barrier; + _map[x + 2, y] = _barrier; + _map[x + 2, y + 1] = _barrier; + _map[x + 2, y + 2] = _barrier; + counter++; + } + } + } + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs b/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs new file mode 100644 index 0000000..95c647e --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + internal class CirclesMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Red); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.LightCoral); + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + if (i - 1 >= 0 && j - 1 >= 0) + { + if (_map[i - 1, j - 1] == _barrier && _map[i - 1, j] == _barrier && _map[i, j - 1] == _barrier) + { + g.FillEllipse(barrierColor, (i-1) * _size_x, (j-1) * _size_y, _size_x * 2, _size_y * 2); + } + } + } + + 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 < 20) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (x + 1 < 100 && y + 1 < 100) + { + if (_map[x, y] == _freeRoad && _map[x, y + 1] == _freeRoad && _map[x + 1, y] == _freeRoad && _map[x + 1, y + 1] == _freeRoad) + { + _map[x, y] = _barrier; + _map[x + 1, y] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x, y + 1] = _barrier; + counter++; + } + } + } + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs index 2eff33f..4cbcdab 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/DrawningObjectLocomotive.cs @@ -16,7 +16,6 @@ namespace WarmlyLocomotive } public void DrawningObject(Graphics g) { - //ToDo _locomotive?.DrawTransport(g); } public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs index 9855737..62fd506 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMap.Designer.cs @@ -158,7 +158,9 @@ 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(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs index 942a010..362576d 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMap.cs @@ -78,6 +78,12 @@ namespace WarmlyLocomotive case "Простая карта": _abstractMap = new SimpleMap(); break; + case "Карта с большими барьерами": + _abstractMap = new BigBarriersMap(); + break; + case "Карта с барьерами-кругами": + _abstractMap = new CirclesMap(); + break; } } } -- 2.25.1 From eac9710f698b577d4bc0353a18c6fbb8ffa3c76a Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Fri, 30 Sep 2022 10:54:38 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs | 2 -- WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs | 2 -- 2 files changed, 4 deletions(-) diff --git a/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs b/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs index 34d191e..3ff4340 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/BigBarriersMap.cs @@ -20,12 +20,10 @@ namespace WarmlyLocomotive { 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]; diff --git a/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs b/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs index 95c647e..27382c6 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/CirclesMap.cs @@ -27,12 +27,10 @@ namespace WarmlyLocomotive } } } - 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]; -- 2.25.1