Fix unable to show ovr render model component

lawwong · lawwong · commit 46f75594dd8d · 2022-02-14T18:04:50.000+08:00
Need manually update OVRInput
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatar.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatar.cs
@@ -31,13 +31,34 @@ public class VIUOvrAvatar : MonoBehaviour
 #else
         private bool forceMobileTextureFormat = false;
 #endif
+        [SerializeField]
+        private bool showHand = true;
+
+        [SerializeField]
+        private bool showController = true;
+
+        // if true, manual update OVRInput if OVRManager not found
+        [SerializeField]
+        private bool manualUpdateOVRInput = true;
 
         public bool isAvatarReady { get; private set; }
         public IntPtr sdkAvatar { get; private set; }
         public OvrAvatar ovrAvatar { get; private set; }
         public OvrAvatarLocalDriver ovrAvatarDriver { get; private set; }
         public OvrAvatarMaterialManager ovrMaterialManager { get; private set; }
 
+        public bool ShowHand
+        {
+            get { return showHand; }
+            set { showHand = value; }
+        }
+
+        public bool ShowController
+        {
+            get { return showController; }
+            set { showController = value; }
+        }
+
         public bool CombineMeshes
         {
             // not supported, VIU only render controller & hand
@@ -56,6 +77,14 @@ public bool ForceMobileTextureFormat
             set { forceMobileTextureFormat = value; }
         }
 
+        public bool ShouldManuallyUpdateOVRInput
+        {
+            get
+            {
+                return manualUpdateOVRInput && (OVRManager.instance == null || OVRManager.instance.isActiveAndEnabled);
+            }
+        }
+
         private void Start()
         {
             GetReady();
@@ -65,13 +94,40 @@ private void Update()
         {
             if (sdkAvatar == IntPtr.Zero) { return; }
 
+            CAPI.ovrAvatar_SetLeftControllerVisibility(sdkAvatar, showController);
+            CAPI.ovrAvatar_SetRightControllerVisibility(sdkAvatar, showController);
+            CAPI.ovrAvatar_SetLeftHandVisibility(sdkAvatar, showHand);
+            CAPI.ovrAvatar_SetRightHandVisibility(sdkAvatar, showHand);
+
+            if (ShouldManuallyUpdateOVRInput)
+            {
+                OVRInput.Update();
+            }
+
             if (ovrAvatarDriver != null)
             {
                 ovrAvatarDriver.UpdateTransforms(sdkAvatar);
                 CAPI.ovrAvatarPose_Finalize(sdkAvatar, Time.deltaTime);
             }
         }
 
+        private void FixedUpdate()
+        {
+            if (ShouldManuallyUpdateOVRInput)
+            {
+                OVRInput.FixedUpdate();
+            }
+        }
+
+        private void OnDestroy()
+        {
+            if (sdkAvatar != IntPtr.Zero)
+            {
+                CAPI.ovrAvatar_Destroy(sdkAvatar);
+                sdkAvatar = IntPtr.Zero;
+            }
+        }
+
         public void GetReady()
         {
             if (isAvatarReady) { return; }
@@ -127,12 +183,12 @@ public void GetReady()
         private void AvatarSpecificationCallback(IntPtr spec)
         {
             sdkAvatar = CAPI.ovrAvatar_Create(spec, ovrAvatarCapabilities.Hands);
-            CAPI.ovrAvatar_SetLeftControllerVisibility(sdkAvatar, true);
-            CAPI.ovrAvatar_SetRightControllerVisibility(sdkAvatar, true);
-            CAPI.ovrAvatar_SetLeftHandVisibility(sdkAvatar, true);
-            CAPI.ovrAvatar_SetRightHandVisibility(sdkAvatar, true);
-            ovrAvatarDriver.UpdateTransforms(sdkAvatar);
+            CAPI.ovrAvatar_SetLeftControllerVisibility(sdkAvatar, showController);
+            CAPI.ovrAvatar_SetRightControllerVisibility(sdkAvatar, showController);
+            CAPI.ovrAvatar_SetLeftHandVisibility(sdkAvatar, showHand);
+            CAPI.ovrAvatar_SetRightHandVisibility(sdkAvatar, showHand);
             ovrAvatar.sdkAvatar = sdkAvatar;
+            ovrAvatarDriver.UpdateTransforms(sdkAvatar);
 
             //Fetch all the assets that this avatar uses.
             var assetCount = CAPI.ovrAvatar_GetReferencedAssetCount(sdkAvatar);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatarComponent.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatarComponent.cs
@@ -38,120 +38,82 @@ private void Update()
 
             try
             {
-                if (ctrlComp == null)
+                var compData = default(ovrAvatarComponent);
+                var ctrlCompData = default(ovrAvatarControllerComponent);
+                var handCompData = default(ovrAvatarHandComponent);
+
+                if (TryGetCtrlComponent(owner.sdkAvatar, ref ctrlCompData, ref compData))
                 {
-                    var ctrlCompData = default(ovrAvatarControllerComponent);
-                    var ctrlCompDataBase = default(ovrAvatarComponent);
-                    if (TryGetCtrlComponent(owner.sdkAvatar, ref ctrlCompDataBase, ref ctrlCompData))
+                    if (ctrlComp == null)
                     {
-                        var goParent = new GameObject(ctrlCompDataBase.name);
+                        var goParent = new GameObject(compData.name);
                         goParent.transform.SetParent(transform, false);
                         ctrlComp = AddAvatarCtrlComp(goParent);
 
-                        for (uint i = 0, imax = ctrlCompDataBase.renderPartCount; i < imax; ++i)
+                        for (uint i = 0, imax = compData.renderPartCount; i < imax; ++i)
                         {
-                            var goPart = new GameObject(ctrlCompDataBase.name + "_renderPart_" + (int)i);
+                            var goPart = new GameObject(compData.name + "_renderPart_" + (int)i);
                             goPart.transform.SetParent(goParent.transform, false);
-                            IntPtr renderPart = OvrAvatar.GetRenderPart(ctrlCompDataBase, i);
+                            IntPtr renderPart = OvrAvatar.GetRenderPart(compData, i);
                             ovrAvatarRenderPartType type = CAPI.ovrAvatarRenderPart_GetType(renderPart);
-                            var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, ctrlCompDataBase, true);
+                            var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, compData, true);
                             if (ovrRenderPart != null)
                             {
                                 ctrlComp.RenderParts.Add(ovrRenderPart);
                             }
                         }
                     }
 
-                    PrintHierarchy(ctrlComp.transform, 0);
+                    UpdateAvatarCtrlComp(ctrlComp, ref ctrlCompData, ref compData);
                 }
 
-                UpdateAvatarCtrlComp(ctrlComp);
-
-                if (handComp == null)
+                if (TryGetHandComponent(owner.sdkAvatar, ref handCompData, ref compData))
                 {
-                    var handCompDataBase = default(ovrAvatarComponent);
-                    var handCompData = default(ovrAvatarHandComponent);
-                    if (TryGetHandComponent(owner.sdkAvatar, ref handCompDataBase, ref handCompData))
+                    if (handComp == null)
                     {
-                        var goParent = new GameObject(handCompDataBase.name);
+                        var goParent = new GameObject(compData.name);
                         goParent.transform.SetParent(transform, false);
                         handComp = AddAvatarHandComp(goParent);
 
-                        for (uint i = 0, imax = handCompDataBase.renderPartCount; i < imax; ++i)
+                        for (uint i = 0, imax = compData.renderPartCount; i < imax; ++i)
                         {
-                            var goPart = new GameObject(handCompDataBase.name + "_renderPart_" + (int)i);
+                            var goPart = new GameObject(compData.name + "_renderPart_" + (int)i);
                             goPart.transform.SetParent(goParent.transform, false);
-                            IntPtr renderPart = OvrAvatar.GetRenderPart(handCompDataBase, i);
+                            IntPtr renderPart = OvrAvatar.GetRenderPart(compData, i);
                             ovrAvatarRenderPartType type = CAPI.ovrAvatarRenderPart_GetType(renderPart);
-                            var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, handCompDataBase, false);
+                            var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, compData, false);
                             if (ovrRenderPart != null)
                             {
                                 handComp.RenderParts.Add(ovrRenderPart);
                             }
                         }
                     }
 
-                    PrintHierarchy(handComp.transform, 0);
+                    UpdateAvatarHandComp(handComp, ref handCompData, ref compData);
                 }
-
-                UpdateAvatarHandComp(handComp);
             }
             catch (Exception e)
             {
                 Debug.Log("lawwong CompUpdate " + (isLeft ? "L" : "R") + " " + e.Message + " -- " + e.StackTrace);
             }
         }
 
