Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Re:Fined Ultrawide Viewports to the Layout Editor #871

Merged
merged 1 commit into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions OpenKh.Tools.LayoutEditor/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ public bool ShowViewportRemix
}
}

public bool ShowViewportReFined
{
get => Settings.Default.ShowViewportReFined;
set
{
Settings.Default.ShowViewportReFined = value;
Settings.Default.Save();
}
}

public bool IsViewportOnTop
{
get => Settings.Default.IsViewportOnTop;
Expand Down Expand Up @@ -297,6 +307,7 @@ void MainMenu()

ForMenuCheck("Show PS2 viewport", () => ShowViewportOriginal, x => ShowViewportOriginal = x);
ForMenuCheck("Show ReMIX viewport", () => ShowViewportRemix, x => ShowViewportRemix = x);
ForMenuCheck("Show Re:Fined viewport", () => ShowViewportReFined, x => ShowViewportReFined = x);
ForMenuCheck("Viewport always on top", () => IsViewportOnTop, x => IsViewportOnTop = x);
});
ImGui.Separator();
Expand Down
17 changes: 16 additions & 1 deletion OpenKh.Tools.LayoutEditor/AppLayoutEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,32 @@ private void DrawGameViewport(ColorF backgroundColorInverse)
{
const float OriginalViewportWidth = 512f;
const float RemixViewportWidth = 684f;
const float ReFinedViewportWidthFirst = 970.6F;
const float ReFinedViewportWidthSecond = 1479F;
const float ViewportHeight = 416f;

if (_settings.ShowViewportOriginal)
_drawing.DrawRectangle(-1 + _renderer.PanFactorX, -1 + _renderer.PanFactorY, OriginalViewportWidth + 2, ViewportHeight + 2, backgroundColorInverse, 1);

if (_settings.ShowViewportRemix)
{
_drawing.DrawRectangle(
-(RemixViewportWidth - OriginalViewportWidth) / 2 - 1 + _renderer.PanFactorX, -1 + _renderer.PanFactorY,
RemixViewportWidth + 2, ViewportHeight + 2, backgroundColorInverse, 1);
}

if (_settings.ShowViewportReFined)
{
_drawing.DrawRectangle(
-(ReFinedViewportWidthFirst - OriginalViewportWidth) / 2 - 1 + _renderer.PanFactorX, -1 + _renderer.PanFactorY,
ReFinedViewportWidthFirst + 2, ViewportHeight + 2, backgroundColorInverse, 1);

_drawing.DrawRectangle(
-(ReFinedViewportWidthSecond - OriginalViewportWidth) / 2 - 1 + _renderer.PanFactorX, -1 + _renderer.PanFactorY,
ReFinedViewportWidthSecond + 2, ViewportHeight + 2, backgroundColorInverse, 1);
}

_drawing.Flush();
_drawing.Flush();
}

private unsafe void Timeline()
Expand Down
1 change: 1 addition & 0 deletions OpenKh.Tools.LayoutEditor/Interfaces/IEditorSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public interface IEditorSettings
ColorF EditorBackground { get; }
bool ShowViewportOriginal { get; }
bool ShowViewportRemix { get; }
bool ShowViewportReFined { get; }
bool IsViewportOnTop { get; }
}
}
19 changes: 17 additions & 2 deletions OpenKh.Tools.LayoutEditor/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading