Fix sprites don't get rendered before 1st reallocation

#9
Antoshidza · Oct 4, 2023 · 9b8f41e · 9b8f41e
1 parent bac19bf
commit 9b8f41e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Rendering/Common/InstancedProperty.cs b/Rendering/Common/InstancedProperty.cs
@@ -31,12 +31,13 @@ internal class InstancedProperty : IDisposable
         /// <summary> Cached component type + system to retrieve <see cref="DynamicComponentTypeHandle"/> </summary>
         public ComponentType ComponentType { get; }
 
-        public InstancedProperty(in int propertyID, in int count, in int stride, in ComponentType componentType)
+        public InstancedProperty(in int propertyID, in int bufferLength, in int bufferStride, in ComponentType componentType, MaterialPropertyBlock materialPropertyBlock)
         {
             PropertyID = propertyID;
             ComponentType = componentType;
 
-            ComputeBuffer = new ComputeBuffer(count, stride, ComputeBufferType.Default, ComputeBufferMode.SubUpdates);
+            ComputeBuffer = new ComputeBuffer(bufferLength, bufferStride, ComputeBufferType.Default, ComputeBufferMode.SubUpdates);
+            materialPropertyBlock.SetBuffer(PropertyID, ComputeBuffer);
         }
 
 #if !NSPRITES_REACTIVE_DISABLE || !NSPRITES_STATIC_DISABLE
@@ -153,11 +154,11 @@ public void Complete()
         }
 
         /// <summary> Reallocate <see cref="ComputeBuffer"/> with new size and previous stride (tmp) and assign buffer to passed <see cref="MaterialPropertyBlock"/> </summary>
-        public void Reallocate(in int length, MaterialPropertyBlock materialPropertyBlock)
+        public void Reallocate(in int bufferLength, MaterialPropertyBlock materialPropertyBlock)
         {
             var stride = ComputeBuffer.stride;
             ComputeBuffer.Release();
-            ComputeBuffer = new ComputeBuffer(length, stride, ComputeBufferType.Default, ComputeBufferMode.SubUpdates);
+            ComputeBuffer = new ComputeBuffer(bufferLength, stride, ComputeBufferType.Default, ComputeBufferMode.SubUpdates);
             materialPropertyBlock.SetBuffer(PropertyID, ComputeBuffer);
         }
 

diff --git a/Rendering/Common/RenderArchetype.cs b/Rendering/Common/RenderArchetype.cs
@@ -204,7 +204,7 @@ public RenderArchetype(Material material, Mesh mesh, in Bounds bounds, IReadOnly
             ReactiveAndStaticAllocationCounter.Allocated = preallocatedSpace;
             _createdChunksIndexes_RNL = new ReusableNativeList<int>(0, Allocator.Persistent);
             _reorderedChunksIndexes_RNL = new ReusableNativeList<int>(0, Allocator.Persistent);
-            PointersProperty = new InstancedProperty(Shader.PropertyToID(PropertyPointer.PropertyName), preallocatedSpace, sizeof(int), ComponentType.ReadOnly<PropertyPointer>());
+            PointersProperty = new InstancedProperty(Shader.PropertyToID(PropertyPointer.PropertyName), preallocatedSpace, sizeof(int), ComponentType.ReadOnly<PropertyPointer>(), _materialPropertyBlock);
 #endif
 #if !NSPRITES_EACH_UPDATE_DISABLE
             _perEntityPropertiesSpaceCounter.Allocated = preallocatedSpace;
@@ -215,7 +215,7 @@ public RenderArchetype(Material material, Mesh mesh, in Bounds bounds, IReadOnly
             {
                 var propData = propertyDataSet[propIndex];
                 var propType = propertyMap[propData.PropertyID];
-                var prop = new InstancedProperty(propData.PropertyID, preallocatedSpace, UnsafeUtility.SizeOf(propType.GetManagedType()), propType);
+                var prop = new InstancedProperty(propData.PropertyID, preallocatedSpace, UnsafeUtility.SizeOf(propType.GetManagedType()), propType, _materialPropertyBlock);
 
                 PropertiesContainer.AddProperty(prop, propData.UpdateMode);
             }
@@ -527,7 +527,7 @@ void SyncManyByChunks(IEnumerable<InstancedProperty> props, in SystemData system
             }
 #endif
             // TODO: remove this, seems like it is never used, because `used` and `allocated` is always the same in EachUpdate logic
-            _perEntityPropertiesSpaceCounter.Used = _entityCount;
+            //_perEntityPropertiesSpaceCounter.Used = _entityCount;
 #endif
             #endregion
 

diff --git a/Rendering/Tests/PropertyContainerTests.cs b/Rendering/Tests/PropertyContainerTests.cs
@@ -21,7 +21,7 @@ public void PropertyContainerTestsSimplePasses()
         Assert.NotNull(container[PropertyUpdateMode.Reactive]);
         Assert.NotNull(container[PropertyUpdateMode.Static]);
 
-        var mockProperty = new InstancedProperty(0, 1, 4, default);
+        var mockProperty = new InstancedProperty(0, 1, 4, default, new());
 
         container.AddProperty(mockProperty, PropertyUpdateMode.EachUpdate);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.tonymax.nsprites",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "displayName": "NSprites",
   "description": "Entities sprite rendering system. Uses GPU instancing with compute buffers to draw entities as sprites.",
   "unity": "2022.2",