-        private void PrintHierarchy(Transform t, int indent)
-        {
-            var indentStr = string.Empty;
-            for (int i = indent; i > 0; --i) { indentStr += "  "; }
-            Debug.Log("lawwongPH " + indentStr + "Trans: " + t.name + " " + (t.gameObject.activeInHierarchy ? "O" : "X"));
-            indentStr += "  ";
-            var comps = Utility.ListPool<Component>.Get();
-            try
-            {
-                t.GetComponents(comps);
-                for (int i = 0, imax = comps.Count; i < imax; ++i)
-                {
-                    var compType = comps[i].GetType();
-                    if (comps[i] is MonoBehaviour)
-                    {
-                        Debug.Log("lawwongPH " + indentStr + "Comps: " + compType.Name + " " + (((MonoBehaviour)comps[i]).enabled ? "O" : "X"));
-                    }
-                    else if (compType != typeof(Transform))
-                    {
-                        Debug.Log("lawwongPH " + indentStr + "Comps: " + compType.Name);
-                    }
-                }
-            }
-            finally
-            {
-                Utility.ListPool<Component>.Release(comps);
-                comps = null;
-            }
-            for (int i = 0, imax = t.childCount; i < imax; ++i)
-            {
-                PrintHierarchy(t.GetChild(i), indent + 1);
-            }
-        }
-
-        private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarComponent compDataBase, ref ovrAvatarControllerComponent compData)
+        private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarControllerComponent ctrlCompData, ref ovrAvatarComponent compData)
         {
 #if VIU_OCULUSVR_20_0_OR_NEWER
             if (isLeft)
             {
-                if (CAPI.ovrAvatarPose_GetLeftControllerComponent(avatar, ref compData))
+                if (CAPI.ovrAvatarPose_GetLeftControllerComponent(avatar, ref ctrlCompData))
                 {
-                    CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);
+                    CAPI.ovrAvatarComponent_Get(ctrlCompData.renderComponent, true, ref compData);
                     return true;
                 }
             }
             else
             {
-                if (CAPI.ovrAvatarPose_GetRightControllerComponent(avatar, ref compData))
+                if (CAPI.ovrAvatarPose_GetRightControllerComponent(avatar, ref ctrlCompData))
                 {
-                    CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);
+                    CAPI.ovrAvatarComponent_Get(ctrlCompData.renderComponent, true, ref compData);
                     return true;
                 }
             }
@@ -162,30 +124,30 @@ private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarComponent compDataB
                 CAPI.ovrAvatarPose_GetRightControllerComponent(owner.sdkAvatar);
             if (compDataRef.HasValue)
             {
-                compData = compDataRef.Value;
-                compDataBase = (ovrAvatarComponent)Marshal.PtrToStructure(compData.renderComponent, typeof(ovrAvatarComponent));
+                ctrlCompData = compDataRef.Value;
+                compData = (ovrAvatarComponent)Marshal.PtrToStructure(ctrlCompData.renderComponent, typeof(ovrAvatarComponent));
                 return true;
             }
             return false;
 #endif
         }
 
-        private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataBase, ref ovrAvatarHandComponent compData)
+        private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarHandComponent handCompData, ref ovrAvatarComponent compData)
         {
 #if VIU_OCULUSVR_20_0_OR_NEWER
             if (isLeft)
             {
-                if (CAPI.ovrAvatarPose_GetLeftHandComponent(avatar, ref compData))
+                if (CAPI.ovrAvatarPose_GetLeftHandComponent(avatar, ref handCompData))
                 {
-                    CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);
+                    CAPI.ovrAvatarComponent_Get(handCompData.renderComponent, true, ref compData);
                     return true;
                 }
             }
             else
             {
-                if (CAPI.ovrAvatarPose_GetRightHandComponent(avatar, ref compData))
+                if (CAPI.ovrAvatarPose_GetRightHandComponent(avatar, ref handCompData))
                 {
-                    CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);
+                    CAPI.ovrAvatarComponent_Get(handCompData.renderComponent, true, ref compData);
                     return true;
                 }
             }
