Update SFML.Net to CSFML/SFML 3

- Update all SFML modules to use the latest CSFML methods
- Switch to NET Analyzer from StyleCop

Author: eXpl0it3r

.editorconfig

@@ -17,6 +17,22 @@ indent_style = space
 indent_size = 4
 insert_final_newline = false
 trim_trailing_whitespace = true
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:warning
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = false:warning
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_methods = true:warning
+csharp_style_expression_bodied_constructors = true:warning
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_labels = no_change
 
 #########################
 # File Extension Settings
@@ -350,4 +366,7 @@ dotnet_diagnostic.IDE0130.severity = suggestion
 dotnet_diagnostic.IDE0060.severity = suggestion
 
 # CA1805: Do not initialize unnecessarily
-dotnet_diagnostic.CA1805.severity = warning
+dotnet_diagnostic.CA1805.severity = warning
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4

SFML.CodeStyle.props

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- This file contains code style configurations for projects. -->
-
+  
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

SFML.Module.props

@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSFML" Version="[2.6.1, 2.7)" />
+    <PackageReference Include="CSFML" Version="[3.0.0-rc.1, 3.1)" />
   </ItemGroup>
 
 </Project>

SFML.NuGet.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
-    <Version>2.6.0</Version>
+    <Version>3.0.0-rc.1</Version>
     <Authors>Laurent Gomila</Authors>
     <PackageTags>sfml sfml.net</PackageTags>
     <Copyright>Copyright © Laurent Gomila</Copyright>

SFML.sln

@@ -16,6 +16,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BBA7B74-E003-4D9B-826A-43BD6BA48111}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		SFML.Module.props = SFML.Module.props
+		SFML.NuGet.props = SFML.NuGet.props
+		SFML.CodeStyle.props = SFML.CodeStyle.props
 	EndProjectSection
 EndProject
 Global

examples/netcore/Program.cs

@@ -4,44 +4,43 @@
 using SFML.System;
 using SFML.Window;
 
-namespace netcore
+namespace netcore;
+
+internal class Program
 {
-    internal class Program
+    private static void Main()
     {
-        private static void Main()
+        var shape = new RectangleShape(new Vector2f(100, 100))
         {
-            var shape = new RectangleShape(new Vector2f(100, 100))
-            {
-                FillColor = Color.Black
-            };
-
-            var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
+            FillColor = Color.Black
+        };
 
-            var window = new RenderWindow(new VideoMode(800, 600), "SFML running in .NET Core");
-            window.Closed += (_, _) => window.Close();
+        var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
 
-            sound.Play();
+        var window = new RenderWindow(new VideoMode((800, 600)), "SFML running in .NET Core");
+        window.Closed += (_, _) => window.Close();
 
-            while (window.IsOpen)
-            {
-                window.DispatchEvents();
-                window.Clear(Color.White);
-                window.Draw(shape);
-                window.Display();
-            }
-        }
+        sound.Play();
 
-        private static SoundBuffer GenerateSineWave(double frequency, double volume, int seconds)
+        while (window.IsOpen)
         {
-            uint sampleRate = 44100;
-            var samples = new short[seconds * sampleRate];
+            window.DispatchEvents();
+            window.Clear(Color.White);
+            window.Draw(shape);
+            window.Display();
+        }
+    }
 
-            for (var i = 0; i < samples.Length; i++)
-            {
-                samples[i] = (short)(Math.Sin(frequency * (2 * Math.PI) * i / sampleRate) * volume * short.MaxValue);
-            }
+    private static SoundBuffer GenerateSineWave(double frequency, double volume, int seconds)
+    {
+        uint sampleRate = 44100;
+        var samples = new short[seconds * sampleRate];
 
-            return new SoundBuffer(samples, 1, sampleRate);
+        for (var i = 0; i < samples.Length; i++)
+        {
+            samples[i] = (short)(Math.Sin(frequency * (2 * Math.PI) * i / sampleRate) * volume * short.MaxValue);
         }
+
+        return new SoundBuffer(samples, 1, sampleRate, new SoundChannel[] { SoundChannel.Mono });
     }
 }

examples/netcore/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "netcore": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}

examples/opengl/OpenGL.cs

@@ -24,7 +24,7 @@ private static void Main()
             };
 
             // Create the main window
