diff --git a/Sailboat/Sailboat/Direction.cs b/Sailboat/Sailboat/Direction.cs new file mode 100644 index 0000000..7db0804 --- /dev/null +++ b/Sailboat/Sailboat/Direction.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Sailboat +{ + public enum DirectionType + { + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 + } +} \ No newline at end of file diff --git a/Sailboat/Sailboat/DrawningSailboat.cs b/Sailboat/Sailboat/DrawningSailboat.cs new file mode 100644 index 0000000..01b6837 --- /dev/null +++ b/Sailboat/Sailboat/DrawningSailboat.cs @@ -0,0 +1,208 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Sailboat +{ + /// + /// Класс, отвечающий за прорисовку и перемещение объекта-сущности + /// + public class DrawingSailboat + { + /// + /// Класс-сущность + /// + public EntitySailboat? EntitySailboat { get; private set; } + + /// + /// Ширина окна + /// + private int _pictureWidth; + + /// + /// Высота окна + /// + private int _pictureHeight; + + /// + /// Левая координата прорисовки лодки + /// + private int _startPosX; + + /// + /// Верхняя координата прорисовки лодки + /// + private int _startPosY; + + /// + /// Ширина прорисовки лодки + /// + private readonly int _boatWidth = 185; + + /// + /// Высота прорисовки лодки + /// + private readonly int _boatHeight = 160; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Цвет кузова + /// Дополнительный цвет + /// Признак наличия усиленного корпуса парусника + /// Признак наличия основного корпуса парусника + /// Признак наличия паруса + /// Ширина картинки + /// Высота картинки + /// true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах + public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool hullCooler, bool hull, bool sail, int width, int height) + { + // Проверки + if (width < _boatWidth || height < _boatHeight) + { + return false; + } + _pictureWidth = width; + _pictureHeight = height; + EntitySailboat = new EntitySailboat(); + EntitySailboat.Init(speed, weight, bodyColor, additionalColor, hull, sail); + return true; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + // Изменение x, y + if (x < 0 || x + _boatWidth > _pictureWidth) + { + x = 0; + } + if (y < 0 || y + _boatHeight > _pictureHeight) + { + y = 0; + } + _startPosX = x; + _startPosY = y; + } + + /// + /// Изменение направления перемещения + /// + /// Направление + public void MoveTransport(DirectionType direction) + { + if (EntitySailboat == null) + { + return; + } + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX - EntitySailboat.Step > 0) + { + _startPosX -= (int)EntitySailboat.Step; + } + break; + //вверх + case DirectionType.Up: + if (_startPosY - EntitySailboat.Step > 0) + { + _startPosY -= (int)EntitySailboat.Step; + } + break; + //вправо + case DirectionType.Right: + if (_startPosX + EntitySailboat.Step + _boatWidth < _pictureWidth) + { + _startPosX += (int)EntitySailboat.Step; + } + break; + //вниз + case DirectionType.Down: + if (_startPosY + EntitySailboat.Step + _boatHeight < _pictureHeight) + { + _startPosY += (int)EntitySailboat.Step; + } + break; + } + } + + /// + /// Прорисовка объекта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntitySailboat == null) + { + return; + } + Pen pen = new(Color.Black, 4); + Brush additionalBrush = new + SolidBrush(EntitySailboat.AdditionalColor); + + // Усиленный корпус парусника + if (EntitySailboat.Hull) + { + Point[] hullCooler = new Point[] + { + new Point(_startPosX, _startPosY + 80), + new Point(_startPosX + 125, _startPosY + 80), + new Point(_startPosX + 190, _startPosY + 120), + new Point(_startPosX + 125, _startPosY + 160), + new Point(_startPosX, _startPosY + 160) + }; + g.FillPolygon(additionalBrush, hullCooler); + g.DrawPolygon(pen, hullCooler); + } + + + // Основной корпус парусника + Brush Brush = new + SolidBrush(EntitySailboat.BodyColor); + + Point[] hull = new Point[] + { + new Point(_startPosX + 5, _startPosY + 90), + new Point(_startPosX + 120, _startPosY + 90), + new Point(_startPosX + 180, _startPosY + 120), + new Point(_startPosX + 120, _startPosY + 150), + new Point(_startPosX + 5, _startPosY + 150) + }; + g.FillPolygon(Brush, hull); + g.DrawPolygon(pen, hull); + + Brush addBrush = new + SolidBrush(Color.Green); + + g.FillEllipse(addBrush, _startPosX + 20, _startPosY + 100, 100, 40); + g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 100, 40); + + // Парус + if (EntitySailboat.Sail) + { + Brush sailBrush = new + SolidBrush(EntitySailboat.AdditionalColor); + + Point[] sail = new Point[] + { + new Point(_startPosX + 65, _startPosY), + new Point(_startPosX + 150, _startPosY + 120), + new Point(_startPosX + 15, _startPosY + 120) + }; + g.FillPolygon(sailBrush, sail); + g.DrawPolygon(pen, sail); + g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 120), new Point(_startPosX + 65, _startPosY)); + } + } + } +} \ No newline at end of file diff --git a/Sailboat/Sailboat/EntitySailboat.cs b/Sailboat/Sailboat/EntitySailboat.cs new file mode 100644 index 0000000..b9e4614 --- /dev/null +++ b/Sailboat/Sailboat/EntitySailboat.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Sailboat +{ + public class EntitySailboat + { + /// + /// Скорость + /// + public int Speed { get; private set; } + /// + /// Вес + /// + public double Weight { get; private set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак (опция) наличия усиленного корпуса + /// + public bool Hull { get; private set; } + /// + /// Признак (опция) наличия паруса + /// + public bool Sail { get; private set; } + /// + /// Шаг перемещения лодки + /// + public double Step => (double)Speed * 100 / Weight; + /// + /// Инициализация полей объекта-класса парусной лодки + /// + /// Скорость + /// Вес лодки + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия усиленного корпуса + /// Признак наличия паруса + public void Init(int speed, double weight, Color bodyColor, Color + additionalColor, bool hull, bool sail) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + Hull = hull; + Sail = sail; + } + } +} \ No newline at end of file diff --git a/Sailboat/Sailboat/Form1.Designer.cs b/Sailboat/Sailboat/Form1.Designer.cs deleted file mode 100644 index dede0e6..0000000 --- a/Sailboat/Sailboat/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace Sailboat -{ - partial class Form1 - { - /// - /// 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.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} \ No newline at end of file diff --git a/Sailboat/Sailboat/Form1.cs b/Sailboat/Sailboat/Form1.cs deleted file mode 100644 index 224bdaa..0000000 --- a/Sailboat/Sailboat/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Sailboat -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Sailboat/Sailboat/FormSailboat.Designer.cs b/Sailboat/Sailboat/FormSailboat.Designer.cs new file mode 100644 index 0000000..53dab1c --- /dev/null +++ b/Sailboat/Sailboat/FormSailboat.Designer.cs @@ -0,0 +1,137 @@ +namespace Sailboat +{ + partial class FormSailboat + { + /// + /// 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() + { + pictureBoxSailboat = new PictureBox(); + buttonUp = new Button(); + buttonRight = new Button(); + buttonDown = new Button(); + buttonLeft = new Button(); + buttonCreate = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxSailboat).BeginInit(); + SuspendLayout(); + // + // pictureBoxSailboat + // + pictureBoxSailboat.Dock = DockStyle.Fill; + pictureBoxSailboat.Location = new Point(0, 0); + pictureBoxSailboat.Name = "pictureBoxSailboat"; + pictureBoxSailboat.Size = new Size(882, 453); + pictureBoxSailboat.SizeMode = PictureBoxSizeMode.AutoSize; + pictureBoxSailboat.TabIndex = 0; + pictureBoxSailboat.TabStop = false; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.up; + buttonUp.BackgroundImageLayout = ImageLayout.Zoom; + buttonUp.Location = new Point(804, 340); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(30, 30); + buttonUp.TabIndex = 1; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += buttonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.right; + buttonRight.BackgroundImageLayout = ImageLayout.Zoom; + buttonRight.Location = new Point(840, 376); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(30, 30); + buttonRight.TabIndex = 2; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += buttonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.down; + buttonDown.BackgroundImageLayout = ImageLayout.Zoom; + buttonDown.Location = new Point(804, 411); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(30, 30); + buttonDown.TabIndex = 3; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += buttonMove_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.left; + buttonLeft.BackgroundImageLayout = ImageLayout.Zoom; + buttonLeft.Location = new Point(768, 376); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(30, 30); + buttonLeft.TabIndex = 4; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += buttonMove_Click; + // + // buttonCreate + // + buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreate.Location = new Point(12, 412); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(94, 29); + buttonCreate.TabIndex = 5; + buttonCreate.Text = "Создать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += buttonCreate_Click; + // + // FormSailboat + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(882, 453); + Controls.Add(buttonCreate); + Controls.Add(buttonLeft); + Controls.Add(buttonDown); + Controls.Add(buttonRight); + Controls.Add(buttonUp); + Controls.Add(pictureBoxSailboat); + Name = "FormSailboat"; + StartPosition = FormStartPosition.CenterScreen; + Text = "FormSailboat"; + ((System.ComponentModel.ISupportInitialize)pictureBoxSailboat).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private PictureBox pictureBoxSailboat; + private Button buttonUp; + private Button buttonRight; + private Button buttonDown; + private Button buttonLeft; + private Button buttonCreate; + } +} \ No newline at end of file diff --git a/Sailboat/Sailboat/FormSailboat.cs b/Sailboat/Sailboat/FormSailboat.cs new file mode 100644 index 0000000..d74960e --- /dev/null +++ b/Sailboat/Sailboat/FormSailboat.cs @@ -0,0 +1,76 @@ +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 Sailboat +{ + public partial class FormSailboat : Form + { + private DrawingSailboat? _drawingSailboat; + private EntitySailboat? _entitySailboat; + + public FormSailboat() + { + InitializeComponent(); + } + + private void Draw() + { + if (_drawingSailboat == null) + { + return; + } + Bitmap bmp = new(pictureBoxSailboat.Width, + pictureBoxSailboat.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawingSailboat.DrawTransport(gr); + pictureBoxSailboat.Image = bmp; + } + + private void buttonCreate_Click(object sender, EventArgs e) + { + Random random = new(); + _drawingSailboat = new DrawingSailboat(); + + _drawingSailboat.Init(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), + pictureBoxSailboat.Width, pictureBoxSailboat.Height); + + _drawingSailboat.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + + private void buttonMove_Click(object sender, EventArgs e) + { + if (_drawingSailboat == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + switch (name) + { + case "buttonUp": + _drawingSailboat.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + _drawingSailboat.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + _drawingSailboat.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + _drawingSailboat.MoveTransport(DirectionType.Right); + break; + } + Draw(); + } + } +} diff --git a/Sailboat/Sailboat/Form1.resx b/Sailboat/Sailboat/FormSailboat.resx similarity index 93% rename from Sailboat/Sailboat/Form1.resx rename to Sailboat/Sailboat/FormSailboat.resx index 1af7de1..af32865 100644 --- a/Sailboat/Sailboat/Form1.resx +++ b/Sailboat/Sailboat/FormSailboat.resx @@ -1,17 +1,17 @@  - diff --git a/Sailboat/Sailboat/Program.cs b/Sailboat/Sailboat/Program.cs index 62a824b..89c8af2 100644 --- a/Sailboat/Sailboat/Program.cs +++ b/Sailboat/Sailboat/Program.cs @@ -11,7 +11,7 @@ namespace Sailboat // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormSailboat()); } } } \ No newline at end of file diff --git a/Sailboat/Sailboat/Properties/Resources.Designer.cs b/Sailboat/Sailboat/Properties/Resources.Designer.cs new file mode 100644 index 0000000..46d95a3 --- /dev/null +++ b/Sailboat/Sailboat/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace Sailboat.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Sailboat.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap down { + get { + object obj = ResourceManager.GetObject("down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap left { + get { + object obj = ResourceManager.GetObject("left", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap right { + get { + object obj = ResourceManager.GetObject("right", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap up { + get { + object obj = ResourceManager.GetObject("up", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/Sailboat/Sailboat/Properties/Resources.resx b/Sailboat/Sailboat/Properties/Resources.resx new file mode 100644 index 0000000..53ec0b4 --- /dev/null +++ b/Sailboat/Sailboat/Properties/Resources.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/Sailboat/Sailboat/Resources/down.png b/Sailboat/Sailboat/Resources/down.png new file mode 100644 index 0000000..be2dccf Binary files /dev/null and b/Sailboat/Sailboat/Resources/down.png differ diff --git a/Sailboat/Sailboat/Resources/left.png b/Sailboat/Sailboat/Resources/left.png new file mode 100644 index 0000000..d876859 Binary files /dev/null and b/Sailboat/Sailboat/Resources/left.png differ diff --git a/Sailboat/Sailboat/Resources/right.png b/Sailboat/Sailboat/Resources/right.png new file mode 100644 index 0000000..364bc6b Binary files /dev/null and b/Sailboat/Sailboat/Resources/right.png differ diff --git a/Sailboat/Sailboat/Resources/up.png b/Sailboat/Sailboat/Resources/up.png new file mode 100644 index 0000000..467bbec Binary files /dev/null and b/Sailboat/Sailboat/Resources/up.png differ diff --git a/Sailboat/Sailboat/Sailboat.csproj b/Sailboat/Sailboat/Sailboat.csproj index b57c89e..13ee123 100644 --- a/Sailboat/Sailboat/Sailboat.csproj +++ b/Sailboat/Sailboat/Sailboat.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file