@@ -196,8 +158,8 @@ private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataB
                 CAPI.ovrAvatarPose_GetRightHandComponent(owner.sdkAvatar);
             if (compDataRef.HasValue)
             {
-                compData = compDataRef.Value;
-                compDataBase = (ovrAvatarComponent)Marshal.PtrToStructure(compData.renderComponent, typeof(ovrAvatarComponent));
+                handCompData = compDataRef.Value;
+                compData = (ovrAvatarComponent)Marshal.PtrToStructure(handCompData.renderComponent, typeof(ovrAvatarComponent));
                 return true;
             }
             return false;
@@ -207,9 +169,8 @@ private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataB
         private OvrAvatarComponent AddAvatarCtrlComp(GameObject go)
         {
 #if VIU_OCULUSVR_20_0_OR_NEWER
-            var comp = go.AddComponent<OvrAvatarTouchController>();
+            var comp = go.AddComponent<OvrAvatarComponent>();
             comp.SetOvrAvatarOwner(owner.ovrAvatar);
-            comp.isLeftHand = isLeft;
             return comp;
 #else
             go.AddComponent<OvrAvatarTouchController>();
@@ -220,40 +181,39 @@ private OvrAvatarComponent AddAvatarCtrlComp(GameObject go)
         private OvrAvatarComponent AddAvatarHandComp(GameObject go)
         {
 #if VIU_OCULUSVR_20_0_OR_NEWER
-            var comp = go.AddComponent<OvrAvatarHand>();
+            var comp = go.AddComponent<OvrAvatarComponent>();
             comp.SetOvrAvatarOwner(owner.ovrAvatar);
-            comp.isLeftHand = isLeft;
             return comp;
 #else
             go.AddComponent<OvrAvatarHand>();
             return go.AddComponent<OvrAvatarComponent>();
 #endif
         }
 
-        private void UpdateAvatarCtrlComp(OvrAvatarComponent comp)
+        private void UpdateAvatarCtrlComp(OvrAvatarComponent comp, ref ovrAvatarControllerComponent ctrlCompData, ref ovrAvatarComponent compData)
         {
+            var recoverPos = comp.transform.localPosition;
+            var recoverRot = comp.transform.localRotation;
 #if VIU_OCULUSVR_20_0_OR_NEWER
+            comp.UpdateAvatar(ctrlCompData.renderComponent);
 #else
-            var compDataBase = default(ovrAvatarComponent);
-            var compData = default(ovrAvatarControllerComponent);
-            if (TryGetCtrlComponent(owner.sdkAvatar, ref compDataBase, ref compData))
-            {
-                comp.UpdateAvatar(compDataBase, owner.ovrAvatar);
-            }
+            comp.UpdateAvatar(compData, owner.ovrAvatar);
 #endif
+            comp.transform.localPosition = recoverPos;
+            comp.transform.localRotation = recoverRot;
         }
 
-        private void UpdateAvatarHandComp(OvrAvatarComponent comp)
+        private void UpdateAvatarHandComp(OvrAvatarComponent comp, ref ovrAvatarHandComponent handCompData, ref ovrAvatarComponent compData)
         {
+            var recoverPos = comp.transform.localPosition;
+            var recoverRot = comp.transform.localRotation;
 #if VIU_OCULUSVR_20_0_OR_NEWER
+            comp.UpdateAvatar(handCompData.renderComponent);
 #else
-            var compDataBase = default(ovrAvatarComponent);
-            var compData = default(ovrAvatarHandComponent);
-            if (TryGetHandComponent(owner.sdkAvatar, ref compDataBase, ref compData))
-            {
-                comp.UpdateAvatar(compDataBase, owner.ovrAvatar);
-            }
+            comp.UpdateAvatar(compData, owner.ovrAvatar);
 #endif
+            comp.transform.localPosition = recoverPos;
+            comp.transform.localRotation = recoverRot;
         }
 
         private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRenderPartType type, IntPtr renderPart, ovrAvatarComponent compData, bool isController)
@@ -279,7 +239,6 @@ private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRen
                         var wasActive = go.activeSelf;
                         typeof(OvrAvatarSkinnedMeshRenderPBSComponent).GetMethod("Initialize", flags).Invoke(renderer, new object[]
                         { rendererData, null, 0, 0 });
-                        Debug.Log("lawwong AddAvatarRenderComp " + go.name + " " + (wasActive ? "O" : "X") + " >> " + (go.activeSelf ? "O" : "X"));
                         return renderer;
                     }
                 case ovrAvatarRenderPartType.SkinnedMeshRenderPBS_V2:

