From b9ad742c3fa5e2f38d681a0b13decf66e41b6144 Mon Sep 17 00:00:00 2001 From: the Date: Tue, 27 Sep 2022 09:34:26 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ship/Ship/DrawingShip.cs | 5 ++--- Ship/Ship/EntityShip.cs | 2 +- Ship/Ship/FormShip.cs | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Ship/Ship/DrawingShip.cs b/Ship/Ship/DrawingShip.cs index 1f2755d..e2b98e5 100644 --- a/Ship/Ship/DrawingShip.cs +++ b/Ship/Ship/DrawingShip.cs @@ -42,10 +42,9 @@ namespace Ship /// Скорость /// Вес корабля /// Цвет корпуса - public void Init(int speed, float weight, Color bodyColor) + public DrawingShip(int speed, float weight, Color bodyColor) { - Ship = new EntityShip(); - Ship.Init(speed, weight, bodyColor); + Ship = new EntityShip(speed, weight, bodyColor); } /// /// Установка позиции корабля diff --git a/Ship/Ship/EntityShip.cs b/Ship/Ship/EntityShip.cs index c714ffb..b556451 100644 --- a/Ship/Ship/EntityShip.cs +++ b/Ship/Ship/EntityShip.cs @@ -31,7 +31,7 @@ namespace Ship /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityShip(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/Ship/Ship/FormShip.cs b/Ship/Ship/FormShip.cs index 8b0e33a..461105a 100644 --- a/Ship/Ship/FormShip.cs +++ b/Ship/Ship/FormShip.cs @@ -26,9 +26,7 @@ namespace Ship private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _ship = new DrawingShip(); - _ship.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _ship.SetPosition(rnd.Next(10, 100), pictureBoxShip.Height - rnd.Next(20, 100), pictureBoxShip.Width, pictureBoxShip.Height); toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; -- 2.25.1 From 6196569b709d217928f321f49b18ec6078c1450e Mon Sep 17 00:00:00 2001 From: the Date: Tue, 27 Sep 2022 10:59:08 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=80=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ship/Ship/DrawingMotorShip.cs | 45 ++++++++++++++++++++++++++++++++++ Ship/Ship/DrawingShip.cs | 22 ++++++++++++++--- Ship/Ship/EntityMotorShip.cs | 40 ++++++++++++++++++++++++++++++ Ship/Ship/FormShip.Designer.cs | 13 ++++++++++ Ship/Ship/FormShip.cs | 34 +++++++++++++++++++++---- 5 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 Ship/Ship/DrawingMotorShip.cs create mode 100644 Ship/Ship/EntityMotorShip.cs diff --git a/Ship/Ship/DrawingMotorShip.cs b/Ship/Ship/DrawingMotorShip.cs new file mode 100644 index 0000000..54a7326 --- /dev/null +++ b/Ship/Ship/DrawingMotorShip.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal class DrawingMotorShip : DrawingShip + { + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия труб + /// Признак наличия отсека для топлива + public DrawingMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelTank) : base(speed, weight, bodyColor, 110, 60) + { + Ship = new EntityMotorShip(speed, weight, bodyColor, dopColor, pipes, fuelTank); + } + public override void DrawTransport(Graphics g) + { + if (Ship is not EntityMotorShip motorShip) + { + return; + } + Pen pen = new(Color.Black); + Brush dopBrush = new SolidBrush(motorShip.DopColor); + + if (motorShip.Pipes) + { + g.FillRectangle(dopBrush, _startPosX, _startPosY, 10, 10); + } + + base.DrawTransport(g); + if (motorShip.Fueltank) + { + + } + } + } +} diff --git a/Ship/Ship/DrawingShip.cs b/Ship/Ship/DrawingShip.cs index e2b98e5..b1c2714 100644 --- a/Ship/Ship/DrawingShip.cs +++ b/Ship/Ship/DrawingShip.cs @@ -11,15 +11,15 @@ namespace Ship /// /// Класс-сущность /// - public EntityShip Ship { private set; get; } + public EntityShip Ship { protected set; get; } /// /// Левая координата отрисовки корабля /// - private float _startPosX; + protected float _startPosX; /// /// Верхняя кооридната отрисовки корабля /// - private float _startPosY; + protected float _startPosY; /// /// Ширина окна отрисовки /// @@ -46,6 +46,20 @@ namespace Ship { Ship = new EntityShip(speed, weight, bodyColor); } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес корабля + /// Цвет корпуса + /// Ширина отрисовки корабля + /// Высота отрисовки корабля + protected DrawingShip(int speed, float weight, Color bodyColor, int shipWidth, int shipHeight) : this(speed, weight, bodyColor) + { + _shipWidth = shipWidth; + _shipHeight = shipHeight; + } + /// /// Установка позиции корабля /// @@ -119,7 +133,7 @@ namespace Ship /// Отрисовка автомобиля /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) diff --git a/Ship/Ship/EntityMotorShip.cs b/Ship/Ship/EntityMotorShip.cs new file mode 100644 index 0000000..4754d52 --- /dev/null +++ b/Ship/Ship/EntityMotorShip.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal class EntityMotorShip : EntityShip + { + /// + /// Дополнительный цвет + /// + public Color DopColor { get; private set; } + /// + /// Признак наличия антикрыла + /// + public bool Pipes { get; private set; } + /// + /// Признак наличия гоночной полосы + /// + public bool Fueltank { get; private set; } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public EntityMotorShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelTank) : base(speed, weight, bodyColor) + { + DopColor = dopColor; + Pipes = pipes; + Fueltank = fuelTank; + } + + } +} diff --git a/Ship/Ship/FormShip.Designer.cs b/Ship/Ship/FormShip.Designer.cs index 3e0ed0d..3e16931 100644 --- a/Ship/Ship/FormShip.Designer.cs +++ b/Ship/Ship/FormShip.Designer.cs @@ -38,6 +38,7 @@ this.buttonLeft = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); this.statusStrip.SuspendLayout(); this.SuspendLayout(); @@ -141,11 +142,22 @@ this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 402); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(101, 23); + this.buttonCreateModif.TabIndex = 7; + this.buttonCreateModif.Text = "Модификация"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click); + // // FormShip // 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.buttonRight); this.Controls.Add(this.buttonDown); this.Controls.Add(this.buttonLeft); @@ -175,5 +187,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreateModif; } } \ No newline at end of file diff --git a/Ship/Ship/FormShip.cs b/Ship/Ship/FormShip.cs index 461105a..f846cc3 100644 --- a/Ship/Ship/FormShip.cs +++ b/Ship/Ship/FormShip.cs @@ -19,6 +19,15 @@ namespace Ship pictureBoxShip.Image = bmp; } /// + /// + /// + private void SetData() + { + toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; + toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}"; + toolStripStatusLabelColor.Text = $": {_ship.Ship.BodyColor.Name}"; + } + /// /// "" /// /// @@ -27,12 +36,10 @@ namespace Ship { Random rnd = new(); _ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _ship.SetPosition(rnd.Next(10, 100), pictureBoxShip.Height - rnd.Next(20, 100), + _ship.SetPosition(rnd.Next(10, 100), pictureBoxShip.Height - rnd.Next(50, 100), pictureBoxShip.Width, pictureBoxShip.Height); - toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; - toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}"; - toolStripStatusLabelColor.Text = $": { _ship.Ship.BodyColor.Name}"; - Draw(); + SetData(); + Draw(); } /// /// @@ -70,5 +77,22 @@ namespace Ship _ship?.ChangeBorders(pictureBoxShip.Width, pictureBoxShip.Height); Draw(); } + + /// + /// "" + /// + /// + /// + private void buttonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _ship = new DrawingMotorShip(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))); + _ship.SetPosition(rnd.Next(50, 100), pictureBoxShip.Height - rnd.Next(80, 100), pictureBoxShip.Width, pictureBoxShip.Height); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From 9be0242296ba2093651adc56a5761accb71bf0b3 Mon Sep 17 00:00:00 2001 From: the Date: Sun, 2 Oct 2022 16:45:18 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D1=8B,=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B,=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ship/Ship/AbstractMap.cs | 137 ++++++++++++++++++++++ Ship/Ship/Direction.cs | 1 + Ship/Ship/DrawingMotorShip.cs | 9 +- Ship/Ship/DrawingObject.cs | 40 +++++++ Ship/Ship/DrawingShip.cs | 5 + Ship/Ship/FormMap.Designer.cs | 209 ++++++++++++++++++++++++++++++++++ Ship/Ship/FormMap.cs | 108 ++++++++++++++++++ Ship/Ship/FormMap.resx | 63 ++++++++++ Ship/Ship/IDrawingObject.cs | 40 +++++++ Ship/Ship/Program.cs | 2 +- Ship/Ship/SimpleMap.cs | 53 +++++++++ Ship/Ship/WaterMap.cs | 51 +++++++++ 12 files changed, 714 insertions(+), 4 deletions(-) create mode 100644 Ship/Ship/AbstractMap.cs create mode 100644 Ship/Ship/DrawingObject.cs create mode 100644 Ship/Ship/FormMap.Designer.cs create mode 100644 Ship/Ship/FormMap.cs create mode 100644 Ship/Ship/FormMap.resx create mode 100644 Ship/Ship/IDrawingObject.cs create mode 100644 Ship/Ship/SimpleMap.cs create mode 100644 Ship/Ship/WaterMap.cs diff --git a/Ship/Ship/AbstractMap.cs b/Ship/Ship/AbstractMap.cs new file mode 100644 index 0000000..5de5a27 --- /dev/null +++ b/Ship/Ship/AbstractMap.cs @@ -0,0 +1,137 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal abstract class AbstractMap + { + private IDrawingObject _drawingObject = null; + protected int[,] _map = null; + protected int _width; + protected int _height; + protected float _size_x; + protected float _size_y; + protected readonly Random _random = new(); + protected readonly int _freeRoad = 0; + protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawingObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + _drawingObject.MoveObject(direction); + if (ObjectIntersects()) + { + switch (direction) + { + case Direction.Left: + _drawingObject.MoveObject(Direction.Right); + break; + case Direction.Right: + _drawingObject.MoveObject(Direction.Left); + break; + case Direction.Up: + _drawingObject.MoveObject(Direction.Down); + break; + case Direction.Down: + _drawingObject.MoveObject(Direction.Up); + break; + } + } + return DrawMapWithObject(); + } + private bool ObjectIntersects() + { + var location = _drawingObject.GetCurrentPosition(); + Debug.WriteLine(location.Left + " " + location.Right + " " + location.Top + " " + location.Bottom); + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier) + { + Debug.WriteLine("Barrier found " + i * _size_x + " " + (i + 1) * _size_x + " " + j * _size_y + " " + (j+1)*_size_y + " " + (i * _size_x >= location.Left) + " " + ((i + 1) * _size_x <= location.Right) + " " + (j * _size_y >= location.Top) + " " + ((j + 1) * _size_y <= location.Bottom)); + if (i * _size_x >= location.Left && (i + 1) * _size_x <= location.Right && j * _size_y >= location.Top && (j + 1) * _size_y <= location.Bottom) + { + Debug.WriteLine("True"); + return true; + } + } + } + } + + return false; + } + private bool SetObjectOnMap() + { + if (_drawingObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawingObject.SetObject(x, y, _width, _height); + + Rectangle rectObject = new Rectangle(x, y, 100, 100); + + for (int i = 0; i < _map.GetLength(0); i++) + { + for (int j = 0; j < _map.GetLength(1); j++) + { + if (_map[i, j] == _barrier) + { + Rectangle rectBarrier = new Rectangle((int)(i * _size_x), (int)(j * _size_y), (int)_size_x, (int)_size_y); + if (rectObject.IntersectsWith(rectBarrier)) + { + return false; + + } + } + + } + } + return true; + } + private Bitmap DrawMapWithObject() + { + Bitmap bmp = new(_width, _height); + if (_drawingObject == null || _map == null) + { + return bmp; + } + Graphics gr = Graphics.FromImage(bmp); + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + if (_map[i, j] == _freeRoad) + { + DrawRoadPart(gr, i, j); + } + else if (_map[i, j] == _barrier) + { + DrawBarrierPart(gr, i, j); + } + } + } + _drawingObject.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/Ship/Ship/Direction.cs b/Ship/Ship/Direction.cs index 09e2387..4b51bae 100644 --- a/Ship/Ship/Direction.cs +++ b/Ship/Ship/Direction.cs @@ -11,6 +11,7 @@ namespace Ship /// internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/Ship/Ship/DrawingMotorShip.cs b/Ship/Ship/DrawingMotorShip.cs index 54a7326..5d2f155 100644 --- a/Ship/Ship/DrawingMotorShip.cs +++ b/Ship/Ship/DrawingMotorShip.cs @@ -32,13 +32,16 @@ namespace Ship if (motorShip.Pipes) { - g.FillRectangle(dopBrush, _startPosX, _startPosY, 10, 10); + g.FillRectangle(dopBrush, _startPosX + 20, _startPosY + 20, 10, 30); + g.FillRectangle(dopBrush, _startPosX + 40, _startPosY + 10, 10, 40); + g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 20, 10, 30); } - + _startPosY += 40; base.DrawTransport(g); + _startPosY -= 40; if (motorShip.Fueltank) { - + g.FillEllipse(dopBrush, _startPosX + 40, _startPosY + 55, 20, 10); } } } diff --git a/Ship/Ship/DrawingObject.cs b/Ship/Ship/DrawingObject.cs new file mode 100644 index 0000000..f015314 --- /dev/null +++ b/Ship/Ship/DrawingObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal class DrawingObject : IDrawingObject + { + private DrawingShip _ship = null; + + public DrawingObject(DrawingShip ship) + { + _ship = ship; + } + + public float Step => _ship?.Ship?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _ship?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _ship?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _ship.SetPosition(x, y, width, height); + } + + void IDrawingObject.DrawningObject(Graphics g) + { + _ship.DrawTransport(g); + } + } +} diff --git a/Ship/Ship/DrawingShip.cs b/Ship/Ship/DrawingShip.cs index b1c2714..40ccd18 100644 --- a/Ship/Ship/DrawingShip.cs +++ b/Ship/Ship/DrawingShip.cs @@ -178,5 +178,10 @@ namespace Ship } } + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosX + _shipWidth, _startPosY, _startPosY + _shipHeight); + } + } } diff --git a/Ship/Ship/FormMap.Designer.cs b/Ship/Ship/FormMap.Designer.cs new file mode 100644 index 0000000..84023d1 --- /dev/null +++ b/Ship/Ship/FormMap.Designer.cs @@ -0,0 +1,209 @@ +namespace Ship +{ + 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.pictureBoxShip = 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.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxShip + // + this.pictureBoxShip.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxShip.Location = new System.Drawing.Point(0, 0); + this.pictureBoxShip.Name = "pictureBoxShip"; + this.pictureBoxShip.Size = new System.Drawing.Size(800, 428); + this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxShip.TabIndex = 0; + this.pictureBoxShip.TabStop = false; + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 428); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 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 = "Вес:"; + // + // toolStripStatusLabelColor + // + this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor"; + this.toolStripStatusLabelColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelColor.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, 402); + 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); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::Ship.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 359); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 3; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::Ship.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 395); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Ship.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 395); + 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); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Ship.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 395); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 6; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonCreateModif + // + this.buttonCreateModif.Location = new System.Drawing.Point(93, 402); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(101, 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(800, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.buttonCreateModif); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxShip); + this.Controls.Add(this.statusStrip); + this.Name = "FormMap"; + this.Text = "Карта"; + this.Load += new System.EventHandler(this.FormMap_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + + #endregion + + private PictureBox pictureBoxShip; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelColor; + private Button buttonCreate; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + private Button buttonRight; + private Button buttonCreateModif; + private ComboBox comboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/Ship/Ship/FormMap.cs b/Ship/Ship/FormMap.cs new file mode 100644 index 0000000..034dc49 --- /dev/null +++ b/Ship/Ship/FormMap.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Ship +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// Заполнение информации по объекту + /// + /// + private void SetData(DrawingShip ship) + { + toolStripStatusLabelSpeed.Text = $"Скорость: {ship.Ship.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {ship.Ship.Weight}"; + toolStripStatusLabelColor.Text = $"Цвет: {ship.Ship.BodyColor.Name}"; + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, new DrawingObject(ship)); + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var ship = new DrawingShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(ship); + } + /// + /// Изменение размеров формы + /// + /// + /// + 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; + } + pictureBoxShip.Image = _abstractMap?.MoveObject(dir); + } + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + var ship = new DrawingMotorShip(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(ship); + } + /// + /// Смена карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + _abstractMap = new SimpleMap(); + break; + case "Водяная карта": + _abstractMap = new WaterMap(); + break; + } + } + private void FormMap_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/Ship/Ship/FormMap.resx b/Ship/Ship/FormMap.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/Ship/Ship/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/Ship/Ship/IDrawingObject.cs b/Ship/Ship/IDrawingObject.cs new file mode 100644 index 0000000..72e3b98 --- /dev/null +++ b/Ship/Ship/IDrawingObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal interface IDrawingObject + { + /// + /// Шаг перемещения объекта + /// + 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/Ship/Ship/Program.cs b/Ship/Ship/Program.cs index 782d946..85afd21 100644 --- a/Ship/Ship/Program.cs +++ b/Ship/Ship/Program.cs @@ -11,7 +11,7 @@ namespace Ship // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormShip()); + Application.Run(new FormMap()); } } } \ No newline at end of file diff --git a/Ship/Ship/SimpleMap.cs b/Ship/Ship/SimpleMap.cs new file mode 100644 index 0000000..2ceee68 --- /dev/null +++ b/Ship/Ship/SimpleMap.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal class SimpleMap : AbstractMap + { + /// + /// Цвет участка закрытого + /// + private readonly Brush barrierColor = new SolidBrush(Color.White); + /// + /// Цвет участка открытого + /// + 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++; + } + } + } + } +} diff --git a/Ship/Ship/WaterMap.cs b/Ship/Ship/WaterMap.cs new file mode 100644 index 0000000..59f21f6 --- /dev/null +++ b/Ship/Ship/WaterMap.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ship +{ + internal class WaterMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Red); + private readonly Brush roadColor = new SolidBrush(Color.Blue); + 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[50, 50]; + _size_x = (float)_width / _map.GetLength(0); + _size_y = (float)_height / _map.GetLength(1); + int counter = 0; + for (int i = 0; i < _map.GetLength(0); ++i) + { + for (int j = 0; j < _map.GetLength(1); ++j) + { + _map[i, j] = _freeRoad; + } + } + while (counter < 10) + { + int x = _random.Next(2, 49); + int y = _random.Next(3, 50); + var points = new int[] { _map[x, y], _map[x, y + 1], _map[x - 1, y + 1], _map[x + 1, y + 1] }; + var forComparison = new int[] { _freeRoad, _freeRoad, _freeRoad, _freeRoad }; + if (points.SequenceEqual(forComparison)) + { + _map[x, y] = _barrier; + _map[x, y + 1] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x - 1, y + 1] = _barrier; + counter++; + } + } + } + } +} -- 2.25.1 From 3e84127331e5f8ce5cba6d2b8920c80b4cbf0848 Mon Sep 17 00:00:00 2001 From: the Date: Mon, 21 Nov 2022 16:48:41 +0400 Subject: [PATCH 4/5] Fix --- Ship/Ship/WaterMap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ship/Ship/WaterMap.cs b/Ship/Ship/WaterMap.cs index 59f21f6..c95a608 100644 --- a/Ship/Ship/WaterMap.cs +++ b/Ship/Ship/WaterMap.cs @@ -34,7 +34,7 @@ namespace Ship while (counter < 10) { int x = _random.Next(2, 49); - int y = _random.Next(3, 50); + int y = _random.Next(3, 49); var points = new int[] { _map[x, y], _map[x, y + 1], _map[x - 1, y + 1], _map[x + 1, y + 1] }; var forComparison = new int[] { _freeRoad, _freeRoad, _freeRoad, _freeRoad }; if (points.SequenceEqual(forComparison)) -- 2.25.1 From fd9a9ed114958f740ba1a5962cbfcce55a788e56 Mon Sep 17 00:00:00 2001 From: the Date: Mon, 21 Nov 2022 16:50:22 +0400 Subject: [PATCH 5/5] Fix2 --- Ship/Ship/AbstractMap.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Ship/Ship/AbstractMap.cs b/Ship/Ship/AbstractMap.cs index 5de5a27..233853a 100644 --- a/Ship/Ship/AbstractMap.cs +++ b/Ship/Ship/AbstractMap.cs @@ -56,17 +56,13 @@ namespace Ship private bool ObjectIntersects() { var location = _drawingObject.GetCurrentPosition(); - Debug.WriteLine(location.Left + " " + location.Right + " " + location.Top + " " + location.Bottom); for (int i = 0; i < _map.GetLength(0); i++) { for (int j = 0; j < _map.GetLength(1); j++) { if (_map[i, j] == _barrier) { - Debug.WriteLine("Barrier found " + i * _size_x + " " + (i + 1) * _size_x + " " + j * _size_y + " " + (j+1)*_size_y + " " + (i * _size_x >= location.Left) + " " + ((i + 1) * _size_x <= location.Right) + " " + (j * _size_y >= location.Top) + " " + ((j + 1) * _size_y <= location.Bottom)); - if (i * _size_x >= location.Left && (i + 1) * _size_x <= location.Right && j * _size_y >= location.Top && (j + 1) * _size_y <= location.Bottom) { - Debug.WriteLine("True"); return true; } } -- 2.25.1