daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2025-09-19 06:32:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Split main project into core,graphics and chocolarm4 subproject (#29)

Browse Source
This commit is contained in:
emmauss
2018-02-20 22:09:23 +02:00
committed by gdkchan
parent cb665bb715
commit 62b827f474
257 changed files with 415 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ryujinx/Ui/GLScreen.cs
View File

@@ -2,10 +2,11 @@
// to the Public Domain.
// It is provided "as is" without express or implied warranty of any kind.
using Gal;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Graphics.OpenGL;
using Ryujinx.Core;
using Ryujinx.Graphics.Gal;
using System;
namespace Ryujinx
@@ -346,7 +347,7 @@ void main(void) {
};
//We just need one pair of JoyCon because it's emulate by the keyboard.
Ns.Hid.SendControllerButtons(HidControllerID.CONTROLLER_HANDHELD, HidControllerLayouts.Main, CurrentButton, LeftJoystick, RightJoystick);
Ns.SendControllerButtons(HidControllerID.CONTROLLER_HANDHELD, HidControllerLayouts.Main, CurrentButton, LeftJoystick, RightJoystick);
}
protected override void OnRenderFrame(FrameEventArgs e)

13
Ryujinx/Ui/Program.cs
View File

@@ -1,5 +1,6 @@
using Gal;
using Gal.OpenGL;
using Ryujinx.Core;
using Ryujinx.Graphics.Gal;
using Ryujinx.Graphics.Gal.OpenGL;
using System;
using System.IO;
@@ -27,20 +28,20 @@ namespace Ryujinx
{
Logging.Info("Loading as cart with RomFS.");
Ns.Os.LoadCart(args[0], RomFsFiles[0]);
Ns.LoadCart(args[0], RomFsFiles[0]);
}
else
{
Logging.Info("Loading as cart WITHOUT RomFS.");
Ns.Os.LoadCart(args[0]);
Ns.LoadCart(args[0]);
}
}
else if (File.Exists(args[0]))
{
Logging.Info("Loading as homebrew.");
Ns.Os.LoadProgram(args[0]);
Ns.LoadProgram(args[0]);
}
}
else
@@ -58,7 +59,7 @@ namespace Ryujinx
Screen.Run(60.0);
}
Ns.Os.FinalizeAllProcesses();
Ns.FinalizeAllProcesses();
Ns.Dispose();
}