diff --git a/examples/Examples.sln b/examples/Examples.sln index f34ec772..e03fbee5 100644 --- a/examples/Examples.sln +++ b/examples/Examples.sln @@ -1,8 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34902.65 MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{620580C3-9270-42C9-A2BF-4DA85B522831}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "opengl", "opengl\opengl.csproj", "{2FC1071D-4470-4704-B28E-29FF4DD432A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shader", "shader\shader.csproj", "{EBF44846-C2C9-4595-881F-FD3489C0828F}" @@ -27,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFML.Window", "..\src\SFML. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netcore", "netcore\netcore.csproj", "{93B8425A-AC40-4486-96AF-20027B738C09}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{620580C3-9270-42C9-A2BF-4DA85B522831}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/examples/netcore/Program.cs b/examples/netcore/Program.cs index dd7ea654..88e7666a 100644 --- a/examples/netcore/Program.cs +++ b/examples/netcore/Program.cs @@ -4,13 +4,10 @@ using SFML.System; using SFML.Window; - namespace netcore { class Program { - - static void Main(string[] args) { var shape = new RectangleShape(new Vector2f(100, 100)) diff --git a/examples/netcore/README.md b/examples/netcore/README.md index baaf71b6..cb4b9138 100644 --- a/examples/netcore/README.md +++ b/examples/netcore/README.md @@ -1,4 +1,5 @@ # SFML.Net running on .NET Core + This project showcases how SFML.Net can be run on .NET core with NuGet packages. To execute this example, just run `dotnet run` inside of this directory. diff --git a/examples/netcore/netcore.csproj b/examples/netcore/netcore.csproj index dba11550..ad1b8e2e 100644 --- a/examples/netcore/netcore.csproj +++ b/examples/netcore/netcore.csproj @@ -1,8 +1,8 @@ - + Exe - netcoreapp2.1 + net6.0 diff --git a/examples/opengl/opengl.csproj b/examples/opengl/opengl.csproj index 7f220e7b..7551f3ca 100644 --- a/examples/opengl/opengl.csproj +++ b/examples/opengl/opengl.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0 + net48 opengl opengl Debug;Release;_WINDOWS_;_LINUX_;_OSX_ - 2.4.2 + 2.5.1 diff --git a/examples/shader/shader.csproj b/examples/shader/shader.csproj index d9bc8319..257f7d05 100644 --- a/examples/shader/shader.csproj +++ b/examples/shader/shader.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0 + net48 shader shader Debug;Release;_WINDOWS_;_LINUX_;_OSX_ - 2.4.2 + 2.5.1 diff --git a/examples/sound/sound.csproj b/examples/sound/sound.csproj index 8c297813..bacc959e 100644 --- a/examples/sound/sound.csproj +++ b/examples/sound/sound.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0 + net48 sound sound Debug;Release;_WINDOWS_;_LINUX_;_OSX_ - 2.4.2 + 2.5.1 diff --git a/examples/sound_capture/sound_capture.csproj b/examples/sound_capture/sound_capture.csproj index 249ef67d..d598a46a 100644 --- a/examples/sound_capture/sound_capture.csproj +++ b/examples/sound_capture/sound_capture.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0 + net48 sound_capture sound_capture Debug;Release;_WINDOWS_;_LINUX_;_OSX_ - 2.4.2 + 2.5.1 diff --git a/examples/visualbasic/My Project/Application.Designer.vb b/examples/visualbasic/My Project/Application.Designer.vb index 6d75675f..88dd01c7 100644 --- a/examples/visualbasic/My Project/Application.Designer.vb +++ b/examples/visualbasic/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:2.0.50727.3053 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/examples/visualbasic/My Project/Resources.Designer.vb b/examples/visualbasic/My Project/Resources.Designer.vb index 2f3fd6f1..e738ea55 100644 --- a/examples/visualbasic/My Project/Resources.Designer.vb +++ b/examples/visualbasic/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:2.0.50727.3053 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ diff --git a/examples/visualbasic/My Project/Settings.Designer.vb b/examples/visualbasic/My Project/Settings.Designer.vb index cd2a65f5..7696185c 100644 --- a/examples/visualbasic/My Project/Settings.Designer.vb +++ b/examples/visualbasic/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:2.0.50727.3053 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -15,12 +15,12 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings),MySettings) + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) #Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/examples/visualbasic/OpenGL.vb b/examples/visualbasic/OpenGL.vb index 90655fe0..e590203f 100644 --- a/examples/visualbasic/OpenGL.vb +++ b/examples/visualbasic/OpenGL.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Runtime.InteropServices Imports SFML.System Imports SFML.Window @@ -7,7 +7,6 @@ Imports OpenTK Imports OpenTK.Graphics Imports OpenTk.Graphics.OpenGL - Module OpenGL Dim WithEvents window As RenderWindow @@ -35,7 +34,7 @@ Module OpenGL ' Create a text to display on top of the OpenGL object Dim text = New Text("SFML / OpenGL demo", New Font("resources/sansation.ttf")) text.Position = New Vector2f(250, 450) - text.Color = New Color(255, 255, 255, 170) + text.FillColor = New SFML.Graphics.Color(255, 255, 255, 170) ' Make it the active window for OpenGL calls window.SetActive(True) @@ -44,7 +43,7 @@ Module OpenGL ' We could directly use a SFML.Graphics.Texture as an OpenGL texture (with its Bind() member function), ' but here we want more control on it (generate mipmaps, ...) so we create a new one Dim texture = 0 - Using image = New Image("resources/texture.jpg") + Using image = New SFML.Graphics.Image("resources/texture.jpg") GL.GenTextures(1, texture) GL.BindTexture(TextureTarget.Texture2D, texture) GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, image.Size.X, image.Size.Y, 0, PixelFormat.Rgba, PixelType.UnsignedByte, image.Pixels) @@ -75,48 +74,48 @@ Module OpenGL ' Define a 3D cube (6 faces made of 2 triangles composed by 3 vertices) Dim cube = New Single() _ - { _ - -20, -20, -20, 0, 0, _ - -20, 20, -20, 1, 0, _ - -20, -20, 20, 0, 1, _ - -20, -20, 20, 0, 1, _ - -20, 20, -20, 1, 0, _ + { + -20, -20, -20, 0, 0, + -20, 20, -20, 1, 0, + -20, -20, 20, 0, 1, + -20, -20, 20, 0, 1, + -20, 20, -20, 1, 0, -20, 20, 20, 1, 1, _ - _ - 20, -20, -20, 0, 0, _ - 20, 20, -20, 1, 0, _ - 20, -20, 20, 0, 1, _ - 20, -20, 20, 0, 1, _ - 20, 20, -20, 1, 0, _ + _ + 20, -20, -20, 0, 0, + 20, 20, -20, 1, 0, + 20, -20, 20, 0, 1, + 20, -20, 20, 0, 1, + 20, 20, -20, 1, 0, 20, 20, 20, 1, 1, _ - _ - -20, -20, -20, 0, 0, _ - 20, -20, -20, 1, 0, _ - -20, -20, 20, 0, 1, _ - -20, -20, 20, 0, 1, _ - 20, -20, -20, 1, 0, _ + _ + -20, -20, -20, 0, 0, + 20, -20, -20, 1, 0, + -20, -20, 20, 0, 1, + -20, -20, 20, 0, 1, + 20, -20, -20, 1, 0, 20, -20, 20, 1, 1, _ - _ - -20, 20, -20, 0, 0, _ - 20, 20, -20, 1, 0, _ - -20, 20, 20, 0, 1, _ - -20, 20, 20, 0, 1, _ - 20, 20, -20, 1, 0, _ + _ + -20, 20, -20, 0, 0, + 20, 20, -20, 1, 0, + -20, 20, 20, 0, 1, + -20, 20, 20, 0, 1, + 20, 20, -20, 1, 0, 20, 20, 20, 1, 1, _ - _ - -20, -20, -20, 0, 0, _ - 20, -20, -20, 1, 0, _ - -20, 20, -20, 0, 1, _ - -20, 20, -20, 0, 1, _ - 20, -20, -20, 1, 0, _ + _ + -20, -20, -20, 0, 0, + 20, -20, -20, 1, 0, + -20, 20, -20, 0, 1, + -20, 20, -20, 0, 1, + 20, -20, -20, 1, 0, 20, 20, -20, 1, 1, _ - _ - -20, -20, 20, 0, 0, _ - 20, -20, 20, 1, 0, _ - -20, 20, 20, 0, 1, _ - -20, 20, 20, 0, 1, _ - 20, -20, 20, 1, 0, _ - 20, 20, 20, 1, 1 _ + _ + -20, -20, 20, 0, 0, + 20, -20, 20, 1, 0, + -20, 20, 20, 0, 1, + -20, 20, 20, 0, 1, + 20, -20, 20, 1, 0, + 20, 20, 20, 1, 1 } ' Enable position and texture coordinates vertex components diff --git a/examples/visualbasic/visualbasic.vbproj b/examples/visualbasic/visualbasic.vbproj index 41782ee2..84c50315 100644 --- a/examples/visualbasic/visualbasic.vbproj +++ b/examples/visualbasic/visualbasic.vbproj @@ -1,159 +1,79 @@ - - + - Debug - AnyCPU - 9.0.21022 - 2.0 - {98552080-F688-46B4-A2FF-1AC7C50ECBE8} + net48 WinExe visualbasic.OpenGL - visualbasic - visualbasic - 512 WindowsFormsWithCustomSubMain - v3.5 - On - Binary - Off - On + false + true + true - true - full - true - true .\ visualbasic.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - pdbonly false - true - true - bin\Release\ visualbasic.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - true - true - true .\ visualbasic.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - x64 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - true bin\x64\Release\ visualbasic.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - x64 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - true - true - true .\ visualbasic.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - x86 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - true bin\x86\Release\ visualbasic.xml - true - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - pdbonly - x86 + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 - - False - - - False - - - False - - - - - - - - - 3.5 - - - 3.5 - - - 3.5 - - + + - - - - - - - - - - - - - + True Application.myapp + True - + True True Resources.resx - + True Settings.settings True - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - + MyApplicationCodeGenerator Application.Designer.vb - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - + + + + + + + + + + + \ No newline at end of file diff --git a/examples/window/window.csproj b/examples/window/window.csproj index 3ad036e7..eade7f59 100644 --- a/examples/window/window.csproj +++ b/examples/window/window.csproj @@ -2,11 +2,11 @@ Exe - netcoreapp2.0 + net48 window window Debug;Release;_WINDOWS_;_LINUX_;_OSX_ - 2.4.2 + 2.5.1