unitycoder
diff --git a/‎Source/Assets/TouchScript/Scripts/TouchManagerInstance.cs‎
Lines changed: 18 additions & 11 deletions b/‎Source/Assets/TouchScript/Scripts/TouchManagerInstance.cs‎
Lines changed: 18 additions & 11 deletions
@@ -5,7 +5,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using TouchScript.Devices.Display;
 using TouchScript.Hit;
 using TouchScript.InputSources;
@@ -192,7 +191,9 @@ public IList<TouchPoint> ActiveTouches
         private float dotsPerCentimeter = TouchManager.CM_TO_INCH * 96;
 
         private List<TouchLayer> layers = new List<TouchLayer>(10);
+        private int layerCount = 0;
         private List<IInputSource> inputs = new List<IInputSource>(3);
+        private int inputCount = 0;
 
         private List<TouchPoint> touches = new List<TouchPoint>(30);
         private Dictionary<int, TouchPoint> idToTouch = new Dictionary<int, TouchPoint>(30);
@@ -235,24 +236,29 @@ public bool AddLayer(TouchLayer layer, int index, bool addIfExists = true)
             {
                 if (!addIfExists) return false;
                 layers.RemoveAt(i);
+                layerCount--;
             }
             if (index <= 0)
             {
                 layers.Insert(0, layer);
+                layerCount++;
                 return i == -1;
             }
-            if (index >= layers.Count)
+            if (index >= layerCount)
             {
                 layers.Add(layer);
+                layerCount++;
                 return i == -1;
             }
             if (i != -1)
             {
                 if (index < i) layers.Insert(index, layer);
                 else layers.Insert(index - 1, layer);
+                layerCount++;
                 return false;
             }
             layers.Insert(index, layer);
+            layerCount++;
             return true;
         }
 
@@ -261,14 +267,15 @@ public bool RemoveLayer(TouchLayer layer)
         {
             if (layer == null) return false;
             var result = layers.Remove(layer);
+            if (result) layerCount--;
             return result;
         }
 
         /// <inheritdoc />
         public void ChangeLayerIndex(int at, int to)
         {
-            if (at < 0 || at >= layers.Count) return;
-            if (to < 0 || to >= layers.Count) return;
+            if (at < 0 || at >= layerCount) return;
+            if (to < 0 || to >= layerCount) return;
             var data = layers[at];
             layers.RemoveAt(at);
             layers.Insert(to, data);
@@ -280,6 +287,7 @@ public bool AddInput(IInputSource input)
             if (input == null) return false;
             if (inputs.Contains(input)) return true;
             inputs.Add(input);
+            inputCount++;
             return true;
         }
 
@@ -288,6 +296,7 @@ public bool RemoveInput(IInputSource input)
         {
             if (input == null) return false;
             var result = inputs.Remove(input);
+            if (result) inputCount--;
             return result;
         }
 
@@ -313,8 +322,7 @@ public bool GetHitTarget(Vector2 position, out TouchHit hit, out TouchLayer laye
             hit = default(TouchHit);
             layer = null;
 
-            var count = layers.Count;
-            for (var i = 0; i < count; i++)
+            for (var i = 0; i < layerCount; i++)
             {
                 var touchLayer = layers[i];
                 if (touchLayer == null) continue;
@@ -545,11 +553,12 @@ private void updateLayers()
         {
             // filter empty layers
             layers = layers.FindAll(l => l != null);
+            layerCount = layers.Count;
         }
 
         private void createCameraLayer()
         {
-            if (layers.Count == 0 && shouldCreateCameraLayer)
+            if (layerCount == 0 && shouldCreateCameraLayer)
             {
                 if (Camera.main != null)
                 {
@@ -564,7 +573,7 @@ private void createCameraLayer()
 
         private void createTouchInput()
         {
-            if (inputs.Count == 0 && shouldCreateStandardInput)
+            if (inputCount == 0 && shouldCreateStandardInput)
             {
                 if (Application.isEditor)
                     Debug.Log("[TouchScript] No input source found, adding StandardInput. (this message is harmless)");
@@ -585,14 +594,12 @@ private void createTouchInput()
 
         private void updateInputs()
         {
-            var count = inputs.Count;
-            for (var i = 0; i < count; i++) inputs[i].UpdateInput();
+            for (var i = 0; i < inputCount; i++) inputs[i].UpdateInput();
         }
 
         private void updateBegan(List<TouchPoint> points)
         {
             var count = points.Count;
-            var layerCount = layers.Count;
             for (var i = 0; i < count; i++)
             {
                 var touch = points[i];
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections;`
`7`	`7`	`using System.Collections.Generic;`
`8`		`-using System.Linq;`
`9`	`8`	`using TouchScript.Devices.Display;`
`10`	`9`	`using TouchScript.Hit;`
`11`	`10`	`using TouchScript.InputSources;`
`@@ -192,7 +191,9 @@ public IList<TouchPoint> ActiveTouches`
`192`	`191`	`private float dotsPerCentimeter = TouchManager.CM_TO_INCH * 96;`
`193`	`192`
`194`	`193`	`private List<TouchLayer> layers = new List<TouchLayer>(10);`
	`194`	`+ private int layerCount = 0;`
`195`	`195`	`private List<IInputSource> inputs = new List<IInputSource>(3);`
	`196`	`+ private int inputCount = 0;`
`196`	`197`
`197`	`198`	`private List<TouchPoint> touches = new List<TouchPoint>(30);`
`198`	`199`	`private Dictionary<int, TouchPoint> idToTouch = new Dictionary<int, TouchPoint>(30);`
`@@ -235,24 +236,29 @@ public bool AddLayer(TouchLayer layer, int index, bool addIfExists = true)`
`235`	`236`	`{`
`236`	`237`	`if (!addIfExists) return false;`
`237`	`238`	`layers.RemoveAt(i);`
	`239`	`+ layerCount--;`
`238`	`240`	`}`
`239`	`241`	`if (index <= 0)`
`240`	`242`	`{`
`241`	`243`	`layers.Insert(0, layer);`
	`244`	`+ layerCount++;`
`242`	`245`	`return i == -1;`
`243`	`246`	`}`
`244`		`- if (index >= layers.Count)`
	`247`	`+ if (index >= layerCount)`
`245`	`248`	`{`
`246`	`249`	`layers.Add(layer);`
	`250`	`+ layerCount++;`
`247`	`251`	`return i == -1;`
`248`	`252`	`}`
`249`	`253`	`if (i != -1)`
`250`	`254`	`{`
`251`	`255`	`if (index < i) layers.Insert(index, layer);`
`252`	`256`	`else layers.Insert(index - 1, layer);`
	`257`	`+ layerCount++;`
`253`	`258`	`return false;`
`254`	`259`	`}`
`255`	`260`	`layers.Insert(index, layer);`
	`261`	`+ layerCount++;`
`256`	`262`	`return true;`
`257`	`263`	`}`
`258`	`264`
`@@ -261,14 +267,15 @@ public bool RemoveLayer(TouchLayer layer)`
`261`	`267`	`{`
`262`	`268`	`if (layer == null) return false;`
`263`	`269`	`var result = layers.Remove(layer);`
	`270`	`+ if (result) layerCount--;`
`264`	`271`	`return result;`
`265`	`272`	`}`
`266`	`273`
`267`	`274`	`/// <inheritdoc />`
`268`	`275`	`public void ChangeLayerIndex(int at, int to)`
`269`	`276`	`{`
`270`		`- if (at < 0 \|\| at >= layers.Count) return;`
`271`		`- if (to < 0 \|\| to >= layers.Count) return;`
	`277`	`+ if (at < 0 \|\| at >= layerCount) return;`
	`278`	`+ if (to < 0 \|\| to >= layerCount) return;`
`272`	`279`	`var data = layers[at];`
`273`	`280`	`layers.RemoveAt(at);`
`274`	`281`	`layers.Insert(to, data);`
`@@ -280,6 +287,7 @@ public bool AddInput(IInputSource input)`
`280`	`287`	`if (input == null) return false;`
`281`	`288`	`if (inputs.Contains(input)) return true;`
`282`	`289`	`inputs.Add(input);`
	`290`	`+ inputCount++;`
`283`	`291`	`return true;`
`284`	`292`	`}`
`285`	`293`
`@@ -288,6 +296,7 @@ public bool RemoveInput(IInputSource input)`
`288`	`296`	`{`
`289`	`297`	`if (input == null) return false;`
`290`	`298`	`var result = inputs.Remove(input);`
	`299`	`+ if (result) inputCount--;`
`291`	`300`	`return result;`
`292`	`301`	`}`
`293`	`302`
`@@ -313,8 +322,7 @@ public bool GetHitTarget(Vector2 position, out TouchHit hit, out TouchLayer laye`
`313`	`322`	`hit = default(TouchHit);`
`314`	`323`	`layer = null;`
`315`	`324`
`316`		`- var count = layers.Count;`
`317`		`- for (var i = 0; i < count; i++)`
	`325`	`+ for (var i = 0; i < layerCount; i++)`
`318`	`326`	`{`
`319`	`327`	`var touchLayer = layers[i];`
`320`	`328`	`if (touchLayer == null) continue;`
`@@ -545,11 +553,12 @@ private void updateLayers()`
`545`	`553`	`{`
`546`	`554`	`// filter empty layers`
`547`	`555`	`layers = layers.FindAll(l => l != null);`
	`556`	`+ layerCount = layers.Count;`
`548`	`557`	`}`
`549`	`558`
`550`	`559`	`private void createCameraLayer()`
`551`	`560`	`{`
`552`		`- if (layers.Count == 0 && shouldCreateCameraLayer)`
	`561`	`+ if (layerCount == 0 && shouldCreateCameraLayer)`
`553`	`562`	`{`
`554`	`563`	`if (Camera.main != null)`
`555`	`564`	`{`
`@@ -564,7 +573,7 @@ private void createCameraLayer()`
`564`	`573`
`565`	`574`	`private void createTouchInput()`
`566`	`575`	`{`
`567`		`- if (inputs.Count == 0 && shouldCreateStandardInput)`
	`576`	`+ if (inputCount == 0 && shouldCreateStandardInput)`
`568`	`577`	`{`
`569`	`578`	`if (Application.isEditor)`
`570`	`579`	`Debug.Log("[TouchScript] No input source found, adding StandardInput. (this message is harmless)");`
`@@ -585,14 +594,12 @@ private void createTouchInput()`
`585`	`594`
`586`	`595`	`private void updateInputs()`
`587`	`596`	`{`
`588`		`- var count = inputs.Count;`
`589`		`- for (var i = 0; i < count; i++) inputs[i].UpdateInput();`
	`597`	`+ for (var i = 0; i < inputCount; i++) inputs[i].UpdateInput();`
`590`	`598`	`}`
`591`	`599`
`592`	`600`	`private void updateBegan(List<TouchPoint> points)`
`593`	`601`	`{`
`594`	`602`	`var count = points.Count;`
`595`		`- var layerCount = layers.Count;`
`596`	`603`	`for (var i = 0; i < count; i++)`
`597`	`604`	`{`
`598`	`605`	`var touch = points[i];`