Merge pr220 'Fix for Oculus Quest Controllers'

lawwong · lawwong · commit 9f6d17736e89 · 2021-12-03T15:52:26.000+08:00
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs
@@ -163,6 +163,7 @@ public override void CreateCamera(VRCameraHook hook)
 #endif
 
 #if VIU_OCULUSVR_1_32_0_OR_NEWER || VIU_OCULUSVR_1_36_0_OR_NEWER || VIU_OCULUSVR_1_37_0_OR_NEWER
+#if VIU_OCULUSVR_AVATAR
         private class RenderModelCreator : RenderModelHook.RenderModelCreator
         {
             private uint m_index = INVALID_DEVICE_INDEX;
@@ -250,7 +251,7 @@ private bool IsHand()
                 return m_index == s_leftHandIndex || m_index == s_rightHandIndex;
             }
         }
-
+#endif
         private static OculusVRModule s_moduleInstance;
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public override void CreateCamera(VRCameraHook hook)`
`163`	`163`	`#endif`
`164`	`164`
`165`	`165`	`#if VIU_OCULUSVR_1_32_0_OR_NEWER \|\| VIU_OCULUSVR_1_36_0_OR_NEWER \|\| VIU_OCULUSVR_1_37_0_OR_NEWER`
	`166`	`+#if VIU_OCULUSVR_AVATAR`
`166`	`167`	`private class RenderModelCreator : RenderModelHook.RenderModelCreator`
`167`	`168`	`{`
`168`	`169`	`private uint m_index = INVALID_DEVICE_INDEX;`
`@@ -250,7 +251,7 @@ private bool IsHand()`
`250`	`251`	`return m_index == s_leftHandIndex \|\| m_index == s_rightHandIndex;`
`251`	`252`	`}`
`252`	`253`	`}`
`253`		`-`
	`254`	`+#endif`
`254`	`255`	`private static OculusVRModule s_moduleInstance;`
`255`	`256`	`#endif`
`256`	`257`