diff --git a/.gitignore b/.gitignore index ca1c7a3..8c7f0e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,85 +1,31 @@ -# ---> VisualStudio ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files -*.rsuser *.suo *.user -*.userosscache *.sln.docstates -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - # Build results + [Dd]ebug/ -[Dd]ebugPublic/ [Rr]elease/ -[Rr]eleases/ x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ [Bb]in/ [Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio *_i.c *_p.c -*_h.h +*_i.h *.ilk *.meta *.obj -*.iobj *.pch *.pdb -*.ipdb *.pgc *.pgd *.rsp @@ -89,41 +35,27 @@ StyleCopReport.xml *.tlh *.tmp *.tmp_proj -*_wpftmp.csproj *.log -*.tlog *.vspscc *.vssscc .builds *.pidb +*.log *.svclog *.scc -# Chutzpah Test files -_Chutzpah* - # Visual C++ cache files ipch/ *.aps *.ncb -*.opendb *.opensdf *.sdf *.cachefile -*.VC.db -*.VC.VC.opendb # Visual Studio profiler *.psess *.vsp *.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ # Guidance Automation Toolkit *.gpState @@ -133,268 +65,69 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - # Click-Once directory publish/ # Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted +*.Publish.xml *.pubxml -*.publishproj +*.azurePubxml -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +packages/ +## TODO: If the tool you use requires repositories.config, also uncomment the next line +!packages/repositories.config -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output +# Windows Azure Build Output csx/ *.build.csdef -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files +# Windows Store app package directory AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ # Others +sql/ +*.Cache ClientBin/ +[Ss]tyle[Cc]op.* +![Ss]tyle[Cc]op.targets ~$* *~ *.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx +*.[Pp]ublish.xml + *.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ # RIA/Silverlight projects Generated_Code/ -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak # SQL Server files -*.mdf -*.ldf -*.ndf +App_Data/*.mdf +App_Data/*.ldf -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl +# ========================= +# Windows detritus +# ========================= -# Microsoft Fakes -FakesAssemblies/ +# Windows image file caches +Thumbs.db +ehthumbs.db -# GhostDoc plugin setting file -*.GhostDoc.xml +# Folder config file +Desktop.ini -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ +# Recycle Bin used on file shares +$RECYCLE.BIN/ -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files -*.ncb -*.aps - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml +# Mac desktop service store files +.DS_Store +_NCrunch* diff --git a/ProjectAntiAircraftGun/DrawingLiner.cs b/ProjectAntiAircraftGun/DrawingLiner.cs deleted file mode 100644 index 75f61ab..0000000 --- a/ProjectAntiAircraftGun/DrawingLiner.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Drawing; - -namespace ProjectLiner -{ - internal class DrawingLiner - { - Liner aag; - private readonly int _width = 0; - private readonly int _height = 0; - public DrawingLiner(Liner aag) - { - this.aag = aag; - _height = 60 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15); - _width = 150; - } - public DrawingLiner() - { - aag = new Liner(); - } - public void SetPos(Point pos) - { - aag.position.X = Math.Clamp(pos.X + aag.position.X, 0, Program.faag.ClientSize.Width-_width); - aag.position.Y = Math.Clamp(pos.Y + aag.position.Y, 0, Program.faag.ClientSize.Height-_height); - } - public void MoveTransport(Vector2 way) - { - if(way == null) - { - throw new NullReferenceException(); - } - SetPos(new Point((int)(way.x*aag.Step), (int)(way.y*aag.Step))); - } - public void Draw(Graphics g) - { - Pen pen = new Pen(Color.Black); - Brush brush1 = new SolidBrush(aag.FirstColor); - Brush brush2 = new SolidBrush(aag.SecondColor); - - //deck - g.DrawPolygon(pen, new Point[] { - new Point(0 + aag.position.X, 15 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(150 + aag.position.X, 15 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(120 + aag.position.X, 45 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(30 + aag.position.X, 45 + aag.position.Y +((int)(aag.NumOfBoxes / 8 + 0.5) * 15)), - new Point(0 + aag.position.X, 15 + aag.position.Y +((int)(aag.NumOfBoxes / 8 + 0.5) * 15))}); - g.FillPolygon(brush1, new Point[] { - new Point(0 + aag.position.X, 15 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(150 + aag.position.X, 15 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(120 + aag.position.X, 45 + aag.position.Y+((int)(aag.NumOfBoxes/8+0.5)*15)), - new Point(30 + aag.position.X, 45 + aag.position.Y +((int)(aag.NumOfBoxes / 8 + 0.5) * 15)), - new Point(0 + aag.position.X, 15 + aag.position.Y +((int)(aag.NumOfBoxes / 8 + 0.5) * 15))}); - //mark - if (aag.HasMark) - { - g.DrawLine(new Pen(aag.SecondColor),30+aag.position.X, 20 + aag.position.Y + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 30 + aag.position.X, 35 + aag.position.Y + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15)); - g.DrawLine(new Pen(aag.SecondColor), 20+aag.position.X, 25 + aag.position.Y + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 40 + aag.position.X, 25 + aag.position.Y + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15)); - } - //block - for (int j = 0; j <= (int)(aag.NumOfBoxes / 8 + 0.5); j++) - { - if(aag.NumOfBoxes - j * 8 >= 8) - for (int i = 0; i < 8; i++) - { - g.FillRectangle(brush2, 15 + aag.position.X + i * 15, aag.position.Y - j * 15+((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - g.DrawRectangle(pen, 15 + aag.position.X + i * 15, aag.position.Y - j * 15 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - } - else - for (int i = 0; i < aag.NumOfBoxes%8; i++) - { - if(aag.NumOfBoxes % 8 == 1) - { - g.FillRectangle(brush2, 8 + 15 + aag.position.X + (90 / 2), aag.position.Y - j * 15 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - g.DrawRectangle(pen, 8 + 15 + aag.position.X + (90 / 2), aag.position.Y - j * 15 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - continue; - } - g.FillRectangle(brush2,8 +15 + aag.position.X + (90 / (aag.NumOfBoxes % 8 - 1)) * i, aag.position.Y - j * 15 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - g.DrawRectangle(pen,8 + 15 + aag.position.X + (90 / (aag.NumOfBoxes % 8 - 1)) * i, aag.position.Y - j * 15 + ((int)(aag.NumOfBoxes / 8 + 0.5) * 15), 15, 15); - } - } - } - } -} diff --git a/ProjectAntiAircraftGun/FormLiner.Designer.cs b/ProjectAntiAircraftGun/FormLiner.Designer.cs deleted file mode 100644 index d02ac01..0000000 --- a/ProjectAntiAircraftGun/FormLiner.Designer.cs +++ /dev/null @@ -1,129 +0,0 @@ -namespace ProjectLiner -{ - partial class FormLiner - { - /// - /// 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() - { - pictureBoxLiner = new PictureBox(); - CreateButton = new Button(); - buttonRight = new Button(); - buttonDown = new Button(); - buttonLeft = new Button(); - buttonUp = new Button(); - ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit(); - SuspendLayout(); - // - // pictureBoxLiner - // - pictureBoxLiner.Dock = DockStyle.Fill; - pictureBoxLiner.Location = new Point(0, 0); - pictureBoxLiner.Name = "pictureBoxLiner"; - pictureBoxLiner.Size = new Size(800, 450); - pictureBoxLiner.TabIndex = 5; - pictureBoxLiner.TabStop = false; - // - // CreateButton - // - CreateButton.Location = new Point(12, 408); - CreateButton.Name = "CreateButton"; - CreateButton.Size = new Size(90, 30); - CreateButton.TabIndex = 0; - CreateButton.Text = "Create"; - CreateButton.UseVisualStyleBackColor = true; - CreateButton.Click += ButtonCreate_Click; - // - // buttonRight - // - buttonRight.Font = new Font("Segoe UI", 15F, FontStyle.Regular, GraphicsUnit.Point); - buttonRight.Location = new Point(748, 398); - buttonRight.Name = "buttonRight"; - buttonRight.Size = new Size(40, 40); - buttonRight.TabIndex = 1; - buttonRight.Text = "⇒"; - buttonRight.UseVisualStyleBackColor = true; - buttonRight.Click += ButtonMove_Click; - // - // buttonDown - // - buttonDown.Font = new Font("Segoe UI", 15F, FontStyle.Regular, GraphicsUnit.Point); - buttonDown.Location = new Point(702, 398); - buttonDown.Name = "buttonDown"; - buttonDown.Size = new Size(40, 40); - buttonDown.TabIndex = 2; - buttonDown.Text = "⇓"; - buttonDown.UseVisualStyleBackColor = true; - buttonDown.Click += ButtonMove_Click; - // - // buttonLeft - // - buttonLeft.Font = new Font("Segoe UI", 15F, FontStyle.Regular, GraphicsUnit.Point); - buttonLeft.Location = new Point(656, 398); - buttonLeft.Name = "buttonLeft"; - buttonLeft.Size = new Size(40, 40); - buttonLeft.TabIndex = 3; - buttonLeft.Text = "⇐"; - buttonLeft.UseVisualStyleBackColor = true; - buttonLeft.Click += ButtonMove_Click; - // - // buttonUp - // - buttonUp.Font = new Font("Segoe UI", 15F, FontStyle.Regular, GraphicsUnit.Point); - buttonUp.Location = new Point(702, 352); - buttonUp.Name = "buttonUp"; - buttonUp.Size = new Size(40, 40); - buttonUp.TabIndex = 4; - buttonUp.Text = "⇑"; - buttonUp.UseVisualStyleBackColor = true; - buttonUp.Click += ButtonMove_Click; - // - // FormAntiAircraftGun - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(buttonUp); - Controls.Add(buttonLeft); - Controls.Add(buttonDown); - Controls.Add(buttonRight); - Controls.Add(CreateButton); - Controls.Add(pictureBoxLiner); - Name = "FormLiner"; - Text = "Liner"; - ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).EndInit(); - ResumeLayout(false); - } - - #endregion - - private PictureBox pictureBoxLiner; - private Button CreateButton; - private Button buttonRight; - private Button buttonDown; - private Button buttonLeft; - private Button buttonUp; - } -} \ No newline at end of file diff --git a/ProjectAntiAircraftGun/FormLiner.cs b/ProjectAntiAircraftGun/FormLiner.cs deleted file mode 100644 index d738aad..0000000 --- a/ProjectAntiAircraftGun/FormLiner.cs +++ /dev/null @@ -1,53 +0,0 @@ -namespace ProjectLiner -{ - public partial class FormLiner : Form - { - private DrawingLiner? _drawer; - public FormLiner() - { - InitializeComponent(); - } - private void Draw() - { - if (_drawer == null) - return; - - Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height); - Graphics gr = Graphics.FromImage(bmp); - _drawer.Draw(gr); - pictureBoxLiner.Image = bmp; - } - private void ButtonMove_Click(object sender, EventArgs e) - { - if (_drawer == null) - { - return; - } - switch (((Button)sender)?.Name ?? string.Empty) - { - case "buttonUp": - _drawer.MoveTransport(new Vector2(0, -1)); - break; - case "buttonDown": - _drawer.MoveTransport(new Vector2(0, 1)); - break; - case "buttonLeft": - _drawer.MoveTransport(new Vector2(-1, 0)); - break; - case "buttonRight": - _drawer.MoveTransport(new Vector2(1, 0)); - break; - } - Draw(); - } - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random rnd = new Random(); - _drawer = new DrawingLiner(new Liner(rnd.Next(1,100),rnd.Next(1,10), - Color.FromArgb(rnd.Next(0, 255), rnd.Next(0, 255), rnd.Next(0, 255)), - Color.FromArgb(rnd.Next(0, 255), rnd.Next(0, 255), rnd.Next(0, 255)), - rnd.Next(2, 25), Convert.ToBoolean(rnd.Next(0,2)))); - Draw(); - } - } -} \ No newline at end of file diff --git a/ProjectAntiAircraftGun/GameObject.cs b/ProjectAntiAircraftGun/GameObject.cs deleted file mode 100644 index ba40162..0000000 --- a/ProjectAntiAircraftGun/GameObject.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ProjectLiner -{ - abstract public class GameObject - { - public Point position; - public GameObject() - { - position = new Point(); - } - } -} diff --git a/ProjectAntiAircraftGun/Liner.cs b/ProjectAntiAircraftGun/Liner.cs deleted file mode 100644 index 40b1668..0000000 --- a/ProjectAntiAircraftGun/Liner.cs +++ /dev/null @@ -1,76 +0,0 @@ -namespace ProjectLiner -{ - public class Liner : GameObject - { - private int _speed; - private int _weight; - private Color _firstCol; - private Color _secondCol; - private int _numOfBoxes; - private bool _haveMark; - private int _step; - public int Speed { get => _speed;} - public int Weight { get => _weight;} - public Color FirstColor { get => _firstCol; } - public Color SecondColor { get => _secondCol; } - public int NumOfBoxes { get => _numOfBoxes; } - public int Step { get => _step>0?_step:1; } - public bool HasMark { get => _haveMark;} - public Liner() - { - _speed = 1; - _weight = 1; - _firstCol = Color.Magenta; - _secondCol = Color.Black; - _numOfBoxes = 6; - _haveMark = true; - try - { - _step = _speed / _weight; - }catch(Exception e) { throw new Exception("Дурашка, какой ноль в весе?"); } - } - /// - /// - /// - /// - /// (0,int.MaxValue] - /// - /// - /// [2,6] - /// - public Liner(int speed, int weight, Color firstCol, Color secondCol, int numOfBoxes,bool haveMark) - { - if (numOfBoxes > 24||numOfBoxes<2) - throw new ArgumentOutOfRangeException($"{nameof(numOfBoxes)} out of range [2,24]"); - _speed = speed; - _weight = weight; - _firstCol = firstCol; - _secondCol = secondCol; - _numOfBoxes = numOfBoxes; - _haveMark = haveMark; - try - { - _step = _speed / _weight; - } - catch (Exception e) { throw new Exception("Дурашка, какой ноль в весе?"); } - } - /// - /// - /// - /// - /// (0,int.MaxValue] - /// - public Liner(int speed, int weight, Color firstCol) - { - _speed = speed; - _weight = weight; - _firstCol = firstCol; - _numOfBoxes = 6; - try - { - _step = _speed / _weight; - } - catch (Exception e) { throw e; } - } - } -} diff --git a/ProjectAntiAircraftGun/Program.cs b/ProjectAntiAircraftGun/Program.cs deleted file mode 100644 index fff1540..0000000 --- a/ProjectAntiAircraftGun/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace ProjectLiner -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - public static FormLiner faag = new FormLiner(); - [STAThread] - static void Main() - { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(faag); - } - } -} \ No newline at end of file diff --git a/ProjectAntiAircraftGun/ProjectLiner.csproj b/ProjectAntiAircraftGun/ProjectLiner.csproj deleted file mode 100644 index e1a0735..0000000 --- a/ProjectAntiAircraftGun/ProjectLiner.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net7.0-windows - enable - true - enable - - - \ No newline at end of file diff --git a/ProjectAntiAircraftGun/Vector2.cs b/ProjectAntiAircraftGun/Vector2.cs deleted file mode 100644 index c48cd3e..0000000 --- a/ProjectAntiAircraftGun/Vector2.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace ProjectLiner -{ - public class Vector2 - { - public float x, y; - public float lenght => MathF.Sqrt(x * x + y * y); - public Vector2 normilized => new Vector2(x/lenght, y/lenght); - public Vector2(float x, float y) - { - this.x = x; - this.y = y; - } - public Vector2() - { - x = 0; - y = 0; - } - } -} diff --git a/ProjectLiner/.vs/ProjectEvaluation/projectliner.metadata.v7.bin b/ProjectLiner/.vs/ProjectEvaluation/projectliner.metadata.v7.bin new file mode 100644 index 0000000..1318f3e Binary files /dev/null and b/ProjectLiner/.vs/ProjectEvaluation/projectliner.metadata.v7.bin differ diff --git a/ProjectLiner/.vs/ProjectEvaluation/projectliner.projects.v7.bin b/ProjectLiner/.vs/ProjectEvaluation/projectliner.projects.v7.bin new file mode 100644 index 0000000..024caa9 Binary files /dev/null and b/ProjectLiner/.vs/ProjectEvaluation/projectliner.projects.v7.bin differ diff --git a/ProjectLiner/.vs/ProjectLiner/DesignTimeBuild/.dtbcache.v2 b/ProjectLiner/.vs/ProjectLiner/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 0000000..b7b9530 Binary files /dev/null and b/ProjectLiner/.vs/ProjectLiner/DesignTimeBuild/.dtbcache.v2 differ diff --git a/ProjectLiner/.vs/ProjectLiner/FileContentIndex/aa0c2f71-fd4c-4feb-b357-7ffdadf3f236.vsidx b/ProjectLiner/.vs/ProjectLiner/FileContentIndex/aa0c2f71-fd4c-4feb-b357-7ffdadf3f236.vsidx new file mode 100644 index 0000000..b9caa4d Binary files /dev/null and b/ProjectLiner/.vs/ProjectLiner/FileContentIndex/aa0c2f71-fd4c-4feb-b357-7ffdadf3f236.vsidx differ diff --git a/ProjectLiner/.vs/ProjectLiner/v17/.futdcache.v2 b/ProjectLiner/.vs/ProjectLiner/v17/.futdcache.v2 new file mode 100644 index 0000000..90f8456 Binary files /dev/null and b/ProjectLiner/.vs/ProjectLiner/v17/.futdcache.v2 differ diff --git a/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json b/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json new file mode 100644 index 0000000..3e56bea --- /dev/null +++ b/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json @@ -0,0 +1,122 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\drawingliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\drawingliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\entityliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\entityliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\formliner.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\formliner.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\directiontype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\directiontype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 4, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FormLiner.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", + "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", + "RelativeToolTip": "ProjectLiner\\FormLiner.cs", + "ViewState": "AQIAAA8AAAAAAAAAAIA0wBcAAAAHAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:29.961Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "FormLiner.Designer.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", + "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.Designer.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", + "RelativeToolTip": "ProjectLiner\\FormLiner.Designer.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:26.829Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "Program.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", + "RelativeDocumentMoniker": "ProjectLiner\\Program.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", + "RelativeToolTip": "ProjectLiner\\Program.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:23.139Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "EntityLiner.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\EntityLiner.cs", + "RelativeDocumentMoniker": "ProjectLiner\\EntityLiner.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\EntityLiner.cs", + "RelativeToolTip": "ProjectLiner\\EntityLiner.cs", + "ViewState": "AQIAACEAAAAAAAAAAAAowAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:21.909Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "DrawingLiner.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DrawingLiner.cs", + "RelativeDocumentMoniker": "ProjectLiner\\DrawingLiner.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DrawingLiner.cs", + "RelativeToolTip": "ProjectLiner\\DrawingLiner.cs", + "ViewState": "AQIAAG8AAAAAAAAAAAAqwHoAAAAKAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:20.684Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "DirectionType.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DirectionType.cs", + "RelativeDocumentMoniker": "ProjectLiner\\DirectionType.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DirectionType.cs", + "RelativeToolTip": "ProjectLiner\\DirectionType.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-20T11:09:18.889Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/ProjectAntiAircraftGun/ProjectLiner.sln b/ProjectLiner/ProjectLiner.sln similarity index 61% rename from ProjectAntiAircraftGun/ProjectLiner.sln rename to ProjectLiner/ProjectLiner.sln index 1b46542..57ac0bd 100644 --- a/ProjectAntiAircraftGun/ProjectLiner.sln +++ b/ProjectLiner/ProjectLiner.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.6.33815.320 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectLiner", "ProjectLiner.csproj", "{0C215558-2860-459F-A04D-5BCE3792F5CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectLiner", "ProjectLiner\ProjectLiner.csproj", "{7FB62E78-175F-490A-B5F2-2FF676947033}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0C215558-2860-459F-A04D-5BCE3792F5CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C215558-2860-459F-A04D-5BCE3792F5CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C215558-2860-459F-A04D-5BCE3792F5CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C215558-2860-459F-A04D-5BCE3792F5CC}.Release|Any CPU.Build.0 = Release|Any CPU + {7FB62E78-175F-490A-B5F2-2FF676947033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FB62E78-175F-490A-B5F2-2FF676947033}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FB62E78-175F-490A-B5F2-2FF676947033}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FB62E78-175F-490A-B5F2-2FF676947033}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2A46C0F6-1F06-4A83-A51A-7BC26DD276FF} + SolutionGuid = {78BFA3C9-3BCC-4037-9217-9197133D11B5} EndGlobalSection EndGlobal diff --git a/ProjectLiner/ProjectLiner/DirectionType.cs b/ProjectLiner/ProjectLiner/DirectionType.cs new file mode 100644 index 0000000..5be3752 --- /dev/null +++ b/ProjectLiner/ProjectLiner/DirectionType.cs @@ -0,0 +1,27 @@ +namespace ProjectLiner; + +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/DrawingLiner.cs b/ProjectLiner/ProjectLiner/DrawingLiner.cs new file mode 100644 index 0000000..8497562 --- /dev/null +++ b/ProjectLiner/ProjectLiner/DrawingLiner.cs @@ -0,0 +1,247 @@ +namespace ProjectLiner; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningLiner +{ + /// + /// Класс-сущность + /// + public EntityLiner? EntityLiner { get; private set; } + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки автомобиля + /// + private int? _startPosX; + + /// + /// Верхняя кооридната прорисовки автомобиля + /// + private int? _startPosY; + + /// + /// Ширина прорисовки автомобиля + /// + private readonly int _drawingLinerWidth = 80; + + /// + /// Высота прорисовки автомобиля + /// + private readonly int _drawingLinerHeight = 60; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool hasMark, bool hasDecoratins) + { + EntityLiner = new EntityLiner(); + EntityLiner.Init(speed, weight, bodyColor, additionalColor, hasMark, hasDecoratins); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + // TODO проверка, что объект "влезает" в размеры поля + // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена + if (_drawingLinerWidth > width || _drawingLinerHeight > height) + return false; + + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX.HasValue && _startPosY.HasValue) + { + if (_pictureWidth - _drawingLinerWidth < _startPosX) + _startPosX = _pictureWidth - _drawingLinerWidth; + if (_pictureHeight - _drawingLinerHeight < _startPosY) + _startPosY = _pictureHeight - _drawingLinerHeight; + + } + return true; + } + + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + _startPosX = _pictureWidth - _drawingLinerWidth < x ? _pictureWidth - _drawingLinerWidth : x; + _startPosY = _pictureHeight - _drawingLinerHeight < y ? _pictureHeight - _drawingLinerHeight : y; + } + + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещене выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntityLiner.Step > 0) + { + _startPosX -= (int)EntityLiner.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntityLiner.Step > 0) + { + _startPosY -= (int)EntityLiner.Step; + } + return true; + // вправо + case DirectionType.Right: + if(_startPosX.Value + EntityLiner.Step < _pictureWidth-_drawingLinerWidth) + { + _startPosX += (int)EntityLiner.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY.Value + EntityLiner.Step < _pictureHeight-_drawingLinerHeight) + { + _startPosY += (int)EntityLiner.Step; + } + return true; + default: + return false; + } + } + + public void FormChanged(object sender, EventArgs e) + { + _pictureWidth = (sender as FormLiner).Size.Width; + _pictureHeight = (sender as FormLiner).Size.Height; + if (_startPosX.HasValue && _startPosY.HasValue) + { + if (_pictureWidth - _drawingLinerWidth < _startPosX) + _startPosX = _pictureWidth - _drawingLinerWidth; + if (_pictureHeight - _drawingLinerHeight < _startPosY) + _startPosY = _pictureHeight - _drawingLinerHeight; + (sender as FormLiner).Draw(); + } + } + + /// + /// Прорисовка объекта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntityLiner == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new Pen(Color.Black); + Brush mainBrush = new SolidBrush(EntityLiner.BodyColor); + Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor); + + g.DrawRectangle(pen, new(_startPosX.Value, _startPosY.Value, 80, 60)); + + //Рисуем тело + g.FillPolygon(mainBrush, new Point[] { + new(_startPosX.Value+0, _startPosY.Value + 30), + new(_startPosX.Value+15,_startPosY.Value+50), + new(_startPosX.Value+65,_startPosY.Value+50), + new(_startPosX.Value+80,_startPosY.Value+30), + new(_startPosX.Value+0,_startPosY.Value+30), + new(_startPosX.Value+0,_startPosY.Value+20), + new(_startPosX.Value+80, _startPosY.Value+20), + new(_startPosX.Value+80, _startPosY.Value+30) + }); + g.DrawLines(pen, new Point[] { + new(_startPosX.Value+0, _startPosY.Value + 30), + new(_startPosX.Value+15,_startPosY.Value+50), + new(_startPosX.Value+65,_startPosY.Value+50), + new(_startPosX.Value+80,_startPosY.Value+30), + new(_startPosX.Value+0,_startPosY.Value+30), + new(_startPosX.Value+0,_startPosY.Value+20), + new(_startPosX.Value+80, _startPosY.Value+20), + new(_startPosX.Value+80, _startPosY.Value+30) + }); + + //Рисуем окна + g.FillRectangles(additionalBrush, new Rectangle[]{ + new(_startPosX.Value+5,_startPosY.Value+22,10,6), + new(_startPosX.Value+20,_startPosY.Value+22,10,6), + new(_startPosX.Value+35,_startPosY.Value+22,10,6), + new(_startPosX.Value+50,_startPosY.Value+22,10,6), + new(_startPosX.Value+65,_startPosY.Value+22,10,6), + }); + g.DrawRectangles(pen, new Rectangle[]{ + new(_startPosX.Value+5,_startPosY.Value+22,10,6), + new(_startPosX.Value+20,_startPosY.Value+22,10,6), + new(_startPosX.Value+35,_startPosY.Value+22,10,6), + new(_startPosX.Value+50,_startPosY.Value+22,10,6), + new(_startPosX.Value+65,_startPosY.Value+22,10,6), + }); + + //Марка на борту + if (EntityLiner.HasMark) + { + g.FillRectangles(additionalBrush, new Rectangle[] + { + new(_startPosX.Value+15,_startPosY.Value+38,17,3), + new(_startPosX.Value+22,_startPosY.Value+32,3,16) + }); + } + + //Декорации + if (EntityLiner.HasDecoratins) + { + g.FillRectangles(additionalBrush, new Rectangle[] + { + new(_startPosX.Value+8,_startPosY.Value+0,10,20), + new(_startPosX.Value+26,_startPosY.Value+0,10,20), + new(_startPosX.Value+44,_startPosY.Value+0,10,20), + new(_startPosX.Value+62,_startPosY.Value+0,10,20), + }); + g.DrawRectangles(pen, new Rectangle[] + { + new(_startPosX.Value+8,_startPosY.Value+0,10,20), + new(_startPosX.Value+26,_startPosY.Value+0,10,20), + new(_startPosX.Value+44,_startPosY.Value+0,10,20), + new(_startPosX.Value+62,_startPosY.Value+0,10,20), + }); + } + } +} \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/EntityLiner.cs b/ProjectLiner/ProjectLiner/EntityLiner.cs new file mode 100644 index 0000000..8a6d5e1 --- /dev/null +++ b/ProjectLiner/ProjectLiner/EntityLiner.cs @@ -0,0 +1,62 @@ +namespace ProjectLiner; + +/// +/// Класс-сущность "Спортивный автомобиль" +/// +public class EntityLiner +{ + /// + /// Скорость + /// + 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 HasMark { get; private set; } + + /// + /// Имеет декорации сверху + /// + public bool HasDecoratins { get; private set; } + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + + /// + /// Инициализация полей объекта-класса спортивного автомобиля + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + /// Дополнительный цвет + /// Имеет значёк на куове + /// Имеет декорации сверху + /// + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool hasMark, bool hasDecoratins) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + HasMark = hasMark; + HasDecoratins = hasDecoratins; + } +} \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs new file mode 100644 index 0000000..8b7f316 --- /dev/null +++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs @@ -0,0 +1,134 @@ +namespace ProjectLiner +{ + partial class FormLiner + { + /// + /// 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() + { + pictureBoxLiner = new PictureBox(); + buttonCreateLiner = new Button(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).BeginInit(); + SuspendLayout(); + // + // pictureBoxLiner + // + pictureBoxLiner.Dock = DockStyle.Fill; + pictureBoxLiner.Location = new Point(0, 0); + pictureBoxLiner.Name = "pictureBoxLiner"; + pictureBoxLiner.Size = new Size(923, 597); + pictureBoxLiner.TabIndex = 0; + pictureBoxLiner.TabStop = false; + // + // buttonCreateLiner + // + buttonCreateLiner.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateLiner.Location = new Point(12, 562); + buttonCreateLiner.Name = "buttonCreateLiner"; + buttonCreateLiner.Size = new Size(75, 23); + buttonCreateLiner.TabIndex = 1; + buttonCreateLiner.Text = "Создать"; + buttonCreateLiner.UseVisualStyleBackColor = true; + buttonCreateLiner.Click += ButtonCreateLiner_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(787, 550); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + 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(828, 509); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + 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(828, 550); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + 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(869, 550); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 5; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // FormLiner + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(923, 597); + Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreateLiner); + Controls.Add(pictureBoxLiner); + Name = "FormLiner"; + Text = "Пассажирский лайнер"; + ((System.ComponentModel.ISupportInitialize)pictureBoxLiner).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxLiner; + private Button buttonCreateLiner; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonRight; + } +} \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/FormLiner.cs b/ProjectLiner/ProjectLiner/FormLiner.cs new file mode 100644 index 0000000..2ac37f2 --- /dev/null +++ b/ProjectLiner/ProjectLiner/FormLiner.cs @@ -0,0 +1,93 @@ +namespace ProjectLiner; + +/// +/// Форма работы с объектом "Спортивный автомобиль" +/// +public partial class FormLiner : Form +{ + /// + /// Поле-объект для прорисовки объекта + /// + private DrawningLiner? _drawningLiner; + + /// + /// Конструктор формы + /// + public FormLiner() + { + InitializeComponent(); + } + + /// + /// Метод прорисовки машины + /// + public void Draw() + { + if (_drawningLiner == null) + { + return; + } + + Bitmap bmp = new(pictureBoxLiner.Width, pictureBoxLiner.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningLiner.DrawTransport(gr); + pictureBoxLiner.Image = bmp; + } + + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreateLiner_Click(object sender, EventArgs e) + { + if (_drawningLiner != null) + ResizeEnd -= _drawningLiner.FormChanged; + Random random = new(); + _drawningLiner = new DrawningLiner(); + _drawningLiner.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))); + _drawningLiner.SetPictureSize(pictureBoxLiner.Width, pictureBoxLiner.Height); + _drawningLiner.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + ResizeEnd += _drawningLiner.FormChanged; + } + + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningLiner == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningLiner.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningLiner.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningLiner.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningLiner.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { + Draw(); + } + } +} \ No newline at end of file diff --git a/ProjectAntiAircraftGun/FormLiner.resx b/ProjectLiner/ProjectLiner/FormLiner.resx similarity index 100% rename from ProjectAntiAircraftGun/FormLiner.resx rename to ProjectLiner/ProjectLiner/FormLiner.resx diff --git a/ProjectLiner/ProjectLiner/Program.cs b/ProjectLiner/ProjectLiner/Program.cs new file mode 100644 index 0000000..20e3493 --- /dev/null +++ b/ProjectLiner/ProjectLiner/Program.cs @@ -0,0 +1,17 @@ +namespace ProjectLiner +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + ApplicationConfiguration.Initialize(); + Application.Run(new FormLiner()); + } + } +} \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/ProjectLiner.csproj b/ProjectLiner/ProjectLiner/ProjectLiner.csproj new file mode 100644 index 0000000..244387d --- /dev/null +++ b/ProjectLiner/ProjectLiner/ProjectLiner.csproj @@ -0,0 +1,26 @@ + + + + WinExe + net7.0-windows + enable + true + enable + + + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs b/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs new file mode 100644 index 0000000..2df683e --- /dev/null +++ b/ProjectLiner/ProjectLiner/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ProjectLiner.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("ProjectLiner.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/ProjectLiner/ProjectLiner/Properties/Resources.resx b/ProjectLiner/ProjectLiner/Properties/Resources.resx new file mode 100644 index 0000000..293419e --- /dev/null +++ b/ProjectLiner/ProjectLiner/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\arrowDown.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowLeft.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowRight.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowUp.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectLiner/ProjectLiner/Resources/arrowDown.jpg b/ProjectLiner/ProjectLiner/Resources/arrowDown.jpg new file mode 100644 index 0000000..f21002e Binary files /dev/null and b/ProjectLiner/ProjectLiner/Resources/arrowDown.jpg differ diff --git a/ProjectLiner/ProjectLiner/Resources/arrowLeft.jpg b/ProjectLiner/ProjectLiner/Resources/arrowLeft.jpg new file mode 100644 index 0000000..61b8dae Binary files /dev/null and b/ProjectLiner/ProjectLiner/Resources/arrowLeft.jpg differ diff --git a/ProjectLiner/ProjectLiner/Resources/arrowRight.jpg b/ProjectLiner/ProjectLiner/Resources/arrowRight.jpg new file mode 100644 index 0000000..b440197 Binary files /dev/null and b/ProjectLiner/ProjectLiner/Resources/arrowRight.jpg differ diff --git a/ProjectLiner/ProjectLiner/Resources/arrowUp.jpg b/ProjectLiner/ProjectLiner/Resources/arrowUp.jpg new file mode 100644 index 0000000..e630cea Binary files /dev/null and b/ProjectLiner/ProjectLiner/Resources/arrowUp.jpg differ diff --git a/README.md b/README.md deleted file mode 100644 index cde033b..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# ISEbd-11_Khatypov_K.R_fundamental -