-            var window = new RenderWindow(new VideoMode(800, 600), "SFML graphics with OpenGL", Styles.Default, contextSettings);
+            var window = new RenderWindow(new VideoMode((800, 600)), "SFML graphics with OpenGL", Styles.Default, State.Windowed, contextSettings);
             window.SetVerticalSyncEnabled(true);
 
             // Initialize OpenTK
@@ -41,7 +41,7 @@ private static void Main()
             var background = new Sprite(new Texture("resources/background.jpg"));
 
             // Create a text to display on top of the OpenGL object
-            var text = new Text("SFML / OpenGL demo", new Font("resources/sansation.ttf"))
+            var text = new Text(new Font("resources/sansation.ttf"), "SFML / OpenGL demo")
             {
                 Position = new Vector2f(250, 450),
                 FillColor = new SFML.Graphics.Color(255, 255, 255, 170)
@@ -212,6 +212,6 @@ private static void OnKeyPressed(object sender, KeyEventArgs e)
         /// <summary>
         /// Function called when the window is resized
         /// </summary>
-        private static void OnResized(object sender, SizeEventArgs e) => GL.Viewport(0, 0, (int)e.Width, (int)e.Height);
+        private static void OnResized(object sender, SizeEventArgs e) => GL.Viewport(0, 0, (int)e.Size.X, (int)e.Size.Y);
     }
 }

examples/opengl/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "opengl": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}

examples/shader/Shader.cs

