SoundInstance changes, small updates in Sound and Texture2d loaders.

TestGame/TestGame.cs

@@ -47,6 +47,8 @@ public class TestGame : Game
         _uiLayer = new UiLayer();
         _worldLayer = new EntityLayer();
 
+        _testSoundInstance = _audioBackend!.CreateInstance(_testSound!);
+
         Input.AddInputMapping("play", new InputAction[] { new KeyInputAction(KeyboardKey.Spacebar) });
         Input.AddInputMapping("sprint", new InputAction[] { new KeyInputAction(KeyboardKey.LeftShift) });
         Input.AddInputMapping("toggle_fullscreen", new InputAction[] { new KeyInputAction(KeyboardKey.F11) });
@@ -64,6 +66,13 @@ public class TestGame : Game
     {
         while (_scene!.ShouldRun)
         {
+            if (Input.IsActionPressed("play"))
+            {
+                _testSoundInstance!.PitchVariation(0.9f, 1.1f)
+                    .VolumeVariation(0.98f, 1.02f);
+
+                _testSoundInstance!.Play();
+            }
             _scene.Update();
             _scene.BeginDraw();
             _scene.EndDraw();
@@ -77,6 +86,7 @@ public class TestGame : Game
     }
 
     private Sound? _testSound;
+    private SoundInstance? _testSoundInstance;
     private Font? _font;
     private FmodAudioBackend? _audioBackend;
     private Scene? _scene;

Voile/Source/Audio/AudioBackend.cs

@@ -11,8 +11,8 @@ namespace Voile.Audio
         public abstract float GetBusVolume(string busName);
 
         // SOUND
-        public abstract void PlaySound(Sound sound, string bus = "Master", float pitch = 1.0f, float volume = 1.0f);
+        public abstract void PlaySound(Sound sound, float pitch, float volume, string bus = "Master");
-        public void PlaySound(Sound sound, string bus = "Master") => PlaySound(sound, bus, default, default);
+        public void PlaySound(Sound sound, string bus = "Master") => PlaySound(sound, 1.0f, 1.0f, bus);
 
         public SoundInstance CreateInstance(Sound sound)
         {

Voile/Source/Audio/DummyAudioBackend.cs

@@ -37,7 +37,7 @@ namespace Voile.Audio
             return;
         }
 
-        public override void PlaySound(Sound sound, string bus = "Master", float pitch = 1, float volume = 1)
+        public override void PlaySound(Sound sound, float pitch, float volume, string bus = "Master")
         {
             return;
         }

Voile/Source/Audio/FmodAudioBackend.cs

@@ -1,5 +1,6 @@
 using FMOD;
 using System.Runtime.InteropServices;
+using Voile.Utils;
 
 namespace Voile.Audio
 {
@@ -15,8 +16,14 @@ namespace Voile.Audio
         }
         public override void Update() => _system.update();
 
-        public override void PlaySound(Sound sound, string bus = "Master", float pitch = 1, float volume = 1)
+        public override void PlaySound(Sound sound, float pitch, float volume, string bus = "Master")
         {
+            if (sound is null)
+            {
+                _logger.Error("Sound is null!");
+                return;
+            }
+
             int channels = 0;
 
             if (sound.Format == SoundFormat.Mono)
@@ -127,6 +134,7 @@ namespace Voile.Audio
             return _channelGroups[busName];
         }
 
+        private Logger _logger = new(nameof(FmodAudioBackend));
         private FMOD.System _system;
 
         // TODO: use a different key for the dictionary, paths are not good :( (waste of memory lol)

Voile/Source/Audio/SoundInstance.cs

@@ -2,6 +2,7 @@ namespace Voile.Audio
 {
     public class SoundInstance
     {
+        protected virtual Sound Sound => _sound;
         public SoundInstance(AudioBackend backend, Sound sound)
         {
             _backend = backend;
@@ -30,12 +31,7 @@ namespace Voile.Audio
 
         public void Play()
         {
-            _backend.PlaySound(GetSound(), _bus, _pitch, _volume);
+            _backend.PlaySound(Sound, _pitch, _volume, _bus);
-        }
-
-        protected virtual Sound GetSound()
-        {
-            return _sound;
         }
 
         private readonly AudioBackend _backend;

Voile/Source/Resources/Loaders/SoundLoader.cs

@@ -40,10 +40,12 @@ namespace Voile.Resources
                 audioData[i * 2 + 1] = b1;
             }
 
-            result = new Sound(path, audioData);
+            result = new Sound(path, audioData)
-            result.Format = (SoundFormat)vorbis.Channels - 1;
+            {
-            result.SampleRate = vorbis.SampleRate;
+                Format = (SoundFormat)vorbis.Channels - 1,
-            result.BufferSize = length;
+                SampleRate = vorbis.SampleRate,
+                BufferSize = length
+            };
 
             vorbis.Dispose();
             return result;

Voile/Source/Resources/Loaders/Texture2dLoader.cs

@@ -20,9 +20,11 @@ namespace Voile
                 image = ImageResult.FromStream(stream, ColorComponents.RedGreenBlueAlpha);
             }
 
-            Texture2d result = new Texture2d(path, image.Data);
+            Texture2d result = new(path, image.Data)
-            result.Width = image.Width;
+            {
-            result.Height = image.Height;
+                Width = image.Width,
+                Height = image.Height
+            };
 
             return result;
         }

Voile/Source/Resources/Resource.cs

@@ -4,6 +4,8 @@ namespace Voile
 {
     public abstract class Resource : IDisposable
     {
+        public Guid Guid { get; set; } = Guid.NewGuid();
+
         public string? Path { get => _path; set => _path = value; }
 
         [JsonIgnore]
@@ -16,6 +18,8 @@ namespace Voile
         {
             _path = path;
             _buffer = buffer;
+
+            BufferSize = buffer.Length;
         }
 
         public void Dispose()