diff --git a/Catamaran/Catamaran.sln b/Catamaran/Catamaran.sln new file mode 100644 index 0000000..74dbb35 --- /dev/null +++ b/Catamaran/Catamaran.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35707.178 d17.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catamaran", "Catamaran\Catamaran.csproj", "{AAADE88B-D219-4F07-9803-00BFB94AD2E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AAADE88B-D219-4F07-9803-00BFB94AD2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAADE88B-D219-4F07-9803-00BFB94AD2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAADE88B-D219-4F07-9803-00BFB94AD2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAADE88B-D219-4F07-9803-00BFB94AD2E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Catamaran/Catamaran/Catamaran.csproj b/Catamaran/Catamaran/Catamaran.csproj new file mode 100644 index 0000000..c27cd77 --- /dev/null +++ b/Catamaran/Catamaran/Catamaran.csproj @@ -0,0 +1,11 @@ + + + + WinExe + net9.0-windows + enable + true + enable + + + \ No newline at end of file diff --git a/Catamaran/Catamaran/Form1.Designer.cs b/Catamaran/Catamaran/Form1.Designer.cs new file mode 100644 index 0000000..e581cd3 --- /dev/null +++ b/Catamaran/Catamaran/Form1.Designer.cs @@ -0,0 +1,39 @@ +namespace Catamaran +{ + 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 + } +} diff --git a/Catamaran/Catamaran/Form1.cs b/Catamaran/Catamaran/Form1.cs new file mode 100644 index 0000000..1f858fc --- /dev/null +++ b/Catamaran/Catamaran/Form1.cs @@ -0,0 +1,10 @@ +namespace Catamaran +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} diff --git a/Catamaran/WinFormsApp1/FormBuldozer.resx b/Catamaran/Catamaran/Form1.resx similarity index 92% rename from Catamaran/WinFormsApp1/FormBuldozer.resx rename to Catamaran/Catamaran/Form1.resx index 8b2ff64..1af7de1 100644 --- a/Catamaran/WinFormsApp1/FormBuldozer.resx +++ b/Catamaran/Catamaran/Form1.resx @@ -1,17 +1,17 @@  - diff --git a/Catamaran/WinFormsApp1/Program.cs b/Catamaran/Catamaran/Program.cs similarity index 84% rename from Catamaran/WinFormsApp1/Program.cs rename to Catamaran/Catamaran/Program.cs index 564c1f6..9bf4205 100644 --- a/Catamaran/WinFormsApp1/Program.cs +++ b/Catamaran/Catamaran/Program.cs @@ -1,4 +1,4 @@ -namespace ProjectBuldozer +namespace Catamaran { internal static class Program { @@ -11,7 +11,7 @@ namespace ProjectBuldozer // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormBuldozer()); + Application.Run(new Form1()); } } } \ No newline at end of file diff --git a/Catamaran/WinFormsApp1.sln b/Catamaran/WinFormsApp1.sln deleted file mode 100644 index d253b9b..0000000 --- a/Catamaran/WinFormsApp1.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.11.35327.3 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectBuldozer", "WinFormsApp1\ProjectBuldozer.csproj", "{6CD05694-88B2-4377-9373-CE8E7C862BF7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6CD05694-88B2-4377-9373-CE8E7C862BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CD05694-88B2-4377-9373-CE8E7C862BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CD05694-88B2-4377-9373-CE8E7C862BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CD05694-88B2-4377-9373-CE8E7C862BF7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A3E6D2B4-4566-4250-8BDC-3B994D5E7C9A} - EndGlobalSection -EndGlobal diff --git a/Catamaran/WinFormsApp1/DirectionType.cs b/Catamaran/WinFormsApp1/DirectionType.cs deleted file mode 100644 index e38d141..0000000 --- a/Catamaran/WinFormsApp1/DirectionType.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace ProjectBuldozer; - -/// -/// Направление перемещения -/// -public enum DirectionType -{ - /// - /// Вверх - /// - Up = 1, - - /// - /// Вниз - /// - Down = 2, - - /// - /// Влево - /// - Left = 3, - - /// - /// Вправо - /// - Right = 4 -} \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/DrawingBuldozer.cs b/Catamaran/WinFormsApp1/DrawingBuldozer.cs deleted file mode 100644 index fb27545..0000000 --- a/Catamaran/WinFormsApp1/DrawingBuldozer.cs +++ /dev/null @@ -1,255 +0,0 @@ -using ProjectBuldozer; - -namespace ProjectBuldozer; - -/// -/// Класс, отвечающий за прорисовку объекта-сущности -/// -public class DrawingBuldozer -{ - /// - /// Класс-сущность - /// - public EntityBuldozer? EntityBuldozer { get; private set; } - - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки бульдозера - /// - private int? _startPosX; - - /// - /// Правая координата прорисовки больдозера - /// - private int? _startPosY; - - /// - /// Ширина прорисовки бульдозера - /// - private readonly int _drawningBuldozerWidth = 138; - - /// - /// Высота прорисовки бульдозера - /// - private readonly int _drawingBuldozerHeight = 99; - - /// - /// Инициализация свойств - /// - /// - /// - /// - /// - /// - /// - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool otval, bool rihlitel, bool v) - { - EntityBuldozer = new EntityBuldozer(); - EntityBuldozer.Init(speed, weight, bodyColor, additionalColor, otval, rihlitel); - _pictureWidth = null; - _pictureWidth = null; - _startPosX = null; - _startPosY = null; - } - - /// - /// Установка границ поля - /// - /// - /// - /// - public bool SetPictureSize(int width, int height) - { - if (_pictureWidth > width || _pictureHeight > height) - { - return false; - } - _pictureWidth = width; - _pictureHeight = height; - if (_startPosX.HasValue || _startPosY.HasValue) - { - if (_startPosX + _drawningBuldozerWidth > _pictureWidth) - { - _startPosX = _pictureWidth.Value - _drawningBuldozerWidth; - } - else if (_startPosX < 0) _startPosX = 0; - if (_startPosY + _drawingBuldozerHeight > _pictureHeight) - { - _startPosY = _pictureHeight.Value - _drawingBuldozerHeight; - } - else if (_startPosY < 0) _startPosY = 0; - } - return true; - } - - /// - /// Установка позиции - /// - /// - /// - public void SetPosition(int x, int y) - { - if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) - { - return; - } - if (x >= 0 && x + _drawningBuldozerWidth <= _pictureWidth && y >= 0 && y + _drawingBuldozerHeight <= _pictureHeight) - { - _startPosX = x; - _startPosY = y; - } - if (x < 0) - { - _startPosX = 0; - } - if (y < 0) - { - _startPosY = 0; - } - if (x + _drawningBuldozerWidth > _pictureWidth) - { - _startPosX = _drawningBuldozerWidth - _pictureWidth; - } - if (y + _drawingBuldozerHeight > _pictureHeight) - { - _startPosY = _drawingBuldozerHeight - _pictureHeight; - } - } - - /// - /// Изменение направления перемещения - /// - /// - /// - public bool MoveTransport(DirectionType direction) - { - if (EntityBuldozer == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return false; - } - - switch (direction) - { - case DirectionType.Left: - if (_startPosX.Value - EntityBuldozer.Step > 0) - { - _startPosX -= (int)EntityBuldozer.Step; - } - return true; - case DirectionType.Up: - if (_startPosY.Value - EntityBuldozer.Step > 0) - { - _startPosY -= (int)EntityBuldozer.Step; - } - return true; - case DirectionType.Right: - if (_startPosX.Value + EntityBuldozer.Step + _drawningBuldozerWidth < _pictureWidth) - { - _startPosX += (int)EntityBuldozer.Step; - } - return true; - case DirectionType.Down: - if (_startPosY.Value + EntityBuldozer.Step + _drawingBuldozerHeight < _pictureHeight) - { - _startPosY += (int)EntityBuldozer.Step; - } - return true; - default: - return false; - } - } - - /// - /// Прорисовка объекта - /// - /// - public void DrawTransport(Graphics g) - { - if (EntityBuldozer == null || !_startPosX.HasValue || !_startPosY.HasValue) - { - return; - } - - Pen pen = new(Color.Black); - Brush br = new SolidBrush(EntityBuldozer.BodyColor); - Brush additionalBrush = new SolidBrush(EntityBuldozer.AdditionalColor); - - //кабина - Brush brBlue = new SolidBrush(Color.LightBlue); - g.FillRectangle(brBlue, _startPosX.Value + 80, _startPosY.Value + 10, 20, 31); - g.DrawRectangle(pen, _startPosX.Value + 80, _startPosY.Value + 10, 20, 31); - - //основное тело - g.FillRectangle(br, _startPosX.Value + 30, _startPosY.Value + 40, 80, 30); - g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 40, 80, 30); - - //труба - g.FillRectangle(br, _startPosX.Value + 40, _startPosY.Value + 25, 10, 15); - g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 25, 10, 15); - - //гусеница - Brush brWhite = new SolidBrush(Color.White); - Pen Pen = new(Color.Black, 3); - g.DrawRectangle(Pen, _startPosX.Value + 30, _startPosY.Value + 70, 79, 19); - g.FillEllipse(brWhite, _startPosX.Value + 30, _startPosY.Value + 70, 80, 20); - - g.DrawEllipse(Pen, _startPosX.Value + 30, _startPosY.Value + 70, 20, 20); - g.FillEllipse(brWhite, _startPosX.Value + 30, _startPosY.Value + 70, 20, 20); - - g.DrawEllipse(Pen, _startPosX.Value + 90, _startPosY.Value + 70, 20, 20); - g.FillEllipse(brWhite, _startPosX.Value + 90, _startPosY.Value + 70, 20, 20); - - g.DrawEllipse(Pen, _startPosX.Value + 54, _startPosY.Value + 80, 9, 9); - g.FillEllipse(brWhite, _startPosX.Value + 54, _startPosY.Value + 80, 9, 9); - - g.DrawEllipse(Pen, _startPosX.Value + 66, _startPosY.Value + 80, 9, 9); - g.FillEllipse(brWhite, _startPosX.Value + 66, _startPosY.Value + 80, 9, 9); - - g.DrawEllipse(Pen, _startPosX.Value + 78, _startPosY.Value + 80, 9, 9); - g.FillEllipse(brWhite, _startPosX.Value + 78, _startPosY.Value + 80, 9, 9); - - g.DrawEllipse(Pen, _startPosX.Value + 62, _startPosY.Value + 70, 6, 6); - g.FillEllipse(brWhite, _startPosX.Value + 62, _startPosY.Value + 70, 6, 6); - - g.DrawEllipse(Pen, _startPosX.Value + 72, _startPosY.Value + 70, 6, 6); - g.FillEllipse(brWhite, _startPosX.Value + 72, _startPosY.Value + 70, 6, 6); - - //отвал - if (EntityBuldozer.Otval) - { - g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 60, 10, 10); - g.DrawRectangle(pen, _startPosX.Value + 15, _startPosY.Value + 40, 5, 60); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 95, 17, 5); - g.FillRectangle(additionalBrush, _startPosX.Value + 20, _startPosY.Value + 60, 10, 10); - g.FillRectangle(additionalBrush, _startPosX.Value + 15, _startPosY.Value + 40, 5, 60); - g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 95, 17, 5); - } - - //рыхлитель - if (EntityBuldozer.Rihlitel) - { - g.DrawRectangle(pen, _startPosX.Value + 130, _startPosY.Value + 40, 10, 40); - g.DrawRectangle(pen, _startPosX.Value + 110, _startPosY.Value + 50, 30, 10); - g.FillRectangle(additionalBrush, _startPosX.Value + 130, _startPosY.Value + 40, 10, 40); - g.FillRectangle(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 50, 30, 10); - - PointF rA = new PointF(_startPosX.Value + 130, _startPosY.Value + 80); - PointF rB = new PointF(_startPosX.Value + 140, _startPosY.Value + 80); - PointF rC = new PointF(_startPosX.Value + 130, _startPosY.Value + 100); - - PointF[] Trigle = { rA, rB, rC }; - g.DrawPolygon(pen, Trigle); - g.FillPolygon(additionalBrush, Trigle); - } - } -} \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/EntityBuldozer.cs b/Catamaran/WinFormsApp1/EntityBuldozer.cs deleted file mode 100644 index 891b635..0000000 --- a/Catamaran/WinFormsApp1/EntityBuldozer.cs +++ /dev/null @@ -1,60 +0,0 @@ -/// -/// Класс-сущность "Спортивный автомобиль" -/// -public class EntityBuldozer -{ - /// - /// Скорость - /// - 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 Otval { get; private set; } - - /// - /// Признак (опция) наличия рыхлителя - /// - public bool Rihlitel { get; private set; } - - /// - /// Шаг перемещения автомобиля - /// - public double Step => Speed * 100 / Weight; - - /// - /// Инициализация полей объекта-класса спортивного автомобиля - /// - /// - /// - /// - /// - /// - /// - public void Init(int speed, double weight, Color bodyColor, Color - additionalColor, bool otval, bool rihlitel) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - AdditionalColor = additionalColor; - Otval = otval; - Rihlitel = rihlitel; - } -} diff --git a/Catamaran/WinFormsApp1/FormBuldozer.Designer.cs b/Catamaran/WinFormsApp1/FormBuldozer.Designer.cs deleted file mode 100644 index 2907b7b..0000000 --- a/Catamaran/WinFormsApp1/FormBuldozer.Designer.cs +++ /dev/null @@ -1,146 +0,0 @@ -using static System.Net.Mime.MediaTypeNames; -using System.Windows.Forms; -using System.Xml.Linq; - -namespace ProjectBuldozer -{ - partial class FormBuldozer - { - /// - /// 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() - { - pictureBoxBuldozer = new PictureBox(); - buttonCreateBuldozer = new Button(); - buttonLeft = new Button(); - buttonUp = new Button(); - buttonDown = new Button(); - buttonRight = new Button(); - ((System.ComponentModel.ISupportInitialize)pictureBoxBuldozer).BeginInit(); - SuspendLayout(); - // - // pictureBoxBuldozer - // - pictureBoxBuldozer.Dock = DockStyle.Fill; - pictureBoxBuldozer.Location = new Point(0, 0); - pictureBoxBuldozer.Margin = new Padding(3, 4, 3, 4); - pictureBoxBuldozer.Name = "pictureBoxBuldozer"; - pictureBoxBuldozer.Size = new Size(1055, 796); - pictureBoxBuldozer.TabIndex = 0; - pictureBoxBuldozer.TabStop = false; - // - // buttonCreateBuldozer - // - buttonCreateBuldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateBuldozer.Location = new Point(14, 749); - buttonCreateBuldozer.Margin = new Padding(3, 4, 3, 4); - buttonCreateBuldozer.Name = "buttonCreateBuldozer"; - buttonCreateBuldozer.Size = new Size(86, 31); - buttonCreateBuldozer.TabIndex = 1; - buttonCreateBuldozer.Text = "Создать"; - buttonCreateBuldozer.UseVisualStyleBackColor = true; - buttonCreateBuldozer.Click += ButtonCreateBuldozer_Click; - // - // buttonLeft - // - buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; - buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; - buttonLeft.Location = new Point(899, 733); - buttonLeft.Margin = new Padding(3, 4, 3, 4); - buttonLeft.Name = "buttonLeft"; - buttonLeft.Size = new Size(40, 47); - buttonLeft.TabIndex = 2; - buttonLeft.UseVisualStyleBackColor = true; - buttonLeft.Click += ButtonMove_Click; - // - // buttonUp - // - buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonUp.BackgroundImage = Properties.Resources.arrowUp; - buttonUp.BackgroundImageLayout = ImageLayout.Stretch; - buttonUp.Location = new Point(946, 679); - buttonUp.Margin = new Padding(3, 4, 3, 4); - buttonUp.Name = "buttonUp"; - buttonUp.Size = new Size(40, 47); - buttonUp.TabIndex = 3; - buttonUp.UseVisualStyleBackColor = true; - buttonUp.Click += ButtonMove_Click; - // - // buttonDown - // - buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonDown.BackgroundImage = Properties.Resources.arrowDown; - buttonDown.BackgroundImageLayout = ImageLayout.Stretch; - buttonDown.Location = new Point(946, 733); - buttonDown.Margin = new Padding(3, 4, 3, 4); - buttonDown.Name = "buttonDown"; - buttonDown.Size = new Size(40, 47); - buttonDown.TabIndex = 4; - buttonDown.UseVisualStyleBackColor = true; - buttonDown.Click += ButtonMove_Click; - // - // buttonRight - // - buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - buttonRight.BackgroundImage = Properties.Resources.arrowRight; - buttonRight.BackgroundImageLayout = ImageLayout.Stretch; - buttonRight.Location = new Point(993, 733); - buttonRight.Margin = new Padding(3, 4, 3, 4); - buttonRight.Name = "buttonRight"; - buttonRight.Size = new Size(40, 47); - buttonRight.TabIndex = 5; - buttonRight.UseVisualStyleBackColor = true; - buttonRight.Click += ButtonMove_Click; - // - // FormBuldozer - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1055, 796); - Controls.Add(buttonRight); - Controls.Add(buttonDown); - Controls.Add(buttonUp); - Controls.Add(buttonLeft); - Controls.Add(buttonCreateBuldozer); - Controls.Add(pictureBoxBuldozer); - Margin = new Padding(3, 4, 3, 4); - Name = "FormBuldozer"; - Text = "Бульдозер"; - Load += FormBuldozer_Load_1; - ((System.ComponentModel.ISupportInitialize)pictureBoxBuldozer).EndInit(); - ResumeLayout(false); - } - - #endregion - - private PictureBox pictureBoxBuldozer; - private Button buttonCreateBuldozer; - private Button buttonLeft; - private Button buttonUp; - private Button buttonDown; - private Button buttonRight; - } -} \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/FormBuldozer.cs b/Catamaran/WinFormsApp1/FormBuldozer.cs deleted file mode 100644 index c8f65cf..0000000 --- a/Catamaran/WinFormsApp1/FormBuldozer.cs +++ /dev/null @@ -1,100 +0,0 @@ -namespace ProjectBuldozer; - -/// -/// Форма работы с объектом "Спортивный автомобиль" -/// -public partial class FormBuldozer : Form -{ - /// - /// Поле-объект для прорисовки объекта - /// - private DrawingBuldozer? _drawningBuldozer; - - /// - /// Конструктор формы - /// - public FormBuldozer() - { - InitializeComponent(); - } - - /// - /// Метод прорисовки машины - /// - private void Draw() - { - if (_drawningBuldozer == null) - { - return; - } - - Bitmap bmp = new(pictureBoxBuldozer.Width, pictureBoxBuldozer.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawningBuldozer.DrawTransport(gr); - pictureBoxBuldozer.Image = bmp; - } - - /// - /// Обработка нажатия кнопки "Создать" - /// - /// - /// - private void ButtonCreateBuldozer_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningBuldozer = new DrawingBuldozer(); - _drawningBuldozer.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))); - _drawningBuldozer.SetPictureSize(pictureBoxBuldozer.Width, pictureBoxBuldozer.Height); - _drawningBuldozer.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); - } - - /// - /// Перемещение объекта по форме (нажатие кнопок навигации) - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) - { - if (_drawningBuldozer == null) - { - return; - } - - string name = ((Button)sender)?.Name ?? string.Empty; - bool result = false; - switch (name) - { - case "buttonUp": - result = _drawningBuldozer.MoveTransport(DirectionType.Up); - break; - case "buttonDown": - result = _drawningBuldozer.MoveTransport(DirectionType.Down); - break; - case "buttonLeft": - result = _drawningBuldozer.MoveTransport(DirectionType.Left); - break; - case "buttonRight": - result = _drawningBuldozer.MoveTransport(DirectionType.Right); - break; - } - - if (result) - { - Draw(); - } - } - - private void FormBuldozer_Load(object sender, EventArgs e) - { - - } - - private void FormBuldozer_Load_1(object sender, EventArgs e) - { - - } -} \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/ProjectBuldozer.csproj b/Catamaran/WinFormsApp1/ProjectBuldozer.csproj deleted file mode 100644 index 244387d..0000000 --- a/Catamaran/WinFormsApp1/ProjectBuldozer.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - WinExe - net7.0-windows - enable - true - enable - - - - - True - True - Resources.resx - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/Properties/Resources.Designer.cs b/Catamaran/WinFormsApp1/Properties/Resources.Designer.cs deleted file mode 100644 index 88fd059..0000000 --- a/Catamaran/WinFormsApp1/Properties/Resources.Designer.cs +++ /dev/null @@ -1,103 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 -// -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. -// -//------------------------------------------------------------------------------ - -namespace ProjectBuldozer.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("ProjectBuldozer.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 arrowDown { - get { - object obj = ResourceManager.GetObject("arrowDown", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrowLeft { - get { - object obj = ResourceManager.GetObject("arrowLeft", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrowRight { - get { - object obj = ResourceManager.GetObject("arrowRight", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrowUp { - get { - object obj = ResourceManager.GetObject("arrowUp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/Catamaran/WinFormsApp1/Properties/Resources.resx b/Catamaran/WinFormsApp1/Properties/Resources.resx deleted file mode 100644 index 0d80ec6..0000000 --- a/Catamaran/WinFormsApp1/Properties/Resources.resx +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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\left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/Catamaran/WinFormsApp1/Resources/Down.jpg b/Catamaran/WinFormsApp1/Resources/Down.jpg deleted file mode 100644 index a141f5d..0000000 Binary files a/Catamaran/WinFormsApp1/Resources/Down.jpg and /dev/null differ diff --git a/Catamaran/WinFormsApp1/Resources/Right.jpg b/Catamaran/WinFormsApp1/Resources/Right.jpg deleted file mode 100644 index 23b5f06..0000000 Binary files a/Catamaran/WinFormsApp1/Resources/Right.jpg and /dev/null differ diff --git a/Catamaran/WinFormsApp1/Resources/left.jpg b/Catamaran/WinFormsApp1/Resources/left.jpg deleted file mode 100644 index 488ee9e..0000000 Binary files a/Catamaran/WinFormsApp1/Resources/left.jpg and /dev/null differ diff --git a/Catamaran/WinFormsApp1/Resources/up.jpg b/Catamaran/WinFormsApp1/Resources/up.jpg deleted file mode 100644 index 1af56d7..0000000 Binary files a/Catamaran/WinFormsApp1/Resources/up.jpg and /dev/null differ