@@ -27,7 +27,7 @@ public void Draw(IRenderTarget target, RenderStates states)
             }
             else
             {
-                var error = new Text("Shader not\nsupported", Font)
+                var error = new Text(Font, "Shader not\nsupported")
                 {
                     Position = new Vector2f(320, 200),
                     CharacterSize = 36
@@ -78,7 +78,7 @@ internal class WaveBlur : Effect
         public WaveBlur() : base("wave + blur")
         {
             // Create the text
-            _text = new Text
+            _text = new Text(Font)
             {
                 DisplayedString = "Praesent suscipit augue in velit pulvinar hendrerit varius purus aliquam.\n" +
                                      "Mauris mi odio, bibendum quis fringilla a, laoreet vel orci. Proin vitae vulputate tortor.\n" +
@@ -98,7 +98,6 @@ public WaveBlur() : base("wave + blur")
                                      "Mauris ultricies dolor sed massa convallis sed aliquet augue fringilla.\n" +
                                      "Duis erat eros, porta in accumsan in, blandit quis sem.\n" +
                                      "In hac habitasse platea dictumst. Etiam fringilla est id odio dapibus sit amet semper dui laoreet.\n",
-                Font = Font,
                 CharacterSize = 22,
                 Position = new Vector2f(30, 20)
             };
@@ -178,7 +177,7 @@ internal class Edge : Effect
         public Edge() : base("edge post-effect")
         {
             // Create the off-screen surface
-            _surface = new RenderTexture(800, 600)
+            _surface = new RenderTexture((800, 600))
             {
                 Smooth = true
             };
@@ -203,7 +202,7 @@ public Edge() : base("edge post-effect")
             _entities = new Sprite[6];
             for (var i = 0; i < _entities.Length; ++i)
             {
-                _entities[i] = new Sprite(_entityTexture, new IntRect(96 * i, 0, 96, 96));
+                _entities[i] = new Sprite(_entityTexture, new IntRect((96 * i, 0), (96, 96)));
             }
 
             // Load the shader
@@ -263,7 +262,7 @@ internal static class Program
         private static void Main()
         {
             // Create the main window
-            var window = new RenderWindow(new VideoMode(800, 600), "SFML.Net Shader");
+            var window = new RenderWindow(new VideoMode((800, 600)), "SFML.Net Shader");
             window.SetVerticalSyncEnabled(true);
 
             // Setup event handlers
@@ -293,14 +292,14 @@ private static void Main()
             };
 
             // Create the description text
-            _description = new Text("Current effect: " + _effects[_current].Name, font, 20)
+            _description = new Text(font, "Current effect: " + _effects[_current].Name, 20)
             {
                 Position = new Vector2f(10, 530),
                 FillColor = new Color(80, 80, 80)
             };
 
             // Create the instructions text
-            var instructions = new Text("Press left and right arrows to change the current shader", font, 20)
+            var instructions = new Text(font, "Press left and right arrows to change the current shader", 20)
             {
                 Position = new Vector2f(280, 555),
                 FillColor = new Color(80, 80, 80)

examples/visualbasic/OpenGL.vb

@@ -20,7 +20,7 @@ Friend Module OpenGL
         }
 
         ' Create main window
-        window = New RenderWindow(New VideoMode(800, 600), "SFML graphics with OpenGL (Visual Basic)", Styles.Default, contextSettings)
+        window = New RenderWindow(New VideoMode((800, 600)), "SFML graphics with OpenGL (Visual Basic)", Styles.Default, State.Windowed, contextSettings)
         window.SetVerticalSyncEnabled(True)
 
         ' Initialize OpenTK
@@ -31,7 +31,7 @@ Friend Module OpenGL
         Dim background = New Sprite(New Texture("resources/background.jpg"))
 
         ' Create a text to display on top of the OpenGL object
-        Dim text = New Text("SFML / OpenGL demo", New Font("resources/sansation.ttf")) With {
+        Dim text = New Text(New Font("resources/sansation.ttf"), "SFML / OpenGL demo") With {
             .Position = New Vector2f(250, 450),
             .FillColor = New SFML.Graphics.Color(255, 255, 255, 170)
         }
@@ -196,7 +196,7 @@ Friend Module OpenGL
     ''' Function called when the window is resized
     ''' </summary>
     Public Sub App_Resized(sender As Object, e As SizeEventArgs) Handles window.Resized
-        GL.Viewport(0, 0, e.Width, e.Height)
+        GL.Viewport(0, 0, e.Size.X, e.Size.Y)
     End Sub
 
 End Module

examples/window/Program.cs

@@ -18,7 +18,7 @@ internal class SimpleWindow
     {
         public void Run()
         {
-            var mode = new SFML.Window.VideoMode(800, 600);
+            var mode = new SFML.Window.VideoMode((800, 600));
             var window = new SFML.Graphics.RenderWindow(mode, "SFML works!");
             window.KeyPressed += Window_KeyPressed;
 

src/SFML.Audio/Cone.cs

@@ -0,0 +1,64 @@
+using System.Runtime.InteropServices;
+using SFML.System;
+
+namespace SFML.Audio
+{
+    ////////////////////////////////////////////////////////////
+    /// <summary>
+    /// Structure defining the properties of a directional cone
+    /// <para/>
+    /// When set on the listener, sounds will play at gain 1 when
+    /// they are positioned within the inner angle of the cone.
+    /// Sounds will play at outerGain when they are positioned
+    /// outside the outer angle of the cone.
+    /// The gain declines linearly from 1 to outerGain as the
+    /// sound moves from the inner angle to the outer angle.
+    /// <para/>
+    /// When set on sound sources, they will play at gain 1 when the
+    /// listener is positioned within the inner angle of the cone.
+    /// Sounds will play at `outerGain` when the listener is
+    /// positioned outside the outer angle of the cone.
+    /// The gain declines linearly from 1 to outerGain as the
+    /// listener moves from the inner angle to the outer angle.
+    /// </summary>
+    ////////////////////////////////////////////////////////////
+    public struct Cone
+    {
+        /// <summary>Inner angle</summary>
+        public Angle InnerAngle;
+
+        /// <summary>Outer angle</summary>
+        public Angle OuterAngle;
+
+        /// <summary>Outer angle</summary>
+        public float OuterGain;
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MarshalData
+        {
+            public float InnerAngleDegrees;
+            public float OuterAngleDegrees;
+            public float OuterGain;
+        }
+
+        internal Cone(MarshalData data)
+        {
+            InnerAngle = Angle.FromDegrees(data.InnerAngleDegrees);
+            OuterAngle = Angle.FromDegrees(data.OuterAngleDegrees);
+            OuterGain = data.OuterGain;
+        }
+
+        // Return a marshalled version of the instance, that can directly be passed to the C API
+        internal MarshalData Marshal()
+        {
+            var data = new MarshalData
+            {
+                InnerAngleDegrees = InnerAngle.Degrees,
+                OuterAngleDegrees = OuterAngle.Degrees,
+                OuterGain = OuterGain
+            };
+
+            return data;
+        }
+    }
+}