From 72a6c7d03616e776ee16bf19e965e7e1eaf4b967 Mon Sep 17 00:00:00 2001 From: Stranni15k Date: Mon, 26 Sep 2022 13:32:09 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=962.=20=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B2=D1=81=D0=B5=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8.=20?= =?UTF-8?q?=D0=A2=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B9!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectricLocomotive/AbstractMap.cs | 84 +++++++ .../ElectricLocomotive/Direction.cs | 1 + .../DrawningHardLocomotive.cs | 63 ++++++ .../ElectricLocomotive/DrawningLocomotive.cs | 39 +++- .../DrawningObjectLocomotive.cs | 40 ++++ .../EntityHardLocomotive.cs | 46 ++++ .../ElectricLocomotive/EntityLocomotive.cs | 2 +- .../FormLocomotive.Designer.cs | 13 ++ .../ElectricLocomotive/FormLocomotive.cs | 29 ++- .../ElectricLocomotive/FormMap.Designer.cs | 213 ++++++++++++++++++ .../ElectricLocomotive/FormMap.cs | 98 ++++++++ .../ElectricLocomotive/FormMap.resx | 63 ++++++ .../ElectricLocomotive/IDrawningObject.cs | 40 ++++ .../ElectricLocomotive/SimpleMap.cs | 53 +++++ 14 files changed, 764 insertions(+), 20 deletions(-) create mode 100644 ElectricLocomotive/ElectricLocomotive/AbstractMap.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/FormMap.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/FormMap.resx create mode 100644 ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/SimpleMap.cs diff --git a/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs b/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs new file mode 100644 index 0000000..5c71311 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + 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/ElectricLocomotive/ElectricLocomotive/Direction.cs b/ElectricLocomotive/ElectricLocomotive/Direction.cs index dc9f4a2..a1ba87f 100644 --- a/ElectricLocomotive/ElectricLocomotive/Direction.cs +++ b/ElectricLocomotive/ElectricLocomotive/Direction.cs @@ -8,6 +8,7 @@ namespace ElectricLocomotive { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs new file mode 100644 index 0000000..93a5dfa --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class DrawningHardLocomotive : DrawningLocomotive + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public DrawningHardLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + base(speed, weight, bodyColor, 110, 60) + { + Locomotive = new EntityHardLocomotive(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); + } + public override void DrawTransport(Graphics g) + { + if (Locomotive is not EntityHardLocomotive sportCar) + { + return; + } + + + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(sportCar.DopColor); + + + if (sportCar.BodyKit) + { + g.FillRectangle(dopBrush, _startPosX, _startPosY + 20, 60, 10); + g.DrawRectangle(pen, _startPosX, _startPosY + 20, 60, 10); + + g.FillRectangle(dopBrush, _startPosX - 10, _startPosY + 10, 10, 30); + g.DrawRectangle(pen, _startPosX - 10, _startPosY + 10 , 10, 30); + } + + if (sportCar.SportLine) + { + g.FillRectangle(dopBrush, _startPosX + 10, _startPosY - 20, 60, 10); + g.FillRectangle(dopBrush, _startPosX, _startPosY + 20, 60, 10); + g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 60, 10); + g.DrawRectangle(pen, _startPosX, _startPosY + 20, 60, 10); + } + + if (sportCar.Wing) + { + + } + + base.DrawTransport(g); + } + } +} diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs index 9da4c01..c03ca0e 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs @@ -12,41 +12,40 @@ namespace ElectricLocomotive /// /// Класс-сущность /// - public EntityLocomotive Locomotive { get; private set; } + public EntityLocomotive Locomotive { get; protected set; } /// /// Левая координата отрисовки автомобиля /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки автомобиля /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// - private int? _pictureWidth = null; + protected int? _pictureWidth = null; /// /// Высота окна отрисовки /// - private int? _pictureHeight = null; + protected int? _pictureHeight = null; /// /// Ширина отрисовки автомобиля /// - private readonly int _locomotiveWidth = 160; + protected readonly int _locomotiveWidth = 160; /// /// Высота отрисовки автомобиля /// - private readonly int _locomotiveHeight = 90; + protected readonly int _locomotiveHeight = 90; /// /// Инициализация свойств /// /// Скорость /// Вес автомобиля /// Цвет кузова - 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); } /// /// Установка позиции автомобиля @@ -110,11 +109,21 @@ namespace ElectricLocomotive break; } } + + protected DrawningLocomotive(int speed, float weight, Color bodyColor, int + locomotiveWidth, int locomotiveHeight) : + this(speed, weight, bodyColor) + { + _locomotiveWidth = locomotiveWidth; + _locomotiveHeight = locomotiveHeight; + } + /// + /// /// Отрисовка автомобиля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) @@ -165,6 +174,14 @@ namespace ElectricLocomotive _startPosY = _pictureHeight.Value - _locomotiveHeight; } } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight); + } } } diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs new file mode 100644 index 0000000..5239ec5 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class DrawningObjectLocomotive : IDrawningObject + { + private DrawningLocomotive _locomotive = null; + + public DrawningObjectLocomotive(DrawningLocomotive locomotive) + { + _locomotive = locomotive; + } + + public float Step => _locomotive?.Locomotive?.Step ?? 0; + + 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); + } + + void IDrawningObject.DrawningObject(Graphics g) + { + // TODO + } + } +} diff --git a/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs new file mode 100644 index 0000000..df7e554 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class EntityHardLocomotive : EntityLocomotive + { + /// + /// Дополнительный цвет + /// + 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 EntityHardLocomotive(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/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs index a49bec0..fa6e8ff 100644 --- a/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs @@ -32,7 +32,7 @@ namespace ElectricLocomotive /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new Random(); Speed = speed <= 0 ? rnd.Next(40, 120) : speed; diff --git a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs index 25e04a5..d50fedc 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs @@ -38,6 +38,7 @@ this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonUp = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -147,11 +148,22 @@ this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 396); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(103, 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(800, 450); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonUp); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); @@ -182,5 +194,6 @@ private Button buttonDown; private Button buttonRight; private Button buttonUp; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs index d885b9c..fc487dc 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs @@ -21,14 +21,8 @@ namespace ElectricLocomotive private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _locomotive = new DrawningLocomotive(); - _locomotive.Init(rnd.Next(40, 120), rnd.Next(1500, 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), - pictureBox1.Width, pictureBox1.Height); - toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}"; - toolStripStatusLabelColor.Text = $"Цвет:{_locomotive.Locomotive.BodyColor.Name}"; + _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(); Draw(); } @@ -81,5 +75,24 @@ namespace ElectricLocomotive Draw(); } + private void SetData() + { + Random rnd = new(); + _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBox1.Width, pictureBox1.Height); + toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}"; + toolStripStatusLabelColor.Text = $"Цвет: {_locomotive.Locomotive.BodyColor.Name}"; + } + + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _locomotive = new DrawningHardLocomotive(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(); + } } } diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs b/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs new file mode 100644 index 0000000..137b438 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs @@ -0,0 +1,213 @@ +namespace ElectricLocomotive +{ + 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.pictureBox1 = 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.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).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.AutoSize = true; + this.ButtonCreate.Location = new System.Drawing.Point(12, 396); + this.ButtonCreate.Name = "ButtonCreate"; + this.ButtonCreate.Size = new System.Drawing.Size(75, 25); + this.ButtonCreate.TabIndex = 8; + this.ButtonCreate.Text = "Создать"; + this.ButtonCreate.UseVisualStyleBackColor = true; + this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // pictureBox1 + // + this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(800, 428); + this.pictureBox1.TabIndex = 10; + this.pictureBox1.TabStop = false; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 22); + this.statusStrip1.TabIndex = 9; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17); + this.toolStripStatusLabelWeight.Text = "Вес"; + // + // toolStripStatusLabelColor + // + this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor"; + this.toolStripStatusLabelColor.Size = new System.Drawing.Size(33, 17); + this.toolStripStatusLabelColor.Text = "Цвет"; + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 396); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(103, 23); + this.buttonCreateModif.TabIndex = 15; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.AutoSize = true; + this.buttonUp.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowup; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(712, 353); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 14; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.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.AutoSize = true; + this.buttonRight.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowright; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(748, 389); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 13; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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.AutoSize = true; + this.buttonDown.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowdown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(712, 389); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 12; + 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.AutoSize = true; + this.buttonLeft.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowleft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(676, 389); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 11; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_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(104, 23); + this.comboBoxSelectorMap.TabIndex = 16; + 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(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.ButtonCreate); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.pictureBox1); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Button ButtonCreate; + private PictureBox pictureBox1; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelColor; + private Button buttonCreateModif; + private Button buttonUp; + private Button buttonRight; + private Button buttonDown; + private Button buttonLeft; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.cs b/ElectricLocomotive/ElectricLocomotive/FormMap.cs new file mode 100644 index 0000000..f68b1fb --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/FormMap.cs @@ -0,0 +1,98 @@ +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 ElectricLocomotive +{ + 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}"; + toolStripStatusLabelColor.Text = $"Цвет: {locomotive.Locomotive.BodyColor.Name}"; + pictureBox1.Image = _abstractMap.CreateMap(pictureBox1.Width, pictureBox1.Height, + new DrawningObjectLocomotive(locomotive)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = 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(car); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBox1.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var car = new DrawningHardLocomotive(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(car); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + } + } + + } +} diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.resx b/ElectricLocomotive/ElectricLocomotive/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/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/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs b/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs new file mode 100644 index 0000000..2b16a23 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + 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/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs new file mode 100644 index 0000000..97be58c --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + 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 6db3ae138c3d0fd4c14f0202f4029108aafe176b Mon Sep 17 00:00:00 2001 From: Stranni15k Date: Sat, 19 Nov 2022 21:07:38 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectricLocomotive/AbstractMap.cs | 66 ++++++++++- .../ElectricLocomotive/BushesMap.cs | 56 ++++++++++ .../DrawningHardLocomotive.cs | 19 +--- .../ElectricLocomotive/DrawningLocomotive.cs | 103 ++++++++---------- .../DrawningObjectLocomotive.cs | 1 + .../ElectricLocomotive/FieldMap.cs | 53 +++++++++ .../ElectricLocomotive/FormMap.Designer.cs | 4 +- .../ElectricLocomotive/FormMap.cs | 7 ++ .../ElectricLocomotive/Program.cs | 2 +- .../ElectricLocomotive/SimpleMap.cs | 4 +- 10 files changed, 235 insertions(+), 80 deletions(-) create mode 100644 ElectricLocomotive/ElectricLocomotive/BushesMap.cs create mode 100644 ElectricLocomotive/ElectricLocomotive/FieldMap.cs diff --git a/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs b/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs index 5c71311..914017e 100644 --- a/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/AbstractMap.cs @@ -32,23 +32,85 @@ namespace ElectricLocomotive } public Bitmap MoveObject(Direction direction) { - // TODO проверка, что объект может переместится в требуемом направлении + (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition(); + + float locomotiveWidth = rightX - leftX; + float locomotiveHeight = bottomY - topY; + + for (int i = 0; i < _map.GetLength(0); i++) + { + 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; + } + } + } + } if (true) { _drawningObject.MoveObject(direction); } return DrawMapWithObject(); } + private bool SetObjectOnMap() { + (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition(); if (_drawningObject == null || _map == null) { return false; } + + float locomotiveWidth = rightX - leftX; + float locomotiveHeight = bottomY - topY; + 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; } private Bitmap DrawMapWithObject() diff --git a/ElectricLocomotive/ElectricLocomotive/BushesMap.cs b/ElectricLocomotive/ElectricLocomotive/BushesMap.cs new file mode 100644 index 0000000..376a534 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/BushesMap.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class BushesMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Pen barrierColor = new Pen(Color.DarkGreen, 3); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Brown); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7)); + g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1) + 7), Convert.ToInt32(j * (_size_y - 1)) + 7)); + g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7), new Point(Convert.ToInt32(i * (_size_x - 1) + 14), Convert.ToInt32(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 < 20) + { + int x = _random.Next(0, 100); + int y = _random.Next(0, 100); + if (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + + } +} diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs index 93a5dfa..0cf6419 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs @@ -32,29 +32,20 @@ namespace ElectricLocomotive Pen pen = new(Color.Black); + Pen window = new(Color.Blue); Brush dopBrush = new SolidBrush(sportCar.DopColor); if (sportCar.BodyKit) { - g.FillRectangle(dopBrush, _startPosX, _startPosY + 20, 60, 10); - g.DrawRectangle(pen, _startPosX, _startPosY + 20, 60, 10); - - g.FillRectangle(dopBrush, _startPosX - 10, _startPosY + 10, 10, 30); - g.DrawRectangle(pen, _startPosX - 10, _startPosY + 10 , 10, 30); + Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 15, Convert.ToInt32(_startPosY) - 20), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) - 30), new Point(Convert.ToInt32(_startPosX) + 75, Convert.ToInt32(_startPosY) - 20), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) + 10) }; + g.DrawPolygon(window, pts); } if (sportCar.SportLine) { - g.FillRectangle(dopBrush, _startPosX + 10, _startPosY - 20, 60, 10); - g.FillRectangle(dopBrush, _startPosX, _startPosY + 20, 60, 10); - g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 60, 10); - g.DrawRectangle(pen, _startPosX, _startPosY + 20, 60, 10); - } - - if (sportCar.Wing) - { - + Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 150, Convert.ToInt32(_startPosY) + 60)}; + g.FillPolygon(Brushes.Black, pts); } base.DrawTransport(g); diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs index c03ca0e..18e2bb8 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs @@ -9,68 +9,33 @@ namespace ElectricLocomotive { internal class DrawningLocomotive { - /// - /// Класс-сущность - /// public EntityLocomotive Locomotive { get; protected set; } - /// - /// Левая координата отрисовки автомобиля - /// protected float _startPosX; - /// - /// Верхняя кооридната отрисовки автомобиля - /// protected float _startPosY; - /// - /// Ширина окна отрисовки - /// + protected int? _pictureWidth = null; - /// - /// Высота окна отрисовки - /// protected int? _pictureHeight = null; - /// - /// Ширина отрисовки автомобиля - /// + protected readonly int _locomotiveWidth = 160; - /// - /// Высота отрисовки автомобиля - /// protected readonly int _locomotiveHeight = 90; - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес автомобиля - /// Цвет кузова public DrawningLocomotive(int speed, float weight, Color bodyColor) { Locomotive = new EntityLocomotive(speed, weight, bodyColor); } - /// - /// Установка позиции автомобиля - /// - /// Координата X - /// Координата Y - /// Ширина картинки - /// Высота картинки public void SetPosition(int x, int y, int width, int height) { - // TODO checks + if (width <= _locomotiveWidth + x || height <= _locomotiveHeight + y || x < 0 || y < 0) + { + _pictureWidth = null; + _pictureHeight = null; + return; + } - _startPosX = x; - _startPosY = y; + _startPosX = x + 20; + _startPosY = y + 30; _pictureWidth = width; _pictureHeight = height; - - if (_startPosX + _locomotiveWidth > _pictureWidth) { _startPosX = 20; } - if (_startPosY - _locomotiveHeight / 2 < 0) { _startPosY = _locomotiveHeight + 10; } - if (_startPosY + _locomotiveHeight > _pictureHeight) { _startPosY -= _locomotiveHeight; } } - /// - /// Изменение направления пермещения - /// - /// Направление public void MoveTransport(Direction direction) { if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) @@ -131,24 +96,42 @@ namespace ElectricLocomotive return; } Brush brBody = new SolidBrush(Locomotive?.BodyColor ?? Color.Black); + Brush blackturbo = new SolidBrush(Color.Black); Pen pen = new Pen(Color.Black); - //колёса - g.FillEllipse(brBody, _startPosX + 10, _startPosY + 50, 30, 30); - g.FillEllipse(brBody, _startPosX + 50, _startPosY + 50, 30, 30); - g.FillEllipse(brBody, _startPosX + 90, _startPosY + 50, 30, 30); - g.FillEllipse(brBody, _startPosX + 130, _startPosY + 50, 30, 30); + Pen window = new Pen(Color.Blue); - g.DrawEllipse(pen, _startPosX + 10, _startPosY + 50, 30, 30); - g.DrawEllipse(pen, _startPosX + 50, _startPosY + 50, 30, 30); - g.DrawEllipse(pen, _startPosX + 90, _startPosY + 50, 30, 30); - g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, 30, 30); + g.FillPolygon(brBody, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60) }); + g.FillRectangle(blackturbo, _startPosX + 5, _startPosY + 15, 5, 40); + + g.FillEllipse(brBody, _startPosX + 15, _startPosY + 60, 20, 20); + g.FillEllipse(brBody, _startPosX + 45, _startPosY + 60, 20, 20); + + + g.FillEllipse(brBody, _startPosX + 85, _startPosY + 60, 20, 20); + g.FillEllipse(brBody, _startPosX + 115, _startPosY + 60, 20, 20); + + // Окна + + g.DrawRectangle(window, _startPosX + 20, _startPosY + 20, 20, 25); + g.DrawRectangle(window, _startPosX + 50, _startPosY + 20, 20, 25); + + // Колёса + + g.DrawEllipse(pen, _startPosX + 15, _startPosY + 60, 20, 20); + g.DrawEllipse(pen, _startPosX + 45, _startPosY + 60, 20, 20); + + + g.DrawEllipse(pen, _startPosX + 85, _startPosY + 60, 20, 20); + g.DrawEllipse(pen, _startPosX + 115, _startPosY + 60, 20, 20); + + // Дверь + + g.DrawRectangle(pen, _startPosX + 85, _startPosY + 15, 20, 40); + + // Локомотив + + g.DrawPolygon(pen, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60) }); - g.FillRectangle(brBody, _startPosX + 10, _startPosY + 20, 150, 30); - g.FillRectangle(brBody, _startPosX + 10, _startPosY - 20, 40, 40); - g.FillRectangle(brBody, _startPosX + 100, _startPosY - 20, 10, 40); - g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 150, 30); - g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 40, 40); - g.DrawRectangle(pen, _startPosX + 100, _startPosY - 20, 10, 40); } /// /// Смена границ формы отрисовки diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs index 5239ec5..17b1063 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs @@ -35,6 +35,7 @@ namespace ElectricLocomotive void IDrawningObject.DrawningObject(Graphics g) { // TODO + _locomotive.DrawTransport(g); } } } diff --git a/ElectricLocomotive/ElectricLocomotive/FieldMap.cs b/ElectricLocomotive/ElectricLocomotive/FieldMap.cs new file mode 100644 index 0000000..adb5115 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/FieldMap.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class FieldMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.Brown); + /// + /// Цвет участка открытого + /// + private readonly Brush roadColor = new SolidBrush(Color.Green); + + protected override void DrawBarrierPart(Graphics g, int i, int j) + { + g.FillEllipse(barrierColor, i * (_size_x-1), j * (_size_y-1), 30, 15); + } + protected override void DrawRoadPart(Graphics g, int i, int j) + { + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_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 (_map[x, y] == _freeRoad) + { + _map[x, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs b/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs index 137b438..67b4f68 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormMap.Designer.cs @@ -164,7 +164,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(104, 23); diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.cs b/ElectricLocomotive/ElectricLocomotive/FormMap.cs index f68b1fb..11a83fb 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormMap.cs @@ -91,6 +91,13 @@ namespace ElectricLocomotive case "Простая карта": _abstractMap = new SimpleMap(); break; + + case "Поле с грязью": + _abstractMap = new FieldMap(); + break; + case "Кусты на карте": + _abstractMap = new BushesMap(); + break; } } diff --git a/ElectricLocomotive/ElectricLocomotive/Program.cs b/ElectricLocomotive/ElectricLocomotive/Program.cs index 57d3b26..2cc6ef2 100644 --- a/ElectricLocomotive/ElectricLocomotive/Program.cs +++ b/ElectricLocomotive/ElectricLocomotive/Program.cs @@ -11,7 +11,7 @@ namespace ElectricLocomotive // 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/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs index 97be58c..6bce679 100644 --- a/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs @@ -19,11 +19,11 @@ namespace ElectricLocomotive protected override void DrawBarrierPart(Graphics g, int i, int j) { - g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y)); } protected override void DrawRoadPart(Graphics g, int i, int j) { - g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); + g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y)); } protected override void GenerateMap() { -- 2.25.1 From 5b60ac283e24fb04dad9955a738f282d02955d39 Mon Sep 17 00:00:00 2001 From: Stranni15k Date: Sat, 19 Nov 2022 21:21:35 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectricLocomotive/BushesMap.cs | 7 +-- ...otive.cs => DrawningElectricLocomotive.cs} | 19 ++------ .../ElectricLocomotive/DrawningLocomotive.cs | 15 ------ .../DrawningObjectLocomotive.cs | 1 - .../EntityElectricLocomotive.cs | 24 ++++++++++ .../EntityHardLocomotive.cs | 46 ------------------- .../ElectricLocomotive/EntityLocomotive.cs | 19 -------- .../ElectricLocomotive/FieldMap.cs | 6 --- .../ElectricLocomotive/FormLocomotive.cs | 2 +- .../ElectricLocomotive/FormMap.cs | 2 +- .../ElectricLocomotive/IDrawningObject.cs | 23 ---------- .../ElectricLocomotive/SimpleMap.cs | 6 --- 12 files changed, 31 insertions(+), 139 deletions(-) rename ElectricLocomotive/ElectricLocomotive/{DrawningHardLocomotive.cs => DrawningElectricLocomotive.cs} (57%) create mode 100644 ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs delete mode 100644 ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs diff --git a/ElectricLocomotive/ElectricLocomotive/BushesMap.cs b/ElectricLocomotive/ElectricLocomotive/BushesMap.cs index 376a534..66179d0 100644 --- a/ElectricLocomotive/ElectricLocomotive/BushesMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/BushesMap.cs @@ -8,13 +8,8 @@ namespace ElectricLocomotive { internal class BushesMap : AbstractMap { - /// - /// Цвет участка закрытого - /// + private readonly Pen barrierColor = new Pen(Color.DarkGreen, 3); - /// - /// Цвет участка открытого - /// private readonly Brush roadColor = new SolidBrush(Color.Brown); protected override void DrawBarrierPart(Graphics g, int i, int j) diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs similarity index 57% rename from ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs rename to ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs index 0cf6419..f43a454 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningHardLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs @@ -6,31 +6,20 @@ using System.Threading.Tasks; namespace ElectricLocomotive { - internal class DrawningHardLocomotive : DrawningLocomotive + internal class DrawningElectricLocomotive : DrawningLocomotive { - /// - /// Инициализация свойств - /// - /// Скорость - /// Вес автомобиля - /// Цвет кузова - /// Дополнительный цвет - /// Признак наличия обвеса - /// Признак наличия антикрыла - /// Признак наличия гоночной полосы - public DrawningHardLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : + public DrawningElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : base(speed, weight, bodyColor, 110, 60) { - Locomotive = new EntityHardLocomotive(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); + Locomotive = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine); } public override void DrawTransport(Graphics g) { - if (Locomotive is not EntityHardLocomotive sportCar) + if (Locomotive is not EntityElectricLocomotive sportCar) { return; } - Pen pen = new(Color.Black); Pen window = new(Color.Blue); Brush dopBrush = new SolidBrush(sportCar.DopColor); diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs index 18e2bb8..48f0f2c 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs @@ -82,12 +82,6 @@ namespace ElectricLocomotive _locomotiveWidth = locomotiveWidth; _locomotiveHeight = locomotiveHeight; } - /// - - /// - /// Отрисовка автомобиля - /// - /// public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 @@ -133,11 +127,6 @@ namespace ElectricLocomotive g.DrawPolygon(pen, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 30), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60) }); } - /// - /// Смена границ формы отрисовки - /// - /// Ширина картинки - /// Высота картинки public void ChangeBorders(int width, int height) { _pictureWidth = width; @@ -157,10 +146,6 @@ namespace ElectricLocomotive _startPosY = _pictureHeight.Value - _locomotiveHeight; } } - /// - /// Получение текущей позиции объекта - /// - /// public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight); diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs index 17b1063..5bf23d0 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs @@ -34,7 +34,6 @@ namespace ElectricLocomotive void IDrawningObject.DrawningObject(Graphics g) { - // TODO _locomotive.DrawTransport(g); } } diff --git a/ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs new file mode 100644 index 0000000..1eb3518 --- /dev/null +++ b/ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectricLocomotive +{ + internal class EntityElectricLocomotive : EntityLocomotive + { + 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 EntityElectricLocomotive(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/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs deleted file mode 100644 index df7e554..0000000 --- a/ElectricLocomotive/ElectricLocomotive/EntityHardLocomotive.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ElectricLocomotive -{ - internal class EntityHardLocomotive : EntityLocomotive - { - /// - /// Дополнительный цвет - /// - 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 EntityHardLocomotive(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/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs index fa6e8ff..dca2328 100644 --- a/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs @@ -9,29 +9,10 @@ namespace ElectricLocomotive { internal class EntityLocomotive { - /// - /// Скорость - /// public int Speed { get; private set; } - /// - /// Вес - /// public float Weight { get; private set; } - /// - /// Цвет кузова - /// public Color BodyColor { get; private set; } - /// - /// Шаг перемещения автомобиля - /// public float Step => Speed * 100 / Weight; - /// - /// Инициализация полей объекта-класса автомобиля - /// - /// - /// - /// - /// public EntityLocomotive(int speed, float weight, Color bodyColor) { Random rnd = new Random(); diff --git a/ElectricLocomotive/ElectricLocomotive/FieldMap.cs b/ElectricLocomotive/ElectricLocomotive/FieldMap.cs index adb5115..06d2ad0 100644 --- a/ElectricLocomotive/ElectricLocomotive/FieldMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/FieldMap.cs @@ -8,13 +8,7 @@ namespace ElectricLocomotive { internal class FieldMap : AbstractMap { - /// - /// Цвет участка закрытого - /// private readonly Brush barrierColor = new SolidBrush(Color.Brown); - /// - /// Цвет участка открытого - /// private readonly Brush roadColor = new SolidBrush(Color.Green); protected override void DrawBarrierPart(Graphics g, int i, int j) diff --git a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs index fc487dc..f6c1309 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs @@ -87,7 +87,7 @@ namespace ElectricLocomotive private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - _locomotive = new DrawningHardLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + _locomotive = new DrawningElectricLocomotive(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))); diff --git a/ElectricLocomotive/ElectricLocomotive/FormMap.cs b/ElectricLocomotive/ElectricLocomotive/FormMap.cs index 11a83fb..546a435 100644 --- a/ElectricLocomotive/ElectricLocomotive/FormMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/FormMap.cs @@ -73,7 +73,7 @@ namespace ElectricLocomotive private void ButtonCreateModif_Click(object sender, EventArgs e) { Random rnd = new(); - var car = new DrawningHardLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), + var car = new DrawningElectricLocomotive(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))); diff --git a/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs b/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs index 2b16a23..651fedd 100644 --- a/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs +++ b/ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs @@ -8,33 +8,10 @@ namespace ElectricLocomotive { 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/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs index 6bce679..8fde87a 100644 --- a/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs +++ b/ElectricLocomotive/ElectricLocomotive/SimpleMap.cs @@ -8,13 +8,7 @@ namespace ElectricLocomotive { 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) -- 2.25.1