HTL-2IHIF-CSharp/ex-inh-03-shapes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor changes to Rectangle.cs and Square.cs

Browse source
This commit is contained in:
MarcUs7i 2025-03-14 14:25:20 +01:00
parent 4fc6f62b57
commit 1e62ef5688
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Shapes/Shapes/Rectangle.cs
View file

@ -1,4 +1,5 @@
using System.Numerics; using System.Numerics;
using SimpleDrawing;
namespace Shapes.Shapes; namespace Shapes.Shapes;
@ -27,13 +28,21 @@ public sealed class Rectangle : Shape
scale = Scale; scale = Scale;
} }
// TODO return LeoCanvas.DrawRectangle(new(position.X - scale.X/2, position.Y - scale.Y/2), new(scale.X, scale.Y));
return false;
} }
public override bool PointInShape(Vector2 mousePoint) public override bool PointInShape(Vector2 mousePoint)
{ {
// TODO float halfWidth = Scale.X / 2;
return false; float halfHeight = Scale.Y / 2;
float left = Position.X - halfWidth;
float right = Position.X + halfWidth;
float top = Position.Y - halfHeight;
float bottom = Position.Y + halfHeight;
// If point is inside shape
return mousePoint.X >= left && mousePoint.X <= right &&
mousePoint.Y >= top && mousePoint.Y <= bottom;
} }
} }

9
Shapes/Shapes/Square.cs
View file

@ -18,27 +18,24 @@ public sealed class Square : Shape
public override bool DrawSelf(Vector2 position = default, Vector2 scale = default) public override bool DrawSelf(Vector2 position = default, Vector2 scale = default)
{ {
if (position == default(Vector2)) if (position == default)
{ {
position = Position; position = Position;
} }
if (scale == default(Vector2)) if (scale == default)
{ {
scale = Scale; scale = Scale;
} }
// TODO return LeoCanvas.DrawRectangle(new(position.X - scale.X/2, position.Y - scale.Y/2), new(scale.X, scale.Y));
return LeoCanvas.DrawRectangle(new(position.X, position.Y), new(scale.X, scale.Y));
} }
public override bool PointInShape(Vector2 mousePoint) public override bool PointInShape(Vector2 mousePoint)
{ {
// Calculate half height & width
float halfWidth = Scale.X / 2; float halfWidth = Scale.X / 2;
float halfHeight = Scale.Y / 2; float halfHeight = Scale.Y / 2;
// Calculate
float left = Position.X - halfWidth; float left = Position.X - halfWidth;
float right = Position.X + halfWidth; float right = Position.X + halfWidth;
float top = Position.Y - halfHeight; float top = Position.Y - halfHeight;