Merge app/polar into develop

Examples/Complete/PointCloudPotree2/Core/PointCloudPotree2Core.cs

@@ -282,29 +282,17 @@ public void Update(bool allowInput)
 
             _camTransform.FpsView(_angleHorz, _angleVert, Input.Keyboard.WSAxis, Input.Keyboard.ADAxis, Time.DeltaTimeUpdate * 20);
 
-
             if (!_keys && Input.Mouse.RightButton && PointRenderMode == RenderMode.DynamicMesh)
             {
                 var size = RenderToTexture ? ExternalCanvasSize : new int2(_rc.ViewportWidth, _rc.ViewportHeight);
                 var mousePos = RenderToTexture ? ExternalMousePosition : Input.Mouse.Position;
-                var result = _picker?.Pick(mousePos, size.x, size.y).Where(x => x is PointCloudPickResult).Cast<PointCloudPickResult>();
+                var result = _picker?.Pick(mousePos, size.x, size.y).Where(x => x is PointCloudPickResult).Cast<PointCloudPickResult>().OrderBy(res => res.DistanceToRay);
                 if (result != null && result.Any())
                 {
                     var minElement = result.FirstOrDefault();
-
-                    // get min x/y distance point
-                    foreach (var r in result)
-                    {
-                        if (r.DistanceToRay.x < minElement.DistanceToRay.x && r.DistanceToRay.y < minElement.DistanceToRay.y)
-                        {
-                            minElement = r;
-                        }
-                    }
                     _pickResultTransform.Translation = minElement.Mesh.Vertices[minElement.VertIdx];
                 }
-
             }
-
         }
 
         private void OnThresholdChanged(int newValue)

src/Base/Core/MemoryCache.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Threading;
 
 namespace Fusee.Base.Core
 {
@@ -105,6 +106,7 @@ public class MemoryCache<TKey, TItem> : IDisposable
         private readonly MemoryCache _cache;
 
         private bool _disposed = false;
+        private readonly SemaphoreSlim _cacheLock = new(1);
 
         /// <summary>
         /// Creates a new instance and initializes the internal <see cref="MemoryCache"/>.
@@ -135,20 +137,26 @@ public bool TryGetValue(TKey key, out TItem item)
         /// </summary>
         /// <param name="key">The key of the cache item.</param>
         /// <param name="cacheEntry">The cache item.</param>
-        public void AddOrUpdate(TKey key, TItem cacheEntry)
+        public async void AddOrUpdate(TKey key, TItem cacheEntry)
         {
-            var cacheEntryOptions = new MemoryCacheEntryOptions()
-                .SetPriority(CacheItemPriority.High)
-                // Keep in cache for this time, reset time if accessed.
-                .SetSlidingExpiration(TimeSpan.FromSeconds(SlidingExpiration));
-
-            cacheEntryOptions.RegisterPostEvictionCallback((subkey, subValue, reason, state) =>
+            try
             {
-                HandleEvictedItem?.Invoke(subkey, subValue, reason, state);
-            });
+                await _cacheLock.WaitAsync();
+                var cacheEntryOptions = new MemoryCacheEntryOptions()
+                    .SetPriority(CacheItemPriority.High)
+                    // Keep in cache for this time, reset time if accessed.
+                    .SetSlidingExpiration(TimeSpan.FromSeconds(SlidingExpiration));
+
+                cacheEntryOptions.RegisterPostEvictionCallback((subkey, subValue, reason, state) =>
+                {
+                    HandleEvictedItem?.Invoke(subkey, subValue, reason, state);
+                });
+
+                // Key not in cache, so get data.
+                _cache.Set(key, cacheEntry, cacheEntryOptions);
 
-            // Key not in cache, so get data.
-            _cache.Set(key, cacheEntry, cacheEntryOptions);
+            }
+            finally { _cacheLock.Release(); }
         }
 
         /// <summary>

src/Engine/Common/IManagedInstanceData.cs

@@ -21,7 +21,7 @@ public interface IManagedInstanceData : IDisposable
         /// <summary>
         /// The unique id of the object.
         /// </summary>
-        public Suid SessionUniqueId
+        public Guid UniqueId
         {
             get;
         }

src/Engine/Common/IManagedMesh.cs

@@ -15,7 +15,7 @@ public interface IManagedMesh : IDisposable
         /// <summary>
         /// SessionUniqueIdentifier is used to verify a Mesh's uniqueness in the current session.
         /// </summary>
-        public Suid SessionUniqueIdentifier { get; }
+        public Guid UniqueIdentifier { get; }
 
         /// <summary>
         /// The primitive type this mesh is composed of.

src/Engine/Common/IMeshImp.cs

@@ -1,4 +1,6 @@
 using ProtoBuf;
