Small cleanup

This commit is contained in:
Michele 2020-11-02 08:43:17 +00:00
parent c6f9d61d2b
commit 65515ab1b7

View file

@ -268,48 +268,6 @@ namespace MyGame
panel.Widgets.Add(panel2);
panel2.Background = new SolidBrush(Color.DarkGray);
panel2.Layout2d = new Myra.Graphics2D.UI.Properties.Layout2D("this.w=200;this.h=W.h");
var grid = new Grid
{
RowSpacing = 8,
ColumnSpacing = 8
};
grid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
grid.ColumnsProportions.Add(new Proportion(ProportionType.Fill));
grid.RowsProportions.Add(new Proportion(ProportionType.Fill));
grid.RowsProportions.Add(new Proportion(ProportionType.Fill));
var helloWorld = new Label
{
Id = "label",
Text = "",
GridColumn = 1,
GridRow = 0
};
grid.Widgets.Add(helloWorld);
//var panel = new Panel {Width=100,Height=100, GridColumn=0,GridRow=1};
// ComboBox
//grid.Widgets.Add(panel);
// Button
var button = new TextButton
{
GridColumn = 0,
GridRow = 0,
Text = "Connect"
};
button.Click += async (s, a) =>
{
((TextButton)s).Text = "Connected";
};
grid.Widgets.Add(button);
var folderContent = Content.LoadContentFolder<Texture2D>("tiles");
var indexX = 0;
@ -376,29 +334,29 @@ namespace MyGame
_selectedTile.X = (mouseState.Position.X - (int)_viewportCenter.X) / _tileSize;
_selectedTile.Y = (mouseState.Position.Y - (int)_viewportCenter.Y) / _tileSize;
System.Console.WriteLine($"mouse {mouseState.Position.X} - {mouseState.Position.Y}");
System.Console.WriteLine($"topleft {_selectedTile.X * _tileSize} - {_selectedTile.Y * _tileSize}");
var leftWall = PointInTriangle(mouseState.Position,
new Point(_selectedTile.X * _tileSize, _selectedTile.Y * _tileSize),
new Point(_selectedTile.X * _tileSize, _selectedTile.Y * _tileSize + _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize+ _tileSize/2));
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize + _tileSize / 2));
var rightWall = PointInTriangle(mouseState.Position,
new Point(_selectedTile.X * _tileSize + _tileSize, _selectedTile.Y * _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize, _selectedTile.Y * _tileSize + _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize+ _tileSize/2));
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize + _tileSize / 2));
var topWall = PointInTriangle(mouseState.Position,
new Point(_selectedTile.X * _tileSize, _selectedTile.Y * _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize, _selectedTile.Y * _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize+ _tileSize/2));
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize + _tileSize / 2));
var bottomtWall = PointInTriangle(mouseState.Position,
new Point(_selectedTile.X * _tileSize, _selectedTile.Y * _tileSize + _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize, _selectedTile.Y * _tileSize + _tileSize),
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize+ _tileSize/2));
new Point(_selectedTile.X * _tileSize + _tileSize / 2, _selectedTile.Y * _tileSize + _tileSize / 2));
if (leftWall)
{
@ -420,8 +378,8 @@ namespace MyGame
}
else if (bottomtWall)
{
_selectedWall.X = _selectedTile.X ;
_selectedWall.Y = _selectedTile.Y+1;
_selectedWall.X = _selectedTile.X;
_selectedWall.Y = _selectedTile.Y + 1;
_selectedWall.Rotation = 0;
}