Change GetGameWindowSize to return game viewport size.
This commit is contained in:
@@ -1392,23 +1392,6 @@ namespace FlaxEditor
|
||||
}
|
||||
|
||||
internal void Internal_GetGameWindowSize(out Float2 result)
|
||||
{
|
||||
result = new Float2(1280, 720);
|
||||
var gameWin = Windows.GameWin;
|
||||
if (gameWin?.Root?.RootWindow is WindowRootControl root)
|
||||
{
|
||||
// Handle case when Game window is not selected in tab view
|
||||
var dockedTo = gameWin.ParentDockPanel;
|
||||
if (dockedTo != null && dockedTo.SelectedTab != gameWin && dockedTo.SelectedTab != null)
|
||||
result = dockedTo.SelectedTab.Size * root.DpiScale;
|
||||
else
|
||||
result = gameWin.Size * root.DpiScale;
|
||||
|
||||
result = Float2.Round(result);
|
||||
}
|
||||
}
|
||||
|
||||
internal void Internal_GetGameWindowViewportSize(out Float2 result)
|
||||
{
|
||||
result = new Float2(1280, 720);
|
||||
var gameWin = Windows.GameWin;
|
||||
|
||||
@@ -457,24 +457,6 @@ Float2 ManagedEditor::GetGameWindowSize()
|
||||
return Float2::Zero;
|
||||
}
|
||||
|
||||
Float2 ManagedEditor::GetGameWindowViewportSize()
|
||||
{
|
||||
if (HasManagedInstance())
|
||||
{
|
||||
if (Internal_GetGameWindowSize == nullptr)
|
||||
{
|
||||
Internal_GetGameWindowSize = GetClass()->GetMethod("Internal_GetGameWindowViewportSize", 1);
|
||||
ASSERT(Internal_GetGameWindowSize);
|
||||
}
|
||||
Float2 size;
|
||||
void* params[1];
|
||||
params[0] = &size;
|
||||
Internal_GetGameWindowSize->Invoke(GetManagedInstance(), params, nullptr);
|
||||
return size;
|
||||
}
|
||||
return Float2::Zero;
|
||||
}
|
||||
|
||||
bool ManagedEditor::OnAppExit()
|
||||
{
|
||||
if (!HasManagedInstance())
|
||||
|
||||
@@ -133,12 +133,6 @@ public:
|
||||
/// <returns>The size.</returns>
|
||||
Float2 GetGameWindowSize();
|
||||
|
||||
/// <summary>
|
||||
/// Gets the size of the game window viewport output.
|
||||
/// </summary>
|
||||
/// <returns>The size.</returns>
|
||||
Float2 GetGameWindowViewportSize();
|
||||
|
||||
/// <summary>
|
||||
/// Called when application code calls exit. Editor may end play mode or exit normally.
|
||||
/// </summary>
|
||||
|
||||
@@ -189,7 +189,7 @@ Viewport Camera::GetViewport() const
|
||||
#if USE_EDITOR
|
||||
// Editor
|
||||
if (Editor::Managed)
|
||||
result.Size = Editor::Managed->GetGameWindowViewportSize();
|
||||
result.Size = Editor::Managed->GetGameWindowSize();
|
||||
#else
|
||||
// game
|
||||
auto mainWin = Engine::MainWindow;
|
||||
|
||||
Reference in New Issue
Block a user