[Core] Fixes to handling of Guids from previous commit;

Author: LittleCodingFox

Engine/Core/Audio/AudioSystem.cs

@@ -280,7 +280,7 @@ public void Update()
                 {
                     if(samples == null || channels == 0 || bits == 0 || sampleRate == 0)
                     {
-                        Log.Debug($"[AudioSystem] Failed to load audio clip for {source.audioClip.Guid}");
+                        Log.Debug($"[AudioSystem] Failed to load audio clip for {source.audioClip.Guid.Guid}");
 
                         return;
                     }
@@ -428,7 +428,7 @@ internal CancellationTokenSource LoadAudioClip(AudioClip clip, AudioClipLoadHand
 
             if(stream == null)
             {
-                Log.Debug($"[AudioSystem] Failed to get audio stream for {clip.Guid}");
+                Log.Debug($"[AudioSystem] Failed to get audio stream for {clip.Guid.Guid}");
 
                 onFinish?.Invoke(default, 0, 0, 0);
 
@@ -471,7 +471,7 @@ void Finish()
         }
         catch (Exception e)
         {
-            Log.Debug($"[AudioClip] Failed to load audio clip {clip.Guid}: {e}");
+            Log.Debug($"[AudioClip] Failed to load audio clip {clip.Guid.Guid}: {e}");
         }
 
         return cts;

Engine/Core/Rendering/Mesh/MeshRenderer.cs

@@ -25,7 +25,7 @@ public sealed class MeshRenderer : Renderable, IComponentDisposable
 
     public void DisposeComponent()
     {
-        if(mesh != null && mesh.Guid == null)
+        if(mesh != null && mesh.Guid?.Guid == null)
         {
             mesh.Destroy();
         }

Engine/Core/Rendering/Texture/Texture.cs

@@ -622,7 +622,7 @@ public RawTextureData GetRawTextureData()
     {
         if(readbackData == null)
         {
-            Log.Error($"Texture {Guid} isn't readable (missing readback flag)");
+            Log.Error($"Texture {Guid.Guid} isn't readable (missing readback flag)");
 
             return null;
         }

Engine/Editor/EditorUtils.cs

@@ -405,7 +405,7 @@ public static void SaveAsset(IStapleAsset asset)
     {
         if(asset == null ||
             asset is not IGuidAsset guid ||
-            guid.Guid == null)
+            guid.Guid?.Guid == null)
         {
             return;
         }

Engine/Editor/Editors/Assets/MaterialEditor.cs

@@ -59,13 +59,13 @@ public override bool DrawProperty(Type fieldType, string name, Func<object> gett
                                 {
                                     if(newValue is Texture t)
                                     {
-                                        var guid = t.Guid;
+                                        var guid = t.Guid?.Guid;
 
                                         if(guid != null)
                                         {
-                                            parameter.Value.textureValue = guid.Guid;
+                                            parameter.Value.textureValue = guid;
 
-                                            cachedTextures.AddOrSetKey(guid.Guid, t);
+                                            cachedTextures.AddOrSetKey(guid, t);
                                         }
                                     }
                                     else

Engine/Editor/Editors/EditorGUI.cs

@@ -694,7 +694,7 @@ public static object ObjectPicker(Type type, string name, object current, string
             {
                 if(current is IGuidAsset g)
                 {
-                    return g.Guid;
+                    return g.Guid.Guid;
                 }
                 else
                 {

Engine/StapleCoreTests/Assets/AssetSerializationTests.cs

@@ -53,7 +53,7 @@ internal class StapleTypesAsset : IStapleAsset
 
         internal class SimplePathAsset : IGuidAsset
         {
-            private readonly GuidHasher guidhasher;
+            private readonly GuidHasher guidhasher = new();
 
             public GuidHasher Guid => guidhasher;
 
@@ -184,7 +184,7 @@ public void TestSerialize()
                 Assert.That(result.parameters[nameof(SimpleAsset.intValue)].value, Is.EqualTo(asset.intValue));
                 Assert.That(result.parameters[nameof(SimpleAsset.stringValue)].value, Is.EqualTo(asset.stringValue));
                 Assert.That(result.parameters[nameof(SimpleAsset.numbers)].value, Is.EqualTo(asset.numbers));
-                Assert.That(result.parameters[nameof(SimpleAsset.pathAsset)].value, Is.EqualTo(asset.pathAsset.Guid));
+                Assert.That(result.parameters[nameof(SimpleAsset.pathAsset)].value, Is.EqualTo(asset.pathAsset.Guid.Guid));
                 Assert.That(result.parameters[nameof(SimpleAsset.enumValue)].value, Is.EqualTo(asset.enumValue.ToString()));
             });