Original file line number	Diff line number	Diff line change
`@@ -38,120 +38,82 @@ private void Update()`
`38`	`38`
`39`	`39`	`try`
`40`	`40`	`{`
`41`		`- if (ctrlComp == null)`
	`41`	`+ var compData = default(ovrAvatarComponent);`
	`42`	`+ var ctrlCompData = default(ovrAvatarControllerComponent);`
	`43`	`+ var handCompData = default(ovrAvatarHandComponent);`
	`44`	`+`
	`45`	`+ if (TryGetCtrlComponent(owner.sdkAvatar, ref ctrlCompData, ref compData))`
`42`	`46`	`{`
`43`		`- var ctrlCompData = default(ovrAvatarControllerComponent);`
`44`		`- var ctrlCompDataBase = default(ovrAvatarComponent);`
`45`		`- if (TryGetCtrlComponent(owner.sdkAvatar, ref ctrlCompDataBase, ref ctrlCompData))`
	`47`	`+ if (ctrlComp == null)`
`46`	`48`	`{`
`47`		`- var goParent = new GameObject(ctrlCompDataBase.name);`
	`49`	`+ var goParent = new GameObject(compData.name);`
`48`	`50`	`goParent.transform.SetParent(transform, false);`
`49`	`51`	`ctrlComp = AddAvatarCtrlComp(goParent);`
`50`	`52`
`51`		`- for (uint i = 0, imax = ctrlCompDataBase.renderPartCount; i < imax; ++i)`
	`53`	`+ for (uint i = 0, imax = compData.renderPartCount; i < imax; ++i)`
`52`	`54`	`{`
`53`		`- var goPart = new GameObject(ctrlCompDataBase.name + "_renderPart_" + (int)i);`
	`55`	`+ var goPart = new GameObject(compData.name + "_renderPart_" + (int)i);`
`54`	`56`	`goPart.transform.SetParent(goParent.transform, false);`
`55`		`- IntPtr renderPart = OvrAvatar.GetRenderPart(ctrlCompDataBase, i);`
	`57`	`+ IntPtr renderPart = OvrAvatar.GetRenderPart(compData, i);`
`56`	`58`	`ovrAvatarRenderPartType type = CAPI.ovrAvatarRenderPart_GetType(renderPart);`
`57`		`- var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, ctrlCompDataBase, true);`
	`59`	`+ var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, compData, true);`
`58`	`60`	`if (ovrRenderPart != null)`
`59`	`61`	`{`
`60`	`62`	`ctrlComp.RenderParts.Add(ovrRenderPart);`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
`65`		`- PrintHierarchy(ctrlComp.transform, 0);`
	`67`	`+ UpdateAvatarCtrlComp(ctrlComp, ref ctrlCompData, ref compData);`
`66`	`68`	`}`
`67`	`69`
`68`		`- UpdateAvatarCtrlComp(ctrlComp);`
`69`		`-`
`70`		`- if (handComp == null)`
	`70`	`+ if (TryGetHandComponent(owner.sdkAvatar, ref handCompData, ref compData))`
`71`	`71`	`{`
`72`		`- var handCompDataBase = default(ovrAvatarComponent);`
`73`		`- var handCompData = default(ovrAvatarHandComponent);`
`74`		`- if (TryGetHandComponent(owner.sdkAvatar, ref handCompDataBase, ref handCompData))`
	`72`	`+ if (handComp == null)`
`75`	`73`	`{`
`76`		`- var goParent = new GameObject(handCompDataBase.name);`
	`74`	`+ var goParent = new GameObject(compData.name);`
`77`	`75`	`goParent.transform.SetParent(transform, false);`
`78`	`76`	`handComp = AddAvatarHandComp(goParent);`
`79`	`77`
`80`		`- for (uint i = 0, imax = handCompDataBase.renderPartCount; i < imax; ++i)`
	`78`	`+ for (uint i = 0, imax = compData.renderPartCount; i < imax; ++i)`
`81`	`79`	`{`
`82`		`- var goPart = new GameObject(handCompDataBase.name + "_renderPart_" + (int)i);`
	`80`	`+ var goPart = new GameObject(compData.name + "_renderPart_" + (int)i);`
