Initial work
This commit is contained in:
parent
f617fb542a
commit
1876b346fe
518 changed files with 15170 additions and 12486 deletions
|
@ -2,7 +2,7 @@ using OpenTK;
|
|||
using OpenTK.Graphics;
|
||||
using OpenTK.Input;
|
||||
using Ryujinx.Configuration;
|
||||
using Ryujinx.Graphics.Gal;
|
||||
using Ryujinx.Graphics.OpenGL;
|
||||
using Ryujinx.HLE;
|
||||
using Ryujinx.HLE.Input;
|
||||
using Ryujinx.Profiler.UI;
|
||||
|
@ -23,7 +23,7 @@ namespace Ryujinx.Ui
|
|||
|
||||
private Switch _device;
|
||||
|
||||
private IGalRenderer _renderer;
|
||||
private Renderer _renderer;
|
||||
|
||||
private HotkeyButtons _prevHotkeyButtons = 0;
|
||||
|
||||
|
@ -45,7 +45,7 @@ namespace Ryujinx.Ui
|
|||
private ProfileWindowManager _profileWindow;
|
||||
#endif
|
||||
|
||||
public GlScreen(Switch device, IGalRenderer renderer)
|
||||
public GlScreen(Switch device, Renderer renderer)
|
||||
: base(1280, 720,
|
||||
new GraphicsMode(), "Ryujinx", 0,
|
||||
DisplayDevice.Default, 3, 3,
|
||||
|
@ -59,7 +59,7 @@ namespace Ryujinx.Ui
|
|||
Location = new Point(
|
||||
(DisplayDevice.Default.Width / 2) - (Width / 2),
|
||||
(DisplayDevice.Default.Height / 2) - (Height / 2));
|
||||
|
||||
|
||||
#if USE_PROFILING
|
||||
// Start profile window, it will handle itself from there
|
||||
_profileWindow = new ProfileWindowManager();
|
||||
|
@ -70,6 +70,8 @@ namespace Ryujinx.Ui
|
|||
{
|
||||
MakeCurrent();
|
||||
|
||||
_renderer.InitializeCounters();
|
||||
|
||||
Stopwatch chrono = new Stopwatch();
|
||||
|
||||
chrono.Start();
|
||||
|
@ -85,13 +87,11 @@ namespace Ryujinx.Ui
|
|||
_device.ProcessFrame();
|
||||
}
|
||||
|
||||
_renderer.RunActions();
|
||||
|
||||
if (_resizeEvent)
|
||||
{
|
||||
_resizeEvent = false;
|
||||
|
||||
_renderer.RenderTarget.SetWindowSize(Width, Height);
|
||||
// TODO: Resize
|
||||
}
|
||||
|
||||
ticks += chrono.ElapsedTicks;
|
||||
|
@ -114,8 +114,6 @@ namespace Ryujinx.Ui
|
|||
|
||||
Visible = true;
|
||||
|
||||
_renderer.RenderTarget.SetWindowSize(Width, Height);
|
||||
|
||||
Context.MakeCurrent(null);
|
||||
|
||||
// OpenTK doesn't like sleeps in its thread, to avoid this a renderer thread is created
|
||||
|
@ -188,7 +186,7 @@ namespace Ryujinx.Ui
|
|||
Keys = new int[0x8]
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
currentButton |= _primaryController.GetButtons();
|
||||
|
||||
// Keyboard has priority stick-wise
|
||||
|
@ -296,7 +294,7 @@ namespace Ryujinx.Ui
|
|||
|
||||
private new void RenderFrame()
|
||||
{
|
||||
_renderer.RenderTarget.Render();
|
||||
_renderer.Window.Present();
|
||||
|
||||
_device.Statistics.RecordSystemFrameTime();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue