large worlds engine compat refactor, change vector -> float
This commit is contained in:
@@ -70,7 +70,7 @@ namespace Game
|
||||
|
||||
|
||||
consoleBox.SetAnchorPreset(AnchorPresets.HorizontalStretchTop, true);
|
||||
//consoleBox.AnchorMax = new Vector2(1.0f, ConsoleHeight);
|
||||
//consoleBox.AnchorMax = new Float2(1.0f, ConsoleHeight);
|
||||
//consoleBox.Height = consoleSize.Y - fontHeight;
|
||||
|
||||
//consoleBox.HorizontalAlignment = TextAlignment.Near;
|
||||
@@ -84,7 +84,7 @@ namespace Game
|
||||
consoleBox.CaretFlashSpeed = 0;
|
||||
}
|
||||
|
||||
Vector2 locationFix = consoleBox.Location;
|
||||
Float2 locationFix = consoleBox.Location;
|
||||
UIControl parentControl = contentContainerControl.AddChild<UIControl>();
|
||||
parentControl.Name = "ConsoleContent";
|
||||
parentControl.Control = consoleBox;
|
||||
@@ -97,7 +97,7 @@ namespace Game
|
||||
consoleNotifyBox.HeightMultiplier = 0;
|
||||
consoleNotifyBox.Height = ConsoleNotifyLines * fontHeight;
|
||||
consoleNotifyBox.SetAnchorPreset(AnchorPresets.HorizontalStretchTop, true);
|
||||
//consoleBox.AnchorMax = new Vector2(1.0f, ConsoleHeight);
|
||||
//consoleBox.AnchorMax = new Float2(1.0f, ConsoleHeight);
|
||||
|
||||
//consoleBox.HorizontalAlignment = TextAlignment.Near;
|
||||
//consoleBox.VerticalAlignment = TextAlignment.Near;
|
||||
@@ -110,7 +110,7 @@ namespace Game
|
||||
consoleNotifyBox.CaretFlashSpeed = 0;
|
||||
}
|
||||
|
||||
Vector2 locationFix2 = consoleNotifyBox.Location;
|
||||
Float2 locationFix2 = consoleNotifyBox.Location;
|
||||
UIControl parentControl2 = Actor.AddChild<UIControl>();
|
||||
parentControl2.Name = "ConsoleNotifyContent";
|
||||
parentControl2.Control = consoleNotifyBox;
|
||||
@@ -122,7 +122,7 @@ namespace Game
|
||||
//consoleInputBox = new ConsoleInputTextBox(consoleBox, 0, consoleSize.Y - fontHeight, consoleSize.X, fontHeight);
|
||||
consoleInputBox = new ConsoleInputTextBox(consoleBox, 0, 0, 0, 0);
|
||||
consoleInputBox.SetAnchorPreset(AnchorPresets.HorizontalStretchTop, false);
|
||||
//consoleInputBox.Location = new Vector2(0, consoleSize.Y - fontHeight);
|
||||
//consoleInputBox.Location = new Float2(0, consoleSize.Y - fontHeight);
|
||||
consoleInputBox.Height = fontHeight;
|
||||
|
||||
consoleInputBox.Font = fontReference;
|
||||
@@ -137,7 +137,7 @@ namespace Game
|
||||
}
|
||||
|
||||
|
||||
Vector2 locationFix = consoleInputBox.Location;
|
||||
Float2 locationFix = consoleInputBox.Location;
|
||||
UIControl parentControl = contentContainerControl.AddChild<UIControl>();
|
||||
parentControl.Name = "ConsoleInput";
|
||||
parentControl.Control = consoleInputBox;
|
||||
@@ -227,7 +227,7 @@ namespace Game
|
||||
|
||||
// hide console by default, and close it instantly
|
||||
Console.Close();
|
||||
Vector2 rootlocation = rootControl.Control.Location;
|
||||
Float2 rootlocation = rootControl.Control.Location;
|
||||
rootlocation.Y = -rootControl.Control.Height;
|
||||
rootControl.Control.Location = rootlocation;
|
||||
|
||||
@@ -339,7 +339,7 @@ namespace Game
|
||||
else
|
||||
targetY = 0.0f;
|
||||
|
||||
Vector2 location = rootControl.Control.Location;
|
||||
Float2 location = rootControl.Control.Location;
|
||||
if (location.Y != targetY)
|
||||
{
|
||||
if (location.Y > targetY)
|
||||
|
||||
Reference in New Issue
Block a user