`83`	`81`	`goPart.transform.SetParent(goParent.transform, false);`
`84`		`- IntPtr renderPart = OvrAvatar.GetRenderPart(handCompDataBase, i);`
	`82`	`+ IntPtr renderPart = OvrAvatar.GetRenderPart(compData, i);`
`85`	`83`	`ovrAvatarRenderPartType type = CAPI.ovrAvatarRenderPart_GetType(renderPart);`
`86`		`- var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, handCompDataBase, false);`
	`84`	`+ var ovrRenderPart = AddAvatarRenderComp(goPart, type, renderPart, compData, false);`
`87`	`85`	`if (ovrRenderPart != null)`
`88`	`86`	`{`
`89`	`87`	`handComp.RenderParts.Add(ovrRenderPart);`
`90`	`88`	`}`
`91`	`89`	`}`
`92`	`90`	`}`
`93`	`91`
`94`		`- PrintHierarchy(handComp.transform, 0);`
	`92`	`+ UpdateAvatarHandComp(handComp, ref handCompData, ref compData);`
`95`	`93`	`}`
`96`		`-`
`97`		`- UpdateAvatarHandComp(handComp);`
`98`	`94`	`}`
`99`	`95`	`catch (Exception e)`
`100`	`96`	`{`
`101`	`97`	`Debug.Log("lawwong CompUpdate " + (isLeft ? "L" : "R") + " " + e.Message + " -- " + e.StackTrace);`
`102`	`98`	`}`
`103`	`99`	`}`
`104`	`100`
`105`		`- private void PrintHierarchy(Transform t, int indent)`
`106`		`- {`
`107`		`- var indentStr = string.Empty;`
`108`		`- for (int i = indent; i > 0; --i) { indentStr += " "; }`
`109`		`- Debug.Log("lawwongPH " + indentStr + "Trans: " + t.name + " " + (t.gameObject.activeInHierarchy ? "O" : "X"));`
`110`		`- indentStr += " ";`
`111`		`- var comps = Utility.ListPool<Component>.Get();`
`112`		`- try`
`113`		`- {`
`114`		`- t.GetComponents(comps);`
`115`		`- for (int i = 0, imax = comps.Count; i < imax; ++i)`
`116`		`- {`
`117`		`- var compType = comps[i].GetType();`
`118`		`- if (comps[i] is MonoBehaviour)`
`119`		`- {`
`120`		`- Debug.Log("lawwongPH " + indentStr + "Comps: " + compType.Name + " " + (((MonoBehaviour)comps[i]).enabled ? "O" : "X"));`
`121`		`- }`
`122`		`- else if (compType != typeof(Transform))`
`123`		`- {`
`124`		`- Debug.Log("lawwongPH " + indentStr + "Comps: " + compType.Name);`
`125`		`- }`
`126`		`- }`
`127`		`- }`
`128`		`- finally`
`129`		`- {`
`130`		`- Utility.ListPool<Component>.Release(comps);`
`131`		`- comps = null;`
`132`		`- }`
`133`		`- for (int i = 0, imax = t.childCount; i < imax; ++i)`
`134`		`- {`
`135`		`- PrintHierarchy(t.GetChild(i), indent + 1);`
`136`		`- }`
`137`		`- }`
`138`		`-`
`139`		`- private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarComponent compDataBase, ref ovrAvatarControllerComponent compData)`
	`101`	`+ private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarControllerComponent ctrlCompData, ref ovrAvatarComponent compData)`
`140`	`102`	`{`
`141`	`103`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
`142`	`104`	`if (isLeft)`
`143`	`105`	`{`
`144`		`- if (CAPI.ovrAvatarPose_GetLeftControllerComponent(avatar, ref compData))`
	`106`	`+ if (CAPI.ovrAvatarPose_GetLeftControllerComponent(avatar, ref ctrlCompData))`
`145`	`107`	`{`
`146`		`- CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);`
	`108`	`+ CAPI.ovrAvatarComponent_Get(ctrlCompData.renderComponent, true, ref compData);`
`147`	`109`	`return true;`
`148`	`110`	`}`
`149`	`111`	`}`
`150`	`112`	`else`
`151`	`113`	`{`
`152`		`- if (CAPI.ovrAvatarPose_GetRightControllerComponent(avatar, ref compData))`
	`114`	`+ if (CAPI.ovrAvatarPose_GetRightControllerComponent(avatar, ref ctrlCompData))`
