Virtualized grid view (#9)

* Added VirtualGridLayoutGroup
* Display app version

Assets/Scripts/Config/ApplicationSettings.cs

@@ -1,13 +1,12 @@
-using StlVault.Util;
-using StlVault.Util.Logging;
+using StlVault.Util.Logging;
 
 namespace StlVault.Config
 {
     internal class ApplicationSettings
     {
         public ushort UiScalePercent { get; set; } = 100;
-        public LogLevel LogLevel { get; set; } = LogLevel.Info;
-        public ushort ImportParallelism { get; set; } = 2;
+        public LogLevel LogLevel { get; set; } = LogLevel.Trace;
+        public ushort ImportParallelism { get; set; } = 1;
         public ushort PreviewJpegQuality { get; set; } = 70;
         public ushort PreviewResolution { get; set; } = 10;
         public ushort ScrollSensitivity { get; set; } = 150;

Assets/Scripts/Config/ImportFolderConfig.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using StlVault.Services;
 
 namespace StlVault.Config
 {

Assets/Scripts/Config/PreviewInfo.cs

@@ -1,11 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
 using StlVault.Services;
-using UnityEngine.Scripting;
 
 namespace StlVault.Config
 {

Assets/Scripts/Services/AppDataPreviewImageStore.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using StlVault.Config;
 using StlVault.Util.Logging;
 
 namespace StlVault.Services

Assets/Scripts/Services/IKnownItemStore.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace StlVault.Services
+namespace StlVault.Services
 {
 
 }

Assets/Scripts/Services/ILibrary.cs

@@ -1,8 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using StlVault.Config;
-using StlVault.Util;
-using StlVault.Util.Collections;
 using StlVault.ViewModels;
 using UnityEngine;
 

Assets/Scripts/Services/IPreviewBuilder.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using UnityEngine;
 
 namespace StlVault.Services

Assets/Scripts/Services/IPreviewImageStore.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace StlVault.Services
 {

Assets/Scripts/Services/IPreviewList.cs

@@ -1,5 +1,4 @@
 using System;
-using StlVault.Config;
 using StlVault.Util.Collections;
 using StlVault.ViewModels;
 

Assets/Scripts/Services/ITagIndex.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace StlVault.Services
 {

Assets/Scripts/Services/PreviewList.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
-using StlVault.Config;
 using StlVault.Util.Collections;
 using StlVault.ViewModels;
 

Assets/Scripts/Util/Collections/IReadOnlyObservableList.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using StlVault.Config;
 
 namespace StlVault.Util.Collections
 {

Assets/Scripts/Util/Collections/ObservableList.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.IO;
 using System.Linq;
 using static System.Collections.Specialized.NotifyCollectionChangedAction;
 using NotifyCollectionChangedAction = System.Collections.Specialized.NotifyCollectionChangedAction;

Assets/Scripts/Util/Collections/TrackingCollection.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using JetBrains.Annotations;

Assets/Scripts/Util/Stl/BinaryStl.cs

@@ -1,11 +1,16 @@
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
+using StlVault.Util.Logging;
+using ILogger = StlVault.Util.Logging.ILogger;
 
 namespace StlVault.Util.Stl
 {
     internal static class BinaryStl
     {
+        private static readonly ILogger Logger = UnityLogger.Instance;
+
         /// <summary>
         /// Determine whether this file is a binary stl format or not.
         /// </summary>
@@ -49,16 +54,25 @@ public static bool IsBinary(byte[] fileBytes)
         public static Facet[] FromBytes(byte[] fileBytes)
         {
             // Discard header
-            var facetCount = BitConverter.ToUInt32(fileBytes, 80);
-            var facets = new Facet[facetCount];
+            var dataFacetCount = BitConverter.ToUInt32(fileBytes, 80);
+            var calculatedCount = (uint) ((fileBytes.LongLength - 84) / 50);
 
+            if (dataFacetCount > calculatedCount)
+                throw new InvalidDataException("The facet count specified in the STL file is too big for the file!");
+
+            if (dataFacetCount != calculatedCount)
+                Logger.Warn("Calculated facet count and the one in STL file don't match up!");
+
+            var usedCount = Math.Min(dataFacetCount, calculatedCount);
+            var facets = new Facet[usedCount];
+
             unsafe
             {
                 fixed (byte* fileStart = fileBytes)
                 fixed (Facet* destination = facets)
                 {
                     var source = fileStart + 84;
-                    Unsafe.CopyBlockUnaligned(destination, source, facetCount * 50);
+                    Unsafe.CopyBlockUnaligned(destination, source, usedCount * 50);
                 }
             }
 

Assets/Scripts/Util/Stl/StlImporter.cs

@@ -2,6 +2,7 @@
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 using StlVault.Util.Unity;
+using Unity.Collections;
 using UnityEngine;
 using UnityEngine.Rendering;
 
@@ -64,20 +65,34 @@ private static async Task<Mesh> CreateMeshFromFacetsAsync(Facet[] facets, bool c
                 var mesh = new Mesh
                 {
                     name = fileName,
-                    indexFormat = IndexFormat.UInt32,
-                    vertices = vertices,
-                    normals = normals,
-                    triangles = triangles,
                     hideFlags = HideFlags.HideAndDontSave
                 };
+
+                var vertexCount = facets.Length * 3;
+
+                mesh.SetVertexBufferParams(
+                    vertexCount,
+                    new VertexAttributeDescriptor(VertexAttribute.Position, stream: 0),
+                    new VertexAttributeDescriptor(VertexAttribute.Normal, stream: 1)
+                );
+
+                mesh.SetVertexBufferData(vertices, 0, 0, vertexCount, stream:0);
+                mesh.SetVertexBufferData(normals, 0, 0, vertexCount, stream:1);
 
+                mesh.SetIndexBufferParams(vertexCount, IndexFormat.UInt32);
+                mesh.SetIndexBufferData(triangles, 0, 0, vertexCount);
+
+                mesh.SetSubMesh(0, new SubMeshDescriptor(0, vertexCount));
+
+                mesh.RecalculateBounds();
+
                 if (centerVertices)
                 {
                     var currentCenter = mesh.bounds.center;
                     await Task.Run(() => CenterVertices(vertices, currentCenter))
                         .Timed("Centering vertices of {0}", fileName);
-
-                    mesh.vertices = vertices;
+                
+                    mesh.SetVertexBufferData(vertices, 0, 0, vertexCount, stream:0);
                     mesh.RecalculateBounds();
                 }
 
@@ -105,11 +120,10 @@ private static void CenterVertices(Vector3[] vertices, Vector3 correction)
         private static (Vector3[] vertices, Vector3[] normals, int[] triangles) BuildMesh(Facet[] facets)
         {
             var meshSize = facets.Length * 3;
-
-            var triangles = new int[meshSize];
             var vertices = new Vector3[meshSize];
             var normals = new Vector3[meshSize];
-
+            var triangles = new int[meshSize];
+
             void WriteFacet(int currentFacet)
             {
                 var i = currentFacet * 3;

Assets/Scripts/Util/Unity/AdaptiveTopPadding.cs

@@ -5,18 +5,18 @@
 
 namespace StlVault.Util.Unity
 {
-    [RequireComponent(typeof(GridLayoutGroup))]
     [RequireComponent(typeof(RectTransform))]
     public class AdaptiveTopPadding : MonoBehaviour
     {
         [SerializeField] private int _basePadding;
         [SerializeField] private RectTransform _paddingDriver;
-        private GridLayoutGroup _layoutGroup;
+
+        private LayoutGroup _layoutGroup;
         private RectTransform _rectTransform;
 
         private void Start()
         {
-            _layoutGroup = GetComponent<GridLayoutGroup>();
+            _layoutGroup = GetComponent<LayoutGroup>();
             _rectTransform = GetComponent<RectTransform>();
         }
 
@@ -25,6 +25,7 @@ public void Update()
             var newValue = _basePadding + (int) _paddingDriver.rect.height;
             if (_layoutGroup.padding.top == newValue) return;
             _layoutGroup.padding.top = newValue;
+
             LayoutRebuilder.MarkLayoutForRebuild(_rectTransform);
         }
     }

Assets/Scripts/Util/Unity/AppVersionDisplay.cs

@@ -0,0 +1,17 @@
+using TMPro;
+using UnityEngine;
+
+#pragma warning disable 0649
+
+namespace StlVault.Util.Unity
+{
+    public class AppVersionDisplay : MonoBehaviour
+    {
+        [SerializeField] private TMP_Text _text;
+
+        private void Start()
+        {
+            _text.text = "v" + Application.version;
+        }
+    }
+}

Assets/Scripts/Util/Unity/GuiCallbackQueue.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using UnityEngine;
 

Assets/Scripts/Views/ItemsView.cs → Assets/Scripts/Util/Unity/LibraryView.cs

@@ -1,15 +1,18 @@
-using StlVault.Util.Collections;
+using StlVault.Util.Collections;
 using StlVault.ViewModels;
+using StlVault.Views;
 using UnityEngine;
 
-namespace StlVault.Views
+namespace StlVault.Util.Unity
 {
-    internal class ItemsView : ContainerView<ItemsModel, ItemView, ItemPreviewModel>
+    internal class LibraryView : VirtualGridLayoutGroup<ItemsModel, ItemView, ItemPreviewModel>
     {
-        protected override IReadOnlyObservableList<ItemPreviewModel> ChildModels => ViewModel.Items;
-
-        private void Update()
+        protected override IReadOnlyObservableList<ItemPreviewModel> ChildModels => ViewModel?.Items;
+        
+        protected override void Update()
         {
+            if (ViewModel == null) return;
+
             var ctrl = Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl);
             if (ctrl && Input.GetKeyDown(KeyCode.A))
             {
@@ -23,6 +26,8 @@ private void Update()
 
             var shift = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
             ViewModel.SelectRange = shift;
+
+            base.Update();
         }
     }
 }