kitossy/ISEbd-21_Chernyshov_N.I.AircraftCarrier_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Вторая лабораторная. Изменения

Browse Source
This commit is contained in:
Никита Чернышов 2022-10-26 23:20:06 +04:00
parent b2e5bc9cf0
commit 74bd09ed74
11 changed files with 170 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Warship/Warship/AbstractMap.cs
View File

@ -31,13 +31,35 @@ namespace AircraftCarrier
}
public Bitmap MoveObject(Direction direction)
{
// TODO проверка, что объект может переместится в требуемом направлении
if (true)
if (true)
{
_drawingObjectWarship.MoveObject(direction);
}
(float Left, float Right, float Top, float Bottom) = _drawingObjectWarship.GetCurrentPosition();
if (Check(Left, Right, Top, Bottom) != 0)
{
_drawingObjectWarship.MoveObject(GetOpositDirection(direction));
}
return DrawMapWithObject();
}
private Direction GetOpositDirection(Direction dir)
{
switch (dir)
{
case Direction.None:
return Direction.None;
case Direction.Up:
return Direction.Down;
case Direction.Down:
return Direction.Up;
case Direction.Left:
return Direction.Right;
case Direction.Right:
return Direction.Left;
}
return Direction.None;
}
private bool SetObjectOnMap()
{
if (_drawingObjectWarship == null || _map == null)
@ -47,8 +69,54 @@ namespace AircraftCarrier
int x = _random.Next(0, 10);
int y = _random.Next(0, 10);
_drawingObjectWarship.SetObject(x, y, _width, _height);
// TODO првоерка, что объект не "накладывается" на закрытые участки
return true;
(float Left, float Right, float Top, float Bottom) = _drawingObjectWarship.GetCurrentPosition();
float nowX = Left;
float nowY = Right;
float lenX = Top - Left;
float lenY = Bottom - Right;
while (Check(nowX, nowY, nowX + lenX, nowY + lenY) != 2)
{
int result;
do
{
result = Check(nowX, nowY, nowX + lenX, nowY + lenY);
if (result == 0)
{
_drawingObjectWarship.SetObject((int)nowX, (int)nowY, _width, _height);
return true;
}
else
{
nowX += _size_x;
}
} while (result != 2);
nowX = x;
nowY += _size_y;
}
return false;
}
private int Check(float Left, float Right, float Top, float Bottom)
{
int startX = (int)(Left / _size_x);
int startY = (int)(Right / _size_y);
int endX = (int)(Top / _size_x);
int endY = (int)(Bottom / _size_y);
if (startX < 0 || startY < 0 || endX >= _map.GetLength(0) || endY >= _map.GetLength(0))
{
return 2;
}
for (int i = startX; i <= endX; i++)
{
for (int j = startY; j <= endY; j++)
{
if (_map[i, j] == _barrier)
{
return 1;
}
}
}
return 0;
}
private Bitmap DrawMapWithObject()
{

2
Warship/Warship/DrawingObjectWarship.cs
View File

@ -28,7 +28,7 @@ namespace AircraftCarrier
}
public void DrawningObject(Graphics g)
{
// TODO
_ship.DrawTransport(g);
}
}
}

33
Warship/Warship/DrawingPlaneWarship.cs
View File

@ -38,7 +38,7 @@ namespace AircraftCarrier
Brush br = new SolidBrush(Ship?.BodyColor ?? Color.White);
if (planeWarship.BodyKit)
{
// броня носовой части корабля
// броня корабля
PointF pointShipArmor1 = new PointF(_startPosX + 167, _startPosY + 25);
PointF pointShipArmor2 = new PointF(_startPosX + 237, _startPosY + 40);
PointF pointShipArmor3 = new PointF(_startPosX + 167, _startPosY + 75);
@ -50,19 +50,12 @@ namespace AircraftCarrier
g.FillPolygon(br, PointsShipArmor);
g.DrawPolygon(pen, PointsShipArmor);
g.DrawEllipse(pen, _startPosX + 224, _startPosY + 37, 20, 20);
g.FillEllipse(br, _startPosX + 224, _startPosY + 37, 20, 20);
}
if (planeWarship.RunWay)
{
//взлетная полоса
g.DrawRectangle(pen, _startPosX + 27, _startPosY + 75, 140, 25);
g.DrawRectangle(pen, _startPosX + 32, _startPosY + 87, 25, 5);
g.DrawRectangle(pen, _startPosX + 82, _startPosY + 87, 25, 5);
g.DrawRectangle(pen, _startPosX + 132, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 32, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 82, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 132, _startPosY + 87, 25, 5);
g.FillEllipse(br, _startPosX + 224, _startPosY + 37, 20, 20);
// торпеда
g.DrawRectangle(pen, _startPosX + 30, _startPosY + 8, 105, 15);
g.FillRectangle(br, _startPosX + 30, _startPosY + 8, 105, 15);
g.DrawEllipse(pen, _startPosX + 130, _startPosY + 5, 35, 20);
g.FillEllipse(br, _startPosX + 130, _startPosY + 5, 35, 20);
}
_startPosX += 22;
@ -71,6 +64,18 @@ namespace AircraftCarrier
_startPosX -= 22;
_startPosY -= 25;
if (planeWarship.RunWay)
{
//взлетная полоса
g.DrawRectangle(pen, _startPosX + 27, _startPosY + 75, 140, 25);
g.DrawRectangle(pen, _startPosX + 32, _startPosY + 87, 25, 5);
g.DrawRectangle(pen, _startPosX + 82, _startPosY + 87, 25, 5);
g.DrawRectangle(pen, _startPosX + 132, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 32, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 82, _startPosY + 87, 25, 5);
g.FillRectangle(brYellow, _startPosX + 132, _startPosY + 87, 25, 5);
}
if (planeWarship.СontrolPlace)
{
g.FillEllipse(dopBrush, _startPosX + 127, _startPosY + 30, 10, 10);

3
Warship/Warship/DrawingWarship.cs
View File

@ -191,8 +191,7 @@ namespace AircraftCarrier
/// <returns></returns>
public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
{
return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY +
_shipHeight);
return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight);
}
}
}