`153`	`115`	`{`
`154`		`- CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);`
	`116`	`+ CAPI.ovrAvatarComponent_Get(ctrlCompData.renderComponent, true, ref compData);`
`155`	`117`	`return true;`
`156`	`118`	`}`
`157`	`119`	`}`
`@@ -162,30 +124,30 @@ private bool TryGetCtrlComponent(IntPtr avatar, ref ovrAvatarComponent compDataB`
`162`	`124`	`CAPI.ovrAvatarPose_GetRightControllerComponent(owner.sdkAvatar);`
`163`	`125`	`if (compDataRef.HasValue)`
`164`	`126`	`{`
`165`		`- compData = compDataRef.Value;`
`166`		`- compDataBase = (ovrAvatarComponent)Marshal.PtrToStructure(compData.renderComponent, typeof(ovrAvatarComponent));`
	`127`	`+ ctrlCompData = compDataRef.Value;`
	`128`	`+ compData = (ovrAvatarComponent)Marshal.PtrToStructure(ctrlCompData.renderComponent, typeof(ovrAvatarComponent));`
`167`	`129`	`return true;`
`168`	`130`	`}`
`169`	`131`	`return false;`
`170`	`132`	`#endif`
`171`	`133`	`}`
`172`	`134`
`173`		`- private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataBase, ref ovrAvatarHandComponent compData)`
	`135`	`+ private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarHandComponent handCompData, ref ovrAvatarComponent compData)`
`174`	`136`	`{`
`175`	`137`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
`176`	`138`	`if (isLeft)`
`177`	`139`	`{`
`178`		`- if (CAPI.ovrAvatarPose_GetLeftHandComponent(avatar, ref compData))`
	`140`	`+ if (CAPI.ovrAvatarPose_GetLeftHandComponent(avatar, ref handCompData))`
`179`	`141`	`{`
`180`		`- CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);`
	`142`	`+ CAPI.ovrAvatarComponent_Get(handCompData.renderComponent, true, ref compData);`
`181`	`143`	`return true;`
`182`	`144`	`}`
`183`	`145`	`}`
`184`	`146`	`else`
`185`	`147`	`{`
`186`		`- if (CAPI.ovrAvatarPose_GetRightHandComponent(avatar, ref compData))`
	`148`	`+ if (CAPI.ovrAvatarPose_GetRightHandComponent(avatar, ref handCompData))`
`187`	`149`	`{`
`188`		`- CAPI.ovrAvatarComponent_Get(compData.renderComponent, true, ref compDataBase);`
	`150`	`+ CAPI.ovrAvatarComponent_Get(handCompData.renderComponent, true, ref compData);`
`189`	`151`	`return true;`
`190`	`152`	`}`
`191`	`153`	`}`
`@@ -196,8 +158,8 @@ private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataB`
`196`	`158`	`CAPI.ovrAvatarPose_GetRightHandComponent(owner.sdkAvatar);`
`197`	`159`	`if (compDataRef.HasValue)`
`198`	`160`	`{`
`199`		`- compData = compDataRef.Value;`
`200`		`- compDataBase = (ovrAvatarComponent)Marshal.PtrToStructure(compData.renderComponent, typeof(ovrAvatarComponent));`
	`161`	`+ handCompData = compDataRef.Value;`
	`162`	`+ compData = (ovrAvatarComponent)Marshal.PtrToStructure(handCompData.renderComponent, typeof(ovrAvatarComponent));`
`201`	`163`	`return true;`
`202`	`164`	`}`
`203`	`165`	`return false;`
`@@ -207,9 +169,8 @@ private bool TryGetHandComponent(IntPtr avatar, ref ovrAvatarComponent compDataB`
`207`	`169`	`private OvrAvatarComponent AddAvatarCtrlComp(GameObject go)`
`208`	`170`	`{`
`209`	`171`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
`210`		`- var comp = go.AddComponent<OvrAvatarTouchController>();`
	`172`	`+ var comp = go.AddComponent<OvrAvatarComponent>();`
`211`	`173`	`comp.SetOvrAvatarOwner(owner.ovrAvatar);`
`212`		`- comp.isLeftHand = isLeft;`
`213`	`174`	`return comp;`
`214`	`175`	`#else`
`215`	`176`	`go.AddComponent<OvrAvatarTouchController>();`
`@@ -220,40 +181,39 @@ private OvrAvatarComponent AddAvatarCtrlComp(GameObject go)`
`220`	`181`	`private OvrAvatarComponent AddAvatarHandComp(GameObject go)`
`221`	`182`	`{`
`222`	`183`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
`223`		`- var comp = go.AddComponent<OvrAvatarHand>();`
	`184`	`+ var comp = go.AddComponent<OvrAvatarComponent>();`