+using System;
+
 namespace Fusee.Engine.Common
 {
     /// <summary>

src/Engine/Common/IRenderContextImp.cs

@@ -482,7 +482,7 @@ public interface IRenderContextImp
         /// </summary>
         /// <param name="instanceImp">The <see cref="IInstanceDataImp"/> instance.</param>
         /// <param name="instanceColors">The instance colors.</param>
-        public void SetInstanceColor(IInstanceDataImp instanceImp, float4[] instanceColors);
+        public void SetInstanceColor(IInstanceDataImp instanceImp, uint[] instanceColors);
 
         /// <summary>
         /// Binds the tangents onto the GL render context and assigns an TangentBuffer index to the passed <see cref="IMeshImp" /> instance.

src/Engine/Common/ITextureBase.cs

@@ -130,7 +130,7 @@ public interface ITextureBase : IDisposable
         /// <summary>
         /// SessionUniqueIdentifier is used to verify a Textures's uniqueness in the current session.
         /// </summary>
-        Suid SessionUniqueIdentifier { get; }
+        Guid UniqueIdentifier { get; }
 
         /// <summary>
         /// Defines if Mipmaps are generated for this texture.

src/Engine/Core/EffectManager.cs

@@ -1,5 +1,4 @@
-using Fusee.Base.Core;
-using Fusee.Engine.Common;
+using Fusee.Base.Core;
 using Fusee.Engine.Core.Effects;
 using System;
 using System.Collections.Generic;
@@ -10,15 +9,13 @@ internal class EffectManager
     {
         private readonly RenderContext _rc;
         private readonly Stack<Effect> _effectsToBeDeleted = new();
-        private readonly Dictionary<Suid, Effect> _allEffects = new();
+        private readonly Dictionary<Guid, Effect> _allEffects = new();
 
         private void EffectChanged(object? sender, EffectManagerEventArgs args)
         {
             if (args == null || sender == null) return;
 
-            var senderSF = sender as Effect;
-
-            if (senderSF == null)
+            if (sender is not Effect senderSF)
             {
                 Diagnostics.Warn("Casting changed effect to type Effect failed!");
                 return;
@@ -43,7 +40,7 @@ public void RegisterEffect(Effect ef)
             // Setup handler to observe changes of the mesh data and dispose event (deallocation)
             ef.EffectChanged += EffectChanged;
 
-            _allEffects.Add(ef.SessionUniqueIdentifier, ef);
+            _allEffects.Add(ef.UniqueIdentifier, ef);
         }
 
         /// <summary>
@@ -57,7 +54,7 @@ public EffectManager(RenderContext renderContextImp)
 
         public Effect? GetEffect(Effect ef)
         {
-            return _allEffects.TryGetValue(ef.SessionUniqueIdentifier, out var effect) ? effect : null;
+            return _allEffects.TryGetValue(ef.UniqueIdentifier, out var effect) ? effect : null;
         }
 
         /// <summary>
@@ -69,7 +66,7 @@ public void Cleanup()
             {
                 var tmPop = _effectsToBeDeleted.Pop();
                 // Remove one Effect from _allEffects
-                _allEffects.Remove(tmPop.SessionUniqueIdentifier);
+                _allEffects.Remove(tmPop.UniqueIdentifier);
                 // Remove one Effect from Memory
                 _rc.RemoveShader(tmPop);
             }

src/Engine/Core/Effects/Effect.cs

@@ -34,7 +34,7 @@
         /// <summary>
         /// SessionUniqueIdentifier is used to verify a Mesh's uniqueness in the current session.
         /// </summary>
-        public Suid SessionUniqueIdentifier { get; } = Suid.GenerateSuid();
+        public Guid UniqueIdentifier { get; } = Guid.NewGuid();
 
         private bool _disposed;
 
@@ -61,7 +61,7 @@
         {
             if (UniformParameters.ContainsKey(hash))
             {
                 if (!UniformParameters[hash].SetValue(value)) return;
 
                 EffectManagerEventArgs.Changed = UniformChangedEnum.Update;
                 EffectManagerEventArgs.ChangedUniformHash = hash;
@@ -84,7 +84,7 @@
             var hash = name.GetHashCode();
             if (UniformParameters.TryGetValue(hash, out var dcl))
             {
                 return ((FxParamDeclaration<T>)dcl).Value;
             }
             return default;
         }
@@ -108,7 +108,7 @@
             }
 
             // Return true if the fields match:
-            return (SessionUniqueIdentifier == p.SessionUniqueIdentifier);
+            return (UniqueIdentifier == p.UniqueIdentifier);
         }
 
         /// <summary>
@@ -124,7 +124,7 @@
             }
 
             // Return true if the fields match:
-            return (SessionUniqueIdentifier == p.SessionUniqueIdentifier);
+            return (UniqueIdentifier == p.UniqueIdentifier);
         }
 
         /// <summary>
@@ -133,7 +133,7 @@
         /// <returns>A hash code for the current object.</returns>
         public override int GetHashCode()
         {
-            return SessionUniqueIdentifier.GetHashCode();
+            return UniqueIdentifier.GetHashCode();
         }
 
         /// <summary>

src/Engine/Core/GpuMesh.cs

@@ -44,7 +44,7 @@ public class GpuMesh : SceneComponent, IManagedMesh
         /// <summary>
         /// SessionUniqueIdentifier is used to verify a Mesh's uniqueness in the current session.
         /// </summary>
-        public Suid SessionUniqueIdentifier { get; } = Suid.GenerateSuid();
+        public Guid UniqueIdentifier { get; } = Guid.NewGuid();
 
         /// <summary>
         /// Type of data of this mesh (e.g. Triangles, Points, Lines, etc.)

src/Engine/Core/LightResult.cs

@@ -1,6 +1,7 @@
 using Fusee.Engine.Common;
 using Fusee.Engine.Core.Scene;
 using Fusee.Math.Core;
+using System;
 
 namespace Fusee.Engine.Core
 {
@@ -50,7 +51,7 @@ public float4x4 Rotation
         /// <summary>
         /// The session unique identifier of tis LightResult.
         /// </summary>
-        public Suid Id;
+        public Guid Id;
 
         /// <summary>
         /// Creates a new instance of type LightResult.
@@ -61,7 +62,7 @@ public LightResult(Light light)
             Light = light;
             WorldSpacePos = float3.Zero;
             Rotation = float4x4.Identity;
-            Id = Suid.GenerateSuid();
+            Id = Guid.NewGuid();
         }
 
         /// <summary>
@@ -72,7 +73,7 @@ public LightResult()
             Light = new Light();
             WorldSpacePos = float3.Zero;
             Rotation = float4x4.Identity;
-            Id = Suid.GenerateSuid();
+            Id = Guid.NewGuid();
         }
 
         /// <summary>