Skip to content

Port application to Silk.NET and .NET Core #16

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

Open
Nihlus wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Port application to Silk.NET and .NET Core #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a7ef40a
Remove unused usings.
Nihlus Apr 4, 2020
6d72880
Upgrade a number of nuget packages, and swap out GtkSharp.
Nihlus Apr 4, 2020
87dad57
Explicitly close the dialog.
Nihlus Apr 4, 2020
3021af9
Begin initial porting to Silk.NET.
Nihlus Apr 4, 2020
fc361c5
Port most of the graphics, and switch target over to netcoreapp3.1.
Nihlus Apr 4, 2020
6718666
Fix some nullability warnings.
Nihlus Apr 4, 2020
a757a96
Transition to using a hosted application model.
Nihlus Apr 4, 2020
df66a9c
Replace a number of obsolete methods.
Nihlus Apr 4, 2020
cd8b609
Convert mat4 into a mat3.
Nihlus Apr 4, 2020
9a281fc
Fix input.
Nihlus Apr 4, 2020
386ba50
Move builtin icon bindings to a dictionary instead of a case statement.
Nihlus Apr 5, 2020
418a4ad
Use "is null" instead of == null.
Nihlus Apr 5, 2020
b2e3642
Use "is null" instead of != null.
Nihlus Apr 5, 2020
40fa7dd
Remove redundant null check code.
Nihlus Apr 5, 2020
6c892f9
Invert a bunch of ifs and use using statements.
Nihlus Apr 5, 2020
7e7c882
More language usage opportunities.
Nihlus Apr 5, 2020
7ffce45
Upgrade libwarcraft.
Nihlus Apr 5, 2020
c8ffa76
Fix 3D movement.
Nihlus Apr 5, 2020
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
34 changes: 16 additions & 18 deletions .idea/.idea.Everlook/.idea/contentModel.xml
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions .idea/.idea.Everlook/.idea/dictionaries/jarl.xml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.2.0" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.2.1" PrivateAssets="all" />
</ItemGroup>

<!-- JetBrains Annotations -->
Expand Down
12 changes: 6 additions & 6 deletions Everlook.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Everlook", "Everlook\Everlo
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
Release|Any CPU = Release|Any CPU
Debug|Any CPU = Debug|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{64BD763C-024D-477A-B05C-57152FD612DF}.Debug|x86.ActiveCfg = Debug|x86
{64BD763C-024D-477A-B05C-57152FD612DF}.Debug|x86.Build.0 = Debug|x86
{64BD763C-024D-477A-B05C-57152FD612DF}.Release|x86.ActiveCfg = Release|x86
{64BD763C-024D-477A-B05C-57152FD612DF}.Release|x86.Build.0 = Release|x86
{64BD763C-024D-477A-B05C-57152FD612DF}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{64BD763C-024D-477A-B05C-57152FD612DF}.Release|Any CPU.Build.0 = Debug|Any CPU
{64BD763C-024D-477A-B05C-57152FD612DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64BD763C-024D-477A-B05C-57152FD612DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
EndGlobal
11 changes: 10 additions & 1 deletion Everlook.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_EXPRESSIONS/@EntryValue">CHOP_IF_LONG</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForBuiltInTypes/@EntryValue">UseExplicitType</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseExplicitType</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BLP/@EntryIndexedValue">BLP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BMP/@EntryIndexedValue">BMP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPP/@EntryIndexedValue">BPP</s:String>
Expand Down Expand Up @@ -83,9 +84,17 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Assimp/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Everlook/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fallbacks/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=GSETTINGS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gullberg/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=iter/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Jarl/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Listfile/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mipmaps/@EntryIndexedValue">True</s:Boolean>

<s:Boolean x:Key="/Default/UserDictionary/Words/=renderable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Verts/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rolloff/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=shaders/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unversioned/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Verts/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=wireframe/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion Everlook/Audio/AudioGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

using System;
using System.Collections.Generic;
using OpenTK;
using System.Numerics;

namespace Everlook.Audio
{
Expand Down
4 changes: 2 additions & 2 deletions Everlook/Audio/AudioManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

using System;
using System.Collections.Generic;
using OpenTK.Audio;
using Silk.NET.OpenAL;

namespace Everlook.Audio
{
Expand Down Expand Up @@ -79,7 +79,7 @@ public static void RegisterSource(AudioSource audioSource)
/// <param name="audioSource">The audio source to unregister.</param>
public static void UnregisterSource(AudioSource audioSource)
{
if (audioSource == null)
if (audioSource is null)
{
return;
}
Expand Down
Loading