Even more optimization for dot stimuli, and bug fix

Author: JFrit

Assets/Scripts/DotStimulus/DotManager.cs

@@ -20,6 +20,7 @@ public class DotManager : MonoBehaviour
         private Bounds _bounds;
         private const float BoundsRange = 5.0f;
         private static readonly int ShaderProperties = Shader.PropertyToID("_Properties");
+        private static readonly int ParentLocalToWorld = Shader.PropertyToID("parentLocalToWorld");
 
         public void Awake()
         {
@@ -38,18 +39,9 @@ public void Start()
             localPosition = new Vector3(localPosition.x, localPosition.y, stimulusSettings.stimDepthMeters);
             worldTransform.localPosition = localPosition;
         }
-
-        public void OnEnable()
-        {
-            for (var i = 0; i < _dots.Length; i++)
-            {
-                _shaderData.BufferLocalToWorld(transform.localToWorldMatrix, i);
-            }
-        }
-
+        
         public void Update()
         {
-            var localStimulusToWorld = transform.localToWorldMatrix;
             for (var i = 0; i < _dots.Length; i++)
             {
                 _dots[i].UpdateDot();
@@ -59,6 +51,7 @@ public void Update()
             var meshPropertiesBuffer = _shaderData.MeshPropertiesBuffer;
             meshPropertiesBuffer.SetData(_shaderData.MeshProps);
             dotMeshMaterial.SetBuffer(ShaderProperties, meshPropertiesBuffer);
+            dotMeshMaterial.SetMatrix(ParentLocalToWorld, transform.localToWorldMatrix);
             Graphics.DrawMeshInstancedIndirect(dotMesh, 0, dotMeshMaterial, _bounds, _shaderData.ArgsBuffer);
         }
 

Assets/Scripts/DotStimulus/DotShaderData.cs

@@ -7,7 +7,7 @@ public class DotShaderData
         public MeshProperties[] MeshProps { get; }
         public ComputeBuffer MeshPropertiesBuffer { get; private set; }
         public ComputeBuffer ArgsBuffer { get; private set; }
-        
+
         public DotShaderData(Mesh dotMesh, int numDots)
         {
             MeshProps = new MeshProperties[numDots];
@@ -24,12 +24,7 @@ public DotShaderData(Mesh dotMesh, int numDots)
             ArgsBuffer = new ComputeBuffer(1, args.Length * sizeof(uint), ComputeBufferType.IndirectArguments);
             ArgsBuffer.SetData(args);
         }
-
-        public void BufferLocalToWorld(Matrix4x4 stimulusCenterLocalToWorld, int i)
-        {
-            MeshProps[i].parentLocalToWorld = stimulusCenterLocalToWorld;
-        }
-
+        
         public void UpdateMeshPropertiesBuffer(Dot[] dots, int i)
         {
             MeshProps[i].localPosition = dots[i].Position;
@@ -48,12 +43,10 @@ public void ClearBuffers()
         public struct MeshProperties {
             public Vector3 localPosition;
             public float localScale;
-            public Matrix4x4 parentLocalToWorld;
 
             public static int Size()
             {
-                return (sizeof(float) * 4 * 4) +
-                       (sizeof(float) * 4);
+                return (sizeof(float) * 4);
             }
         }
     }

Assets/Shaders/UnlitDotInstanceShader.shader

@@ -35,8 +35,8 @@
             struct MeshProperties {
                 float3 localPosition;
                 float localScale;
-                float4x4 parentLocalToWorld;
             };
+            uniform float4x4 parentLocalToWorld;
 
             StructuredBuffer<MeshProperties> _Properties;
 
@@ -63,7 +63,7 @@
                 const float4x4 localTransform =  mul(localPosition, localScale);
 
                 const float4x4 worldTransform =
-                    mul(_Properties[instanceID].parentLocalToWorld, localTransform);
+                    mul(parentLocalToWorld, localTransform);
 
                 const float4 pos = mul(worldTransform, v.vertex);
                 o.vertex = UnityWorldToClipPos(pos);