`224`	`185`	`comp.SetOvrAvatarOwner(owner.ovrAvatar);`
`225`		`- comp.isLeftHand = isLeft;`
`226`	`186`	`return comp;`
`227`	`187`	`#else`
`228`	`188`	`go.AddComponent<OvrAvatarHand>();`
`229`	`189`	`return go.AddComponent<OvrAvatarComponent>();`
`230`	`190`	`#endif`
`231`	`191`	`}`
`232`	`192`
`233`		`- private void UpdateAvatarCtrlComp(OvrAvatarComponent comp)`
	`193`	`+ private void UpdateAvatarCtrlComp(OvrAvatarComponent comp, ref ovrAvatarControllerComponent ctrlCompData, ref ovrAvatarComponent compData)`
`234`	`194`	`{`
	`195`	`+ var recoverPos = comp.transform.localPosition;`
	`196`	`+ var recoverRot = comp.transform.localRotation;`
`235`	`197`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
	`198`	`+ comp.UpdateAvatar(ctrlCompData.renderComponent);`
`236`	`199`	`#else`
`237`		`- var compDataBase = default(ovrAvatarComponent);`
`238`		`- var compData = default(ovrAvatarControllerComponent);`
`239`		`- if (TryGetCtrlComponent(owner.sdkAvatar, ref compDataBase, ref compData))`
`240`		`- {`
`241`		`- comp.UpdateAvatar(compDataBase, owner.ovrAvatar);`
`242`		`- }`
	`200`	`+ comp.UpdateAvatar(compData, owner.ovrAvatar);`
`243`	`201`	`#endif`
	`202`	`+ comp.transform.localPosition = recoverPos;`
	`203`	`+ comp.transform.localRotation = recoverRot;`
`244`	`204`	`}`
`245`	`205`
`246`		`- private void UpdateAvatarHandComp(OvrAvatarComponent comp)`
	`206`	`+ private void UpdateAvatarHandComp(OvrAvatarComponent comp, ref ovrAvatarHandComponent handCompData, ref ovrAvatarComponent compData)`
`247`	`207`	`{`
	`208`	`+ var recoverPos = comp.transform.localPosition;`
	`209`	`+ var recoverRot = comp.transform.localRotation;`
`248`	`210`	`#if VIU_OCULUSVR_20_0_OR_NEWER`
	`211`	`+ comp.UpdateAvatar(handCompData.renderComponent);`
`249`	`212`	`#else`
`250`		`- var compDataBase = default(ovrAvatarComponent);`
`251`		`- var compData = default(ovrAvatarHandComponent);`
`252`		`- if (TryGetHandComponent(owner.sdkAvatar, ref compDataBase, ref compData))`
`253`		`- {`
`254`		`- comp.UpdateAvatar(compDataBase, owner.ovrAvatar);`
`255`		`- }`
	`213`	`+ comp.UpdateAvatar(compData, owner.ovrAvatar);`
`256`	`214`	`#endif`
	`215`	`+ comp.transform.localPosition = recoverPos;`
	`216`	`+ comp.transform.localRotation = recoverRot;`
`257`	`217`	`}`
`258`	`218`
`259`	`219`	`private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRenderPartType type, IntPtr renderPart, ovrAvatarComponent compData, bool isController)`
`@@ -279,7 +239,6 @@ private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRen`
`279`	`239`	`var wasActive = go.activeSelf;`
`280`	`240`	`typeof(OvrAvatarSkinnedMeshRenderPBSComponent).GetMethod("Initialize", flags).Invoke(renderer, new object[]`
`281`	`241`	`{ rendererData, null, 0, 0 });`
`282`		`- Debug.Log("lawwong AddAvatarRenderComp " + go.name + " " + (wasActive ? "O" : "X") + " >> " + (go.activeSelf ? "O" : "X"));`
`283`	`242`	`return renderer;`
`284`	`243`	`}`
`285`	`244`	`case ovrAvatarRenderPartType.SkinnedMeshRenderPBS_V2:`