From b699fe055309f7d236546ee714c1bbf18921fb16 Mon Sep 17 00:00:00 2001 From: just1valery Date: Tue, 27 Sep 2022 10:49:18 +0400 Subject: [PATCH 1/8] =?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 --- WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 5 ++--- WarmlyShip/WarmlyShip/EntityWarmlyShip.cs | 2 +- WarmlyShip/WarmlyShip/FormShip.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index 29e8eb8..b467f6d 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -36,10 +36,9 @@ /// Скорость /// Вес коробля /// Цвет основной части - public void Init(int speed, float weight, Color bodyColor) + public DrawningWarmlyShip(int speed, float weight, Color bodyColor) { - Ship = new EntityWarmlyShip(); - Ship.Init(speed, weight, bodyColor); + Ship = new EntityWarmlyShip(speed, weight, bodyColor); } /// /// Установка позиции коробля diff --git a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs index 236dd56..1e364f4 100644 --- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs @@ -31,7 +31,7 @@ namespace WarmlyShip /// /// /// - public void Init(int speed, float weight, Color bodyColor) + public EntityWarmlyShip(int speed, float weight, Color bodyColor) { Random rnd = new(); Speed = speed <= 0 ? rnd.Next(50, 150) : speed; diff --git a/WarmlyShip/WarmlyShip/FormShip.cs b/WarmlyShip/WarmlyShip/FormShip.cs index 14b3681..d4eb684 100644 --- a/WarmlyShip/WarmlyShip/FormShip.cs +++ b/WarmlyShip/WarmlyShip/FormShip.cs @@ -22,8 +22,7 @@ namespace WarmlyShip private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _ship = new DrawningWarmlyShip(); - _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 DrawningWarmlyShip(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), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}"; -- 2.25.1 From 0e40ea687bda3e3c8517d77006222f83fcc65a93 Mon Sep 17 00:00:00 2001 From: just1valery Date: Tue, 27 Sep 2022 12:53:25 +0400 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + WarmlyShip/WarmlyShip.sln | 2 +- WarmlyShip/WarmlyShip/DrawningShip.cs | 188 ++++++++++++++++++++ WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 186 ++++--------------- WarmlyShip/WarmlyShip/EntityShip.cs | 42 +++++ WarmlyShip/WarmlyShip/EntityWarmlyShip.cs | 40 ++--- WarmlyShip/WarmlyShip/FormShip.Designer.cs | 14 ++ WarmlyShip/WarmlyShip/FormShip.cs | 35 +++- 8 files changed, 332 insertions(+), 176 deletions(-) create mode 100644 WarmlyShip/WarmlyShip/DrawningShip.cs create mode 100644 WarmlyShip/WarmlyShip/EntityShip.cs diff --git a/.gitignore b/.gitignore index 8e7a151..f8819ce 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml +/WarmlyShip/WarmlyShip/Properties diff --git a/WarmlyShip/WarmlyShip.sln b/WarmlyShip/WarmlyShip.sln index 9a23b39..fdeb5b4 100644 --- a/WarmlyShip/WarmlyShip.sln +++ b/WarmlyShip/WarmlyShip.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32414.318 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WarmlyShip", "WarmlyShip\WarmlyShip.csproj", "{007C3F82-87B9-4701-BE6F-6598A4B1AE7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WarmlyShip", "WarmlyShip\WarmlyShip.csproj", "{007C3F82-87B9-4701-BE6F-6598A4B1AE7E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WarmlyShip/WarmlyShip/DrawningShip.cs b/WarmlyShip/WarmlyShip/DrawningShip.cs new file mode 100644 index 0000000..6fb6d1b --- /dev/null +++ b/WarmlyShip/WarmlyShip/DrawningShip.cs @@ -0,0 +1,188 @@ +namespace WarmlyShip +{ + internal class DrawningShip + { + /// + /// Класс-сущность + /// + public EntityShip Ship { get; protected set; } + /// + /// Левая координата отрисовки коробля + /// + protected float _startPosX; + /// + /// Верхняя кооридната отрисовки коробля + /// + protected float _startPosY; + /// + /// Ширина окна отрисовки + /// + private int? _pictureWidth = null; + /// + /// Высота окна отрисовки + /// + private int? _pictureHeight = null; + /// + /// Ширина отрисовки коробля + /// + private readonly int _shipWidth = 170; + /// + /// Высота отрисовки коробля + /// + private readonly int _shipHeight = 65; + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес корабля + /// Цвет корабля + public DrawningShip(int speed, float weight, Color bodyColor) + { + Ship = new EntityShip(speed, weight, bodyColor); + } + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес коробля + /// Цвет основной части + /// Ширина отрисовки корабля + /// Высота отрисовки корабля + + protected DrawningShip(int speed, float weight, Color bodyColor, int shipWidth, int shipHeight) : + this(speed, weight, bodyColor) + { + _shipWidth = shipWidth; + _shipHeight = shipHeight; + } + /// + /// Установка позиции коробля + /// + /// Координата X + /// Координата Y + /// Ширина картинки + /// Высота картинки + /// + + public void SetPosition(int x, int y, int width, int height) + { + if (x < 0 || y < 0 || width < x + _shipWidth || height < y + _shipHeight) + { + _pictureHeight = null; + _pictureWidth = null; + return; + } + _startPosX = x; + _startPosY = y; + _pictureWidth = width; + _pictureHeight = height; + } + /// + /// Изменение направления пермещения + /// + /// Направление + public void MoveTransport(Direction direction) + { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + switch (direction) + { + // вправо + case Direction.Right: + if (_startPosX + _shipWidth + Ship.Step < _pictureWidth) + { + _startPosX += Ship.Step; + } + break; + //влево + case Direction.Left: + + if (_startPosX - Ship.Step > 0) + { + _startPosX -= Ship.Step; + } + break; + //вверх + case Direction.Up: + + if (_startPosY - Ship.Step > 0) + { + _startPosY -= Ship.Step; + } + break; + //вниз + case Direction.Down: + if (_startPosY + _shipHeight + Ship.Step < _pictureHeight) + { + _startPosY += Ship.Step; + } + break; + } + } + /// + /// Отрисовка корабля + /// + /// + public virtual void DrawTransport(Graphics g) + { + if (_startPosX < 0 || _startPosY < 0 + || !_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + + //заполнение коробля + + PointF[] P = + { + new Point((int)(_startPosX),(int) _startPosY + 35), + new Point((int)_startPosX + 170, (int)_startPosY + 35), + new Point( (int) _startPosX + 150,(int) _startPosY + 65), + new Point((int) _startPosX + 50, (int) _startPosY + 65), + new Point((int) _startPosX, (int) _startPosY + 35), + + }; + Brush br = new SolidBrush(Ship?.BodyColor ?? Color.Black); + g.FillPolygon(br, P); + + Brush brBlue = new SolidBrush(Color.LightBlue); + g.FillRectangle(brBlue, _startPosX + 50, _startPosY + 1, 100, 34); + + Pen pen = new(Color.Black); + //границы коробля + g.DrawRectangle(pen, _startPosX + 50, _startPosY + 1, 100, 34); + g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 170, _startPosY + 35); + g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 50, _startPosY + 65); + g.DrawLine(pen, _startPosX + 50, _startPosY + 65, _startPosX + 150, _startPosY + 65); + g.DrawLine(pen, _startPosX + 150, _startPosY + 65, _startPosX + 170, _startPosY + 35); + } + + /// + /// Смена границ формы отрисовки + /// + /// Ширина картинки + /// Высота картинки + public void ChangeBorders(int width, int height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_pictureWidth <= _shipWidth || _pictureHeight <= _shipHeight) + { + _pictureWidth = null; + _pictureHeight = null; + return; + } + if (_startPosX + _shipWidth > _pictureWidth) + { + _startPosX = _pictureWidth.Value - _shipWidth; + } + if (_startPosY + _shipHeight > _pictureHeight) + { + _startPosY = _pictureHeight.Value - _shipHeight; + } + } + } +} diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index b467f6d..3a10285 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -1,170 +1,58 @@ -namespace WarmlyShip +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip { - internal class DrawningWarmlyShip + internal class DrawningWarmlyShip : DrawningShip { - /// - /// Класс-сущность - /// - public EntityWarmlyShip Ship { get; private set; } - /// - /// Левая координата отрисовки коробля - /// - private float _startPosX; - /// - /// Верхняя кооридната отрисовки коробля - /// - private float _startPosY; - /// - /// Ширина окна отрисовки - /// - private int? _pictureWidth = null; - /// - /// Высота окна отрисовки - /// - private int? _pictureHeight = null; - /// - /// Ширина отрисовки коробля - /// - private readonly int _shipWidth = 170; - /// - /// Высота отрисовки коробля - /// - private readonly int _shipHeight = 65; /// /// Инициализация свойств /// /// Скорость - /// Вес коробля - /// Цвет основной части - public DrawningWarmlyShip(int speed, float weight, Color bodyColor) + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия труб + /// Признак наличия топливного отсека + public DrawningWarmlyShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelCompartment) : + base(speed, weight, bodyColor, 175, 65) { - Ship = new EntityWarmlyShip(speed, weight, bodyColor); - } - /// - /// Установка позиции коробля - /// - /// Координата X - /// Координата Y - /// Ширина картинки - /// Высота картинки - public void SetPosition(int x, int y, int width, int height) - { - if (x < 0 || y < 0 || width < x + _shipWidth || height < y + _shipHeight) - { - _pictureHeight = null; - _pictureWidth = null; - return; - } - _startPosX = x; - _startPosY = y; - _pictureWidth = width; - _pictureHeight = height; + Ship = new EntityWarmlyShip(speed, weight, bodyColor, dopColor, pipes, fuelCompartment); } - /// - /// Изменение направления пермещения - /// - /// Направление - public void MoveTransport(Direction direction) + public override void DrawTransport(Graphics g) { - if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + if (Ship is not EntityWarmlyShip warmlyShip) { return; } - switch (direction) - { - // вправо - case Direction.Right: - if (_startPosX + _shipWidth + Ship.Step < _pictureWidth) - { - _startPosX += Ship.Step; - } - break; - //влево - case Direction.Left: - - if (_startPosX - Ship.Step > 0) - { - _startPosX -= Ship.Step; - } - break; - //вверх - case Direction.Up: - - if (_startPosY - Ship.Step > 0) - { - _startPosY -= Ship.Step; - } - break; - //вниз - case Direction.Down: - if (_startPosY + _shipHeight + Ship.Step < _pictureHeight) - { - _startPosY += Ship.Step; - } - break; - } - } - /// - /// Отрисовка корабля - /// - /// - public void DrawTransport(Graphics g) - { - if (_startPosX < 0 || _startPosY < 0 - || !_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - - - //заполнение коробля - - PointF[] P = - { - new Point((int)(_startPosX),(int) _startPosY + 35), - new Point((int)_startPosX + 170, (int)_startPosY + 35), - new Point( (int) _startPosX + 150,(int) _startPosY + 65), - new Point((int) _startPosX + 50, (int) _startPosY + 65), - new Point((int) _startPosX, (int) _startPosY + 35), - - }; - Brush br = new SolidBrush(Ship?.BodyColor ?? Color.Black); - g.FillPolygon(br, P); - - Brush brBlue = new SolidBrush(Color.LightBlue); - g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 1, 70, 34); Pen pen = new(Color.Black); - //границы коробля - g.DrawRectangle(pen, _startPosX + 70, _startPosY + 1 , 70, 34); - g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 170, _startPosY + 35); - g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 50, _startPosY + 65); - g.DrawLine(pen, _startPosX + 50, _startPosY + 65, _startPosX + 150, _startPosY + 65); - g.DrawLine(pen, _startPosX + 150, _startPosY + 65, _startPosX + 170, _startPosY + 35); - } + Brush dopBrush = new SolidBrush(warmlyShip.DopColor); - /// - /// Смена границ формы отрисовки - /// - /// Ширина картинки - /// Высота картинки - public void ChangeBorders(int width, int height) - { - _pictureWidth = width; - _pictureHeight = height; - if (_pictureWidth <= _shipWidth || _pictureHeight <= _shipHeight) + if (warmlyShip.Pipes) { - _pictureWidth = null; - _pictureHeight = null; - return; + g.FillRectangle(dopBrush, _startPosX + 60, _startPosY + 10, 20, 26); + g.DrawRectangle(pen, _startPosX + 60, _startPosY + 10, 20, 26); + g.FillRectangle(dopBrush, _startPosX + 90, _startPosY + 5, 20, 31); + g.DrawRectangle(pen, _startPosX + 90, _startPosY + 5, 20, 31); + g.FillRectangle(dopBrush, _startPosX + 120, _startPosY + 1, 20, 35); + g.DrawRectangle(pen, _startPosX + 120, _startPosY + 1, 20, 35); + } - if (_startPosX + _shipWidth > _pictureWidth) + + //_startPosX += 10; + _startPosY += 30; + base.DrawTransport(g); + //_startPosX -= 10; + _startPosY -= 30; + + if (warmlyShip.FuelCompartment) { - _startPosX = _pictureWidth.Value - _shipWidth; - } - if (_startPosY + _shipHeight > _pictureHeight) - { - _startPosY = _pictureHeight.Value - _shipHeight; + g.FillRectangle(dopBrush, _startPosX + 135, _startPosY + 70, 10, 5); + g.DrawRectangle(pen, _startPosX + 135, _startPosY + 70, 10, 5); } } } diff --git a/WarmlyShip/WarmlyShip/EntityShip.cs b/WarmlyShip/WarmlyShip/EntityShip.cs new file mode 100644 index 0000000..dbf97ae --- /dev/null +++ b/WarmlyShip/WarmlyShip/EntityShip.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + internal class EntityShip + { + /// + /// Скорость + /// + 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 EntityShip(int speed, float weight, Color bodyColor) + { + Random rnd = new(); + Speed = speed <= 0 ? rnd.Next(50, 150) : speed; + Weight = weight <= 0 ? rnd.Next(40, 70) : weight; + BodyColor = bodyColor; + } + } +} diff --git a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs index 1e364f4..70c42b4 100644 --- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs @@ -6,37 +6,35 @@ using System.Threading.Tasks; namespace WarmlyShip { - internal class EntityWarmlyShip + internal class EntityWarmlyShip : EntityShip { /// - /// Скорость + /// Дополнительный цвет /// - public int Speed { get; private set; } + public Color DopColor { get; private set; } /// - /// Вес + /// Признак наличия труб /// - public float Weight { get; private set; } + public bool Pipes { get; private set; } /// - /// Цвет кузова + /// Признак наличия топливного отсека /// - public Color BodyColor { get; private set; } + public bool FuelCompartment { get; private set; } /// - /// Шаг перемещения автомобиля + /// Инициализация свойств /// - public float Step => Speed * 100 / Weight; - /// - /// Инициализация полей объекта-класса автомобиля - /// - /// - /// - /// - /// - public EntityWarmlyShip(int speed, float weight, Color bodyColor) + /// Скорость + /// Вес автомобиля + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия труб + /// Признак наличия топливного отсека + public EntityWarmlyShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelCompartment) : + base(speed, weight, bodyColor) { - Random rnd = new(); - Speed = speed <= 0 ? rnd.Next(50, 150) : speed; - Weight = weight <= 0 ? rnd.Next(40, 70) : weight; - BodyColor = bodyColor; + DopColor = dopColor; + Pipes = pipes; + FuelCompartment = fuelCompartment; } } } diff --git a/WarmlyShip/WarmlyShip/FormShip.Designer.cs b/WarmlyShip/WarmlyShip/FormShip.Designer.cs index ec87a9a..ebe438e 100644 --- a/WarmlyShip/WarmlyShip/FormShip.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShip.Designer.cs @@ -38,6 +38,7 @@ this.buttonUp = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); + this.ButtonCreateModif = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -146,11 +147,23 @@ this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); // + // ButtonCreateModif + // + this.ButtonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.ButtonCreateModif.Location = new System.Drawing.Point(124, 369); + this.ButtonCreateModif.Name = "ButtonCreateModif"; + this.ButtonCreateModif.Size = new System.Drawing.Size(120, 29); + 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(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.ButtonCreateModif); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonUp); @@ -180,5 +193,6 @@ private Button buttonUp; private Button buttonRight; private Button buttonLeft; + private Button ButtonCreateModif; } } \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormShip.cs b/WarmlyShip/WarmlyShip/FormShip.cs index d4eb684..b2f2c52 100644 --- a/WarmlyShip/WarmlyShip/FormShip.cs +++ b/WarmlyShip/WarmlyShip/FormShip.cs @@ -2,11 +2,22 @@ namespace WarmlyShip { public partial class FormShip : Form { - private DrawningWarmlyShip _ship; + private DrawningShip _ship; public FormShip() { InitializeComponent(); } + /// + /// + /// + private void SetData() + { + Random rnd = new(); + _ship.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); + toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; + toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {_ship.Ship.BodyColor.Name}"; + } private void Draw() { Bitmap bmp = new(pictureBoxShip.Width, pictureBoxShip.Height); @@ -22,11 +33,9 @@ namespace WarmlyShip private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _ship = new DrawningShip(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), rnd.Next(10, 100), pictureBoxShip.Width, pictureBoxShip.Height); - toolStripStatusLabelSpeed.Text = $": {_ship.Ship.Speed}"; - toolStripStatusLabelWeight.Text = $": {_ship.Ship.Weight}"; - toolStripStatusLabelBodyColor.Text = $": {_ship.Ship.BodyColor.Name}"; + SetData(); Draw(); } @@ -51,5 +60,21 @@ namespace WarmlyShip } Draw(); } + + /// + /// "" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + _ship = new DrawningWarmlyShip(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(); + Draw(); + } } } \ No newline at end of file -- 2.25.1 From 066f232018875d6b70d40c749345db9678d91dd6 Mon Sep 17 00:00:00 2001 From: just1valery Date: Tue, 27 Sep 2022 13:19:40 +0400 Subject: [PATCH 3/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningShip.cs | 8 +++++ WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 4 +-- WarmlyShip/WarmlyShip/DrwaningObjectShip.cs | 40 +++++++++++++++++++++ WarmlyShip/WarmlyShip/IDrawningObject.cs | 40 +++++++++++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 WarmlyShip/WarmlyShip/DrwaningObjectShip.cs create mode 100644 WarmlyShip/WarmlyShip/IDrawningObject.cs diff --git a/WarmlyShip/WarmlyShip/DrawningShip.cs b/WarmlyShip/WarmlyShip/DrawningShip.cs index 6fb6d1b..851afa4 100644 --- a/WarmlyShip/WarmlyShip/DrawningShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningShip.cs @@ -184,5 +184,13 @@ _startPosY = _pictureHeight.Value - _shipHeight; } } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _carWidth, _startPosY + _carHeight); + } } } diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index 3a10285..873a682 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -18,7 +18,7 @@ namespace WarmlyShip /// Признак наличия труб /// Признак наличия топливного отсека public DrawningWarmlyShip(int speed, float weight, Color bodyColor, Color dopColor, bool pipes, bool fuelCompartment) : - base(speed, weight, bodyColor, 175, 65) + base(speed, weight, bodyColor, 170, 95) { Ship = new EntityWarmlyShip(speed, weight, bodyColor, dopColor, pipes, fuelCompartment); } @@ -43,10 +43,8 @@ namespace WarmlyShip } - //_startPosX += 10; _startPosY += 30; base.DrawTransport(g); - //_startPosX -= 10; _startPosY -= 30; if (warmlyShip.FuelCompartment) diff --git a/WarmlyShip/WarmlyShip/DrwaningObjectShip.cs b/WarmlyShip/WarmlyShip/DrwaningObjectShip.cs new file mode 100644 index 0000000..d27cfd9 --- /dev/null +++ b/WarmlyShip/WarmlyShip/DrwaningObjectShip.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + internal class DrwaningObjectShip : IDrawningObject + { + private DrawningShip _ship = null; + + public DrwaningObjectShip(DrawningShip 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 IDrawningObject.DrawningObject(Graphics g) + { + _ship.DrawTransport(g); + } + } +} diff --git a/WarmlyShip/WarmlyShip/IDrawningObject.cs b/WarmlyShip/WarmlyShip/IDrawningObject.cs new file mode 100644 index 0000000..86c4476 --- /dev/null +++ b/WarmlyShip/WarmlyShip/IDrawningObject.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + 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(); + } +} -- 2.25.1 From 53c32e224fe38f72e85278d37b92ba7b4f8673ea Mon Sep 17 00:00:00 2001 From: just1valery Date: Wed, 28 Sep 2022 09:59:02 +0400 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/AbstractMap.cs | 144 ++++++++++++ WarmlyShip/WarmlyShip/Direction.cs | 1 + ...ingObjectShip.cs => DrawningObjectShip.cs} | 4 +- WarmlyShip/WarmlyShip/DrawningShip.cs | 2 +- WarmlyShip/WarmlyShip/FormMap.Designer.cs | 211 ++++++++++++++++++ WarmlyShip/WarmlyShip/FormMap.cs | 89 ++++++++ WarmlyShip/WarmlyShip/FormMap.resx | 63 ++++++ WarmlyShip/WarmlyShip/Program.cs | 2 +- WarmlyShip/WarmlyShip/SimpleMap.cs | 53 +++++ WarmlyShip/WarmlyShip/WarmlyShip.csproj | 3 + 10 files changed, 568 insertions(+), 4 deletions(-) create mode 100644 WarmlyShip/WarmlyShip/AbstractMap.cs rename WarmlyShip/WarmlyShip/{DrwaningObjectShip.cs => DrawningObjectShip.cs} (88%) create mode 100644 WarmlyShip/WarmlyShip/FormMap.Designer.cs create mode 100644 WarmlyShip/WarmlyShip/FormMap.cs create mode 100644 WarmlyShip/WarmlyShip/FormMap.resx create mode 100644 WarmlyShip/WarmlyShip/SimpleMap.cs diff --git a/WarmlyShip/WarmlyShip/AbstractMap.cs b/WarmlyShip/WarmlyShip/AbstractMap.cs new file mode 100644 index 0000000..cb8f4d9 --- /dev/null +++ b/WarmlyShip/WarmlyShip/AbstractMap.cs @@ -0,0 +1,144 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + 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 bool CheckAround(float Left, float Right, float Top, float Bottom) + { + int startX = (int)(Left / _size_x); + int startY = (int)(Right / _size_y); + int endX = (int)(Top / _size_x); + int endY = (int)(Bottom / _size_y); + + for (int i = startX; i <= endX; i++) + { + for (int j = startY; j <= endY; j++) + { + if (_map[i, j] == _barrier) + { + return true; + } + } + } + return false; + } + public Bitmap MoveObject(Direction direction) + { + _drawningObject.MoveObject(direction); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + + if (CheckAround(Left, Right, Top, Bottom)) + { + _drawningObject.MoveObject(MoveObjectBack(direction)); + } + return DrawMapWithObject(); + } + private Direction MoveObjectBack(Direction direction) + { + switch (direction) + { + case Direction.Up: + return Direction.Down; + case Direction.Down: + return Direction.Up; + case Direction.Left: + return Direction.Right; + case Direction.Right: + return Direction.Left; + } + return Direction.None; + } + private bool SetObjectOnMap() + { + 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); + (float Left, float Right, float Top, float Bottom) = _drawningObject.GetCurrentPosition(); + if (!CheckAround(Left, Right, Top, Bottom)) return true; + float startX = Left; + float startY = Right; + float lengthX = Top - Left; + float lengthY = Bottom - Right; + while (CheckAround(startX, startY, startX + lengthX, startY + lengthY)) + { + bool result; + do + { + result = CheckAround(startX, startY, startX + lengthX, startY + lengthY); + if (!result) + { + _drawningObject.SetObject((int)startX, (int)startY, _width, _height); + return true; + } + else + { + startX += _size_x; + } + } while (result); + startX = x; + startY += _size_y; + } + return false; + } + 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/WarmlyShip/WarmlyShip/Direction.cs b/WarmlyShip/WarmlyShip/Direction.cs index ed3b850..12e38df 100644 --- a/WarmlyShip/WarmlyShip/Direction.cs +++ b/WarmlyShip/WarmlyShip/Direction.cs @@ -8,6 +8,7 @@ namespace WarmlyShip { internal enum Direction { + None = 0, Up = 1, Down = 2, Left = 3, diff --git a/WarmlyShip/WarmlyShip/DrwaningObjectShip.cs b/WarmlyShip/WarmlyShip/DrawningObjectShip.cs similarity index 88% rename from WarmlyShip/WarmlyShip/DrwaningObjectShip.cs rename to WarmlyShip/WarmlyShip/DrawningObjectShip.cs index d27cfd9..22cba01 100644 --- a/WarmlyShip/WarmlyShip/DrwaningObjectShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningObjectShip.cs @@ -6,11 +6,11 @@ using System.Threading.Tasks; namespace WarmlyShip { - internal class DrwaningObjectShip : IDrawningObject + internal class DrawningObjectShip : IDrawningObject { private DrawningShip _ship = null; - public DrwaningObjectShip(DrawningShip ship) + public DrawningObjectShip(DrawningShip ship) { _ship = ship; } diff --git a/WarmlyShip/WarmlyShip/DrawningShip.cs b/WarmlyShip/WarmlyShip/DrawningShip.cs index 851afa4..3def286 100644 --- a/WarmlyShip/WarmlyShip/DrawningShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningShip.cs @@ -190,7 +190,7 @@ /// public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { - return (_startPosX, _startPosY, _startPosX + _carWidth, _startPosY + _carHeight); + return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight); } } } diff --git a/WarmlyShip/WarmlyShip/FormMap.Designer.cs b/WarmlyShip/WarmlyShip/FormMap.Designer.cs new file mode 100644 index 0000000..85950b1 --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormMap.Designer.cs @@ -0,0 +1,211 @@ +namespace WarmlyShip +{ + 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.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.ButtonCreateModif = new System.Windows.Forms.Button(); + this.ComboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).BeginInit(); + this.statusStrip1.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, 424); + this.pictureBoxShip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxShip.TabIndex = 0; + this.pictureBoxShip.TabStop = false; + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 424); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 26); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20); + this.toolStripStatusLabelSpeed.Text = "Скорость: "; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(12, 367); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(701, 367); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 3; + this.buttonDown.Text = " "; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(701, 331); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 4; + this.buttonUp.Text = " "; + 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.BackgroundImage = global::WarmlyShip.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(737, 367); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 5; + this.buttonRight.Text = " "; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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::WarmlyShip.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(665, 368); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 6; + this.buttonLeft.Text = " "; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // ButtonCreateModif + // + this.ButtonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.ButtonCreateModif.Location = new System.Drawing.Point(126, 367); + this.ButtonCreateModif.Name = "ButtonCreateModif"; + this.ButtonCreateModif.Size = new System.Drawing.Size(120, 29); + this.ButtonCreateModif.TabIndex = 7; + this.ButtonCreateModif.Text = "Модификация"; + this.ButtonCreateModif.UseVisualStyleBackColor = true; + this.ButtonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // ComboBoxSelectorMap + // + 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(182, 28); + this.ComboBoxSelectorMap.TabIndex = 8; + // + // FormMap + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + 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.buttonLeft); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxShip); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "Карта"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxShip; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonDown; + private Button buttonUp; + private Button buttonRight; + private Button buttonLeft; + private Button ButtonCreateModif; + private ComboBox ComboBoxSelectorMap; + } +} \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormMap.cs b/WarmlyShip/WarmlyShip/FormMap.cs new file mode 100644 index 0000000..887873f --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormMap.cs @@ -0,0 +1,89 @@ +namespace WarmlyShip +{ + public partial class FormMap : Form + { + private AbstractMap _abstractMap; + + public FormMap() + { + InitializeComponent(); + _abstractMap = new SimpleMap(); + } + /// + /// + /// + /// + private void SetData(DrawningShip ship) + { + toolStripStatusLabelSpeed.Text = $": {ship.Ship.Speed}"; + toolStripStatusLabelWeight.Text = $": {ship.Ship.Weight}"; + toolStripStatusLabelBodyColor.Text = $": {ship.Ship.BodyColor.Name}"; + pictureBoxShip.Image = _abstractMap.CreateMap(pictureBoxShip.Width, pictureBoxShip.Height, + new DrawningObjectShip(ship)); + } + + /// + /// "" + /// + /// + /// + private void buttonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + var ship = new DrawningShip(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 DrawningWarmlyShip(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; + } + } + } +} \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormMap.resx b/WarmlyShip/WarmlyShip/FormMap.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/WarmlyShip/WarmlyShip/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/WarmlyShip/WarmlyShip/Program.cs b/WarmlyShip/WarmlyShip/Program.cs index 876d476..9bf5de7 100644 --- a/WarmlyShip/WarmlyShip/Program.cs +++ b/WarmlyShip/WarmlyShip/Program.cs @@ -11,7 +11,7 @@ namespace WarmlyShip // 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/WarmlyShip/WarmlyShip/SimpleMap.cs b/WarmlyShip/WarmlyShip/SimpleMap.cs new file mode 100644 index 0000000..8c58c62 --- /dev/null +++ b/WarmlyShip/WarmlyShip/SimpleMap.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + 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++; + } + } + } + } +} diff --git a/WarmlyShip/WarmlyShip/WarmlyShip.csproj b/WarmlyShip/WarmlyShip/WarmlyShip.csproj index 13ee123..85ce183 100644 --- a/WarmlyShip/WarmlyShip/WarmlyShip.csproj +++ b/WarmlyShip/WarmlyShip/WarmlyShip.csproj @@ -9,6 +9,9 @@ + + Form + True True -- 2.25.1 From f0dd67650aff32a4710608aa3ad47f93967daef5 Mon Sep 17 00:00:00 2001 From: just1valery Date: Wed, 28 Sep 2022 16:56:47 +0400 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=B0=20"=D0=9E=D0=BA=D0=B5=D0=B0=D0=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/AbstractMap.cs | 1 + WarmlyShip/WarmlyShip/FormMap.Designer.cs | 4 +- WarmlyShip/WarmlyShip/FormMap.cs | 8 +++- WarmlyShip/WarmlyShip/OceanMap.cs | 54 +++++++++++++++++++++++ WarmlyShip/WarmlyShip/SimpleMap.cs | 2 +- 5 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 WarmlyShip/WarmlyShip/OceanMap.cs diff --git a/WarmlyShip/WarmlyShip/AbstractMap.cs b/WarmlyShip/WarmlyShip/AbstractMap.cs index cb8f4d9..c0e4cd5 100644 --- a/WarmlyShip/WarmlyShip/AbstractMap.cs +++ b/WarmlyShip/WarmlyShip/AbstractMap.cs @@ -59,6 +59,7 @@ namespace WarmlyShip _drawningObject.MoveObject(MoveObjectBack(direction)); } return DrawMapWithObject(); + } private Direction MoveObjectBack(Direction direction) { diff --git a/WarmlyShip/WarmlyShip/FormMap.Designer.cs b/WarmlyShip/WarmlyShip/FormMap.Designer.cs index 85950b1..7c1068f 100644 --- a/WarmlyShip/WarmlyShip/FormMap.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormMap.Designer.cs @@ -163,11 +163,13 @@ // 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(182, 28); this.ComboBoxSelectorMap.TabIndex = 8; + this.ComboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // FormMap // diff --git a/WarmlyShip/WarmlyShip/FormMap.cs b/WarmlyShip/WarmlyShip/FormMap.cs index 887873f..766ee90 100644 --- a/WarmlyShip/WarmlyShip/FormMap.cs +++ b/WarmlyShip/WarmlyShip/FormMap.cs @@ -81,8 +81,12 @@ namespace WarmlyShip switch (ComboBoxSelectorMap.Text) { case " ": - _abstractMap = new SimpleMap(); - break; + _abstractMap = new SimpleMap(); + break; + + case "": + _abstractMap = new OceanMap(); + break; } } } diff --git a/WarmlyShip/WarmlyShip/OceanMap.cs b/WarmlyShip/WarmlyShip/OceanMap.cs new file mode 100644 index 0000000..a1e73c6 --- /dev/null +++ b/WarmlyShip/WarmlyShip/OceanMap.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + internal class OceanMap : AbstractMap + { + private readonly Brush barrierColor = new SolidBrush(Color.Gray); + + private readonly Brush roadColor = new SolidBrush(Color.DeepSkyBlue); + + 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 + 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 < 15) + { + int x = _random.Next(0, 95); + int y = _random.Next(0, 95); + if (_map[x, y] == _freeRoad) + { + _map[x, y + 1] = _barrier; + _map[x, y + 2] = _barrier; + _map[x + 1, y + 1] = _barrier; + _map[x + 2, y + 1] = _barrier; + _map[x + 1, y] = _barrier; + _map[x + 2, y] = _barrier; + counter++; + } + } + } + } +} diff --git a/WarmlyShip/WarmlyShip/SimpleMap.cs b/WarmlyShip/WarmlyShip/SimpleMap.cs index 8c58c62..eb35ab5 100644 --- a/WarmlyShip/WarmlyShip/SimpleMap.cs +++ b/WarmlyShip/WarmlyShip/SimpleMap.cs @@ -38,7 +38,7 @@ namespace WarmlyShip _map[i, j] = _freeRoad; } } - while (counter < 50) + while (counter < 25) { int x = _random.Next(0, 100); int y = _random.Next(0, 100); -- 2.25.1 From 6d052f4d6043657e342d7e3c7c8538c1260d24af Mon Sep 17 00:00:00 2001 From: just1valery Date: Thu, 29 Sep 2022 11:40:27 +0400 Subject: [PATCH 6/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningShip.cs | 5 ++--- WarmlyShip/WarmlyShip/EntityShip.cs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawningShip.cs b/WarmlyShip/WarmlyShip/DrawningShip.cs index 3def286..f36a979 100644 --- a/WarmlyShip/WarmlyShip/DrawningShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningShip.cs @@ -134,8 +134,7 @@ } - //заполнение коробля - + ///заполнение коробля PointF[] P = { new Point((int)(_startPosX),(int) _startPosY + 35), @@ -152,7 +151,7 @@ g.FillRectangle(brBlue, _startPosX + 50, _startPosY + 1, 100, 34); Pen pen = new(Color.Black); - //границы коробля + ///границы коробля g.DrawRectangle(pen, _startPosX + 50, _startPosY + 1, 100, 34); g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 170, _startPosY + 35); g.DrawLine(pen, _startPosX, _startPosY + 35, _startPosX + 50, _startPosY + 65); diff --git a/WarmlyShip/WarmlyShip/EntityShip.cs b/WarmlyShip/WarmlyShip/EntityShip.cs index dbf97ae..b9ef514 100644 --- a/WarmlyShip/WarmlyShip/EntityShip.cs +++ b/WarmlyShip/WarmlyShip/EntityShip.cs @@ -17,15 +17,15 @@ namespace WarmlyShip /// public float Weight { get; private set; } /// - /// Цвет кузова + /// Цвет коробля /// public Color BodyColor { get; private set; } /// - /// Шаг перемещения автомобиля + /// Шаг перемещения коробля /// public float Step => Speed * 100 / Weight; /// - /// Инициализация полей объекта-класса автомобиля + /// Инициализация полей объекта-класса коробля /// /// /// -- 2.25.1 From 52ee044526a9752d3a86f0d11324e1cf0ccb8e8e Mon Sep 17 00:00:00 2001 From: just1valery Date: Fri, 30 Sep 2022 12:07:02 +0400 Subject: [PATCH 7/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 4 ++-- WarmlyShip/WarmlyShip/EntityWarmlyShip.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index 873a682..f8990f6 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -12,8 +12,8 @@ namespace WarmlyShip /// Инициализация свойств /// /// Скорость - /// Вес автомобиля - /// Цвет кузова + /// Вес коробля + /// Цвет коробля /// Дополнительный цвет /// Признак наличия труб /// Признак наличия топливного отсека diff --git a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs index 70c42b4..cd02f98 100644 --- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs @@ -24,8 +24,8 @@ namespace WarmlyShip /// Инициализация свойств /// /// Скорость - /// Вес автомобиля - /// Цвет кузова + /// Вес коробля + /// Цвет коробля /// Дополнительный цвет /// Признак наличия труб /// Признак наличия топливного отсека -- 2.25.1 From f520db8e2f0da15331142050dd529e95c58893f9 Mon Sep 17 00:00:00 2001 From: just1valery Date: Fri, 30 Sep 2022 12:17:36 +0400 Subject: [PATCH 8/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/FormMap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarmlyShip/WarmlyShip/FormMap.cs b/WarmlyShip/WarmlyShip/FormMap.cs index 766ee90..a6213d6 100644 --- a/WarmlyShip/WarmlyShip/FormMap.cs +++ b/WarmlyShip/WarmlyShip/FormMap.cs @@ -12,7 +12,7 @@ namespace WarmlyShip /// /// /// - /// + /// private void SetData(DrawningShip ship) { toolStripStatusLabelSpeed.Text = $": {ship.Ship.Speed}"; -- 2.25.1