4
Warship/Warship/EntityWarship.cs
View File

@ -26,7 +26,7 @@ namespace AircraftCarrier
/// <summary>
/// Шаг перемещения корабля
/// </summary>
public float Step => Speed * 5000 / Weight;
public float Step => Speed * 100 / Weight;
/// <summary>
/// Инициализация полей объекта-класса корабля
/// </summary>
@ -38,7 +38,7 @@ namespace AircraftCarrier
{
Random rnd = new Random();
Speed = speed <= 0 ? rnd.Next(50, 100) : speed;
Weight = weight <= 0 ? rnd.Next(20000, 30000) : weight;
Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
BodyColor = bodyColor;
}
}

7
Warship/Warship/FormMap.Designer.cs generated
View File

@ -144,6 +144,7 @@
//
// buttonCreateModif
//
this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonCreateModif.Location = new System.Drawing.Point(107, 382);
this.buttonCreateModif.Name = "buttonCreateModif";
this.buttonCreateModif.Size = new System.Drawing.Size(130, 23);
@ -157,11 +158,13 @@
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта"});
"Простая карта",
"Морская карта"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(8, 8);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
this.comboBoxSelectorMap.TabIndex = 8;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
//
// FormMap
//
@ -178,7 +181,7 @@
this.Controls.Add(this.buttonCreate);
this.Controls.Add(this.pictureBoxShip);
this.Name = "FormMap";
this.Text = "FormMap";
this.Text = "Карта";
((System.ComponentModel.ISupportInitialize)(this.pictureBoxShip)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();

9
Warship/Warship/FormMap.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -38,7 +39,7 @@ namespace AircraftCarrier
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
var ship = new DrawingWarship(rnd.Next(100, 300), rnd.Next(1000, 2000),
var ship = new DrawingWarship(rnd.Next(1000, 2000), rnd.Next(15000, 20000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(ship);
}
@ -77,7 +78,7 @@ namespace AircraftCarrier
private void ButtonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
var ship = new DrawingPlaneWarship(rnd.Next(100, 300), rnd.Next(1000, 2000),
var ship = new DrawingPlaneWarship(rnd.Next(1000, 2000), rnd.Next(15000, 20000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
@ -95,8 +96,10 @@ namespace AircraftCarrier
case "Простая карта":
_abstractMap = new SimpleMap();
break;
case "Морская карта":
_abstractMap = new SeaMap();
break;
}
}
}
}

1
Warship/Warship/FormShip.Designer.cs generated
View File

@ -144,6 +144,7 @@
//
// buttonCreateModif
//
this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonCreateModif.Location = new System.Drawing.Point(107, 382);
this.buttonCreateModif.Name = "buttonCreateModif";
this.buttonCreateModif.Size = new System.Drawing.Size(130, 23);

4
Warship/Warship/FormShip.cs
View File

@ -36,7 +36,7 @@ namespace AircraftCarrier
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
_ship = new DrawingWarship(rnd.Next(50, 100), rnd.Next(20000, 30000),
_ship = new DrawingWarship(rnd.Next(1000, 3000), rnd.Next(10000, 20000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
Setdata();
Draw();
@ -76,7 +76,7 @@ namespace AircraftCarrier
private void ButtonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
_ship = new DrawingPlaneWarship(rnd.Next(50, 100), rnd.Next(20000, 30000),
_ship = new DrawingPlaneWarship(rnd.Next(1000, 3000), rnd.Next(10000, 20000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0,256)),
Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,2)), Convert.ToBoolean(rnd.Next(0, 2)));

58
Warship/Warship/SeaMap.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace AircraftCarrier
{
internal class SeaMap : AbstractMap
{
/// <summary>
/// Цвет участка закрытого
/// </summary>
private readonly Brush barrierColor = new SolidBrush(Color.Red);
/// <summary>
/// Цвет участка открытого
/// </summary>
private readonly Brush roadColor = new SolidBrush(Color.Aqua);
protected override void DrawBarrierPart(Graphics g, int i, int j)
{
g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
}
protected override void DrawRoadPart(Graphics g, int i, int j)
{
g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
}
protected override void GenerateMap()
{
_map = new int[100, 105];
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
int counter = 0;
for (int i = 0; i < _map.GetLength(0); ++i)
{
for (int j = 0; j < _map.GetLength(1); ++j)
{
_map[i, j] = _freeRoad;
}
}
while (counter < 10)
{
int x = _random.Next(5, 95);
int y = _random.Next(5, 95);
if (_map[x, y] == _freeRoad)
{
_map[x, y] = _barrier;
_map[x - 1, y] = _barrier;
_map[x + 1, y] = _barrier;
_map[x, y - 1] = _barrier;
_map[x, y + 1] = _barrier;
counter++;
}
}
}
}
}

8
Warship/Warship/SimpleMap.cs
View File

@ -21,17 +21,15 @@ namespace AircraftCarrier
private readonly Brush roadColor = new SolidBrush(Color.Gray);
protected override void DrawBarrierPart(Graphics g, int i, int j)
{
g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
1), j * (_size_y + 1));
g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
}
protected override void DrawRoadPart(Graphics g, int i, int j)
{
g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +
1), j * (_size_y + 1));
g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
}
protected override void GenerateMap()
{
_map = new int[100, 100];
_map = new int[100, 105];
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
int counter = 0;