Even further optimizations to dot stimuli

Author: JFrit

Assets/Scripts/DotStimulus/Dot.cs

@@ -6,9 +6,10 @@ namespace DotStimulus
     public class Dot
     {
         private readonly Vector2 _velocity;
-        private Vector3 _position;
+        public Vector3 Position { get; private set; }
+        private Vector3 _currentPosition;
         private Vector3 _oldPosition;
-        private readonly float _scale;
+        public readonly float scale;
         private readonly StimulusSettings _settings;
 
         private readonly float _apertureRadius;
@@ -18,14 +19,15 @@ public class Dot
         public Dot(Vector2 velocity, Vector3 startingPosition, StimulusSettings settings)
         {
             _velocity = velocity;
-            _position = startingPosition;
+            _currentPosition = startingPosition;
+            Position = _currentPosition;
             _settings = settings;
             _elapsedTime = 0;
 
             var dotSize = settings.dotSizeArcMinutes * Mathf.PI / (60 * 180) * settings.stimDepthMeters;
             _apertureRadius = Mathf.Tan(settings.apertureRadiusDegrees * Mathf.PI / 180) * settings.stimDepthMeters;
             _sqrApertureRadius = _apertureRadius * _apertureRadius;
-            _scale = dotSize;
+            scale = dotSize;
 
             // In case first update puts dot outside circle
             var randomPosition = Random.insideUnitCircle * _apertureRadius;
@@ -37,35 +39,26 @@ public void UpdateDot()
             if (_elapsedTime > Random.Range(_settings.minDotLifetime, _settings.maxDotLifetime))
             {
                 var randomPosition = Random.insideUnitCircle * _apertureRadius;
-                _position.x = randomPosition.x;
-                _position.z = randomPosition.y;
+                _currentPosition.x = randomPosition.x;
+                _currentPosition.z = randomPosition.y;
                 _elapsedTime = 0.0f;
             }
             else
             {
-                _position.x += _velocity.x * Time.deltaTime;
-                _position.z += _velocity.y * Time.deltaTime;
+                _currentPosition.x += _velocity.x * Time.deltaTime;
+                _currentPosition.z += _velocity.y * Time.deltaTime;
 
                 // Square magnitude used for efficiency
-                if (_position.sqrMagnitude > _sqrApertureRadius)
+                if (_currentPosition.sqrMagnitude > _sqrApertureRadius)
                 {
-                    _position.x = -_oldPosition.x;
-                    _position.z = -_oldPosition.z;
+                    _currentPosition.x = -_oldPosition.x;
+                    _currentPosition.z = -_oldPosition.z;
                 }
             }
 
+            Position = _currentPosition;
             _elapsedTime += Time.deltaTime;
-            _oldPosition = _position;
-        }
-
-        public Vector3 GetPosition()
-        {
-            return _position;
-        }
-    
-        public float GetScale()
-        {
-            return _scale;
+            _oldPosition = _currentPosition;
         }
     }
 }

Assets/Scripts/DotStimulus/DotManager.cs

@@ -39,13 +39,21 @@ public void Start()
             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();
-                _shaderData.UpdateMeshPropertiesBuffer(_dots, localStimulusToWorld, i);
+                _shaderData.UpdateMeshPropertiesBuffer(_dots, i);
             }
 
             var meshPropertiesBuffer = _shaderData.MeshPropertiesBuffer;

Assets/Scripts/DotStimulus/DotShaderData.cs

@@ -25,11 +25,15 @@ public DotShaderData(Mesh dotMesh, int numDots)
             ArgsBuffer.SetData(args);
         }
 
-        public void UpdateMeshPropertiesBuffer(Dot[] dots, Matrix4x4 stimulusCenterLocalToWorld, int i)
+        public void BufferLocalToWorld(Matrix4x4 stimulusCenterLocalToWorld, int i)
         {
-            MeshProps[i].LocalPosition = dots[i].GetPosition();
-            MeshProps[i].LocalScale = dots[i].GetScale();
-            MeshProps[i].ParentLocalToWorld = stimulusCenterLocalToWorld;
+            MeshProps[i].parentLocalToWorld = stimulusCenterLocalToWorld;
+        }
+
+        public void UpdateMeshPropertiesBuffer(Dot[] dots, int i)
+        {
+            MeshProps[i].localPosition = dots[i].Position;
+            MeshProps[i].localScale = dots[i].scale;
         }
 
         public void ClearBuffers()
@@ -42,9 +46,9 @@ public void ClearBuffers()
         }
 
         public struct MeshProperties {
-            public Vector3 LocalPosition;
-            public float LocalScale;
-            public Matrix4x4 ParentLocalToWorld;
+            public Vector3 localPosition;
+            public float localScale;
+            public Matrix4x4 parentLocalToWorld;
 
             public static int Size()
             {