strwbrry/PIBD-13_Matvienko_S.D._Catamaran_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIBD-13 Matvienko S.D. Lab-1 Simple #1

Closed
strwbrry wants to merge 4 commits from Lab-1 into main
pull from: Lab-1
merge into: strwbrry:main
Conversation 1 Commits 4 Files Changed 16 +12 -5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f633bde48a - Show all commits

11
Catamaran/Catamaran/DrawingCatamaran.cs
View File

@ -23,10 +23,12 @@ namespace Catamaran
private readonly int _drawingCatamaranHeight = 60;
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool leftBobber, bool rightBobber, bool sail)
//public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool leftBobber, bool rightBobber, bool sail)
public void Init(EntityCatamaran entityCatamaran)
eegov commented 2024-03-02 11:20:02 +04:00
Review
Copy Link

Дополнительное задание в итоговый код не включается

Дополнительное задание в итоговый код не включается
{
EntityCatamaran = new EntityCatamaran();
EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, leftBobber, rightBobber, sail);
EntityCatamaran = entityCatamaran;
//EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, leftBobber, rightBobber, sail);
_pictureHeight = null;
_pictureWidth = null;
_startPosX = null;
@ -68,7 +70,8 @@ namespace Catamaran
{
_startPosX = x;
_startPosY = y;
if (_startPosX.Value < 0) _startPosX = 0;
if (_startPosY.Value < 0) _startPosY = 0;
if (_startPosX.Value + _drawingCatamaranWidth > _pictureWidth)
{
_startPosX = _pictureWidth - _drawingCatamaranWidth;

6
Catamaran/Catamaran/FormCatamaran.cs
View File

@ -14,6 +14,7 @@ namespace Catamaran
{
private DrawingCatamaran? _drawingCatamaran;
private EntityCatamaran? _entityCatamaran;
public FormCatamaran()
{
@ -34,10 +35,13 @@ namespace Catamaran
{
Random random = new();
_drawingCatamaran = new DrawingCatamaran();
_drawingCatamaran.Init(random.Next(100, 500), random.Next(1000, 3000),
_entityCatamaran = new EntityCatamaran();
_entityCatamaran.Init(random.Next(100, 500), 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)));
_drawingCatamaran.Init(_entityCatamaran);
_drawingCatamaran.SetPictureSize(pictureBox1.Width, pictureBox1.Height);
_drawingCatamaran.SetPosition(random.Next(10, 600), random.Next(10, 600));