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.

Sign up for GitHub

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

Jump to bottom

Add inbuilt Opengl renderer to window #922

Merged
merged 14 commits into from Feb 12, 2020
Merged

Add inbuilt Opengl renderer to window #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2db774b
add gl rendering widget
emmauss Feb 2, 2020
e3d0fe4
embed renderer into main window
emmauss Feb 2, 2020
579c4a7
add input
emmauss Feb 3, 2020
7047f01
fix mouse input
emmauss Feb 4, 2020
a66bf22
fix mouse coords
emmauss Feb 5, 2020
d409c5f
refresh game list after closing game, remove profiler method
emmauss Feb 6, 2020
7b7a462
rebase, hide game list progress bar while game is running
emmauss Feb 6, 2020
d54080c
Some bug fixes
Feb 6, 2020
f37c01f
add fullscreen, enable input on focus, disable aplha
emmauss Feb 6, 2020
4e1c747
addressed comments
emmauss Feb 6, 2020
6d04441
Disable transparency in the window
Feb 6, 2020
d8a4e22
fix fullscreen state, fix focus, addressed comments
emmauss Feb 7, 2020
eab5d58
nit
emmauss Feb 7, 2020
7e9ece5
addressed nit
emmauss Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Ryujinx.Audio/Ryujinx.Audio.csproj
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
<PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion Ryujinx.Common/Ryujinx.Common.csproj
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@

<ItemGroup>
<PackageReference Include="JsonPrettyPrinter" Version="1.0.1.1" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
<PackageReference Include="Utf8Json" Version="1.3.7" /><PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
<PackageReference Include="SharpFontCore" Version="0.1.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
<PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 10 additions & 1 deletion Ryujinx.sln
View file
Open in desktop
Expand Up @@ -32,7 +32,8 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Nvdec", "Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Debugger", "Ryujinx.Debugger\Ryujinx.Debugger.csproj", "{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Debugger", "Ryujinx.Debugger\Ryujinx.Debugger.csproj", "{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -170,6 +171,14 @@ Global
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Profile Release|Any CPU.Build.0 = Profile Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Release|Any CPU.Build.0 = Release|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Profile Debug|Any CPU.ActiveCfg = Profile Debug|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Profile Debug|Any CPU.Build.0 = Profile Debug|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Profile Release|Any CPU.ActiveCfg = Profile Release|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Profile Release|Any CPU.Build.0 = Profile Release|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
7 changes: 7 additions & 0 deletions Ryujinx/Program.cs
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
using Ryujinx.Configuration;
using Ryujinx.Debugger.Profiler;
using Ryujinx.Ui;
using OpenTK;
using System;
using System.IO;

Expand All @@ -12,6 +13,12 @@ class Program
{
static void Main(string[] args)
{
Toolkit.Init(new ToolkitOptions
{
Backend = PlatformBackend.PreferNative,
EnableHighResolution = true
});

Console.Title = "Ryujinx Console";

string systemPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
Expand Down
3 changes: 2 additions & 1 deletion Ryujinx/Ryujinx.csproj
View file
Open in desktop
Expand Up @@ -72,9 +72,10 @@

<ItemGroup>
<PackageReference Include="DiscordRichPresence" Version="1.0.147" />
<PackageReference Include="GLWidget" Version="1.0.0" />
<PackageReference Include="GtkSharp" Version="3.22.25.56" />
<PackageReference Include="GtkSharp.Dependencies" Version="1.1.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
<PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
</ItemGroup>

<ItemGroup>
Expand Down