Merge pull request #814 from thestonefox/fix/controller-initialise

thestonefox · web-flow · commit 85b16b06d4d2 · 2017-01-12T20:52:37.000Z
fix(SDK): run controller init code using Awake
diff --git a/Assets/VRTK/SDK/OculusVR/SDK_OculusVRController.cs b/Assets/VRTK/SDK/OculusVR/SDK_OculusVRController.cs
@@ -810,12 +810,6 @@ public override bool IsButtonTwoTouchedUpOnIndex(uint index)
             return IsButtonPressed(index, ButtonPressTypes.TouchUp, OVRInput.Touch.Two);
         }
 
-        [RuntimeInitializeOnLoadMethod]
-        private void Initialise()
-        {
-            SetTrackedControllerCaches(true);
-        }
-
         private void SetTrackedControllerCaches(bool forceRefresh = false)
         {
             if (forceRefresh)
diff --git a/Assets/VRTK/SDK/SteamVR/SDK_SteamVRController.cs b/Assets/VRTK/SDK/SteamVR/SDK_SteamVRController.cs
@@ -728,8 +728,7 @@ public override bool IsButtonTwoTouchedUpOnIndex(uint index)
             return false;
         }
 
-        [RuntimeInitializeOnLoadMethod]
-        private void Initialise()
+        private void Awake()
         {
             Assembly executingAssembly = Assembly.GetExecutingAssembly();
             Type eventClass = executingAssembly.GetType("SteamVR_Utils").GetNestedType("Event");

Original file line number	Diff line number	Diff line change
`@@ -810,12 +810,6 @@ public override bool IsButtonTwoTouchedUpOnIndex(uint index)`
`810`	`810`	`return IsButtonPressed(index, ButtonPressTypes.TouchUp, OVRInput.Touch.Two);`
`811`	`811`	`}`
`812`	`812`
`813`		`- [RuntimeInitializeOnLoadMethod]`
`814`		`- private void Initialise()`
`815`		`- {`
`816`		`- SetTrackedControllerCaches(true);`
`817`		`- }`
`818`		`-`
`819`	`813`	`private void SetTrackedControllerCaches(bool forceRefresh = false)`
`820`	`814`	`{`
`821`	`815`	`if (forceRefresh)`
Original file line number	Diff line number	Diff line change
`@@ -728,8 +728,7 @@ public override bool IsButtonTwoTouchedUpOnIndex(uint index)`
`728`	`728`	`return false;`
`729`	`729`	`}`
`730`	`730`
`731`		`- [RuntimeInitializeOnLoadMethod]`
`732`		`- private void Initialise()`
	`731`	`+ private void Awake()`
`733`	`732`	`{`
`734`	`733`	`Assembly executingAssembly = Assembly.GetExecutingAssembly();`
`735`	`734`	`Type eventClass = executingAssembly.GetType("SteamVR_Utils").GetNestedType("Event");`