Handle error when repairing Oculus plugin asmdefs

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs

@@ -52,33 +52,44 @@ public OculusRecommendedSettings()
                 {
                     if (v)
                     {
-                        try
+                        string asmdefFullPath = Path.GetFullPath(ASMDEFS_PATH);
+                        if (!Directory.Exists(asmdefFullPath))
                         {
-                            string asmdefFullPath = Path.GetFullPath(ASMDEFS_PATH);
-                            if (!Directory.Exists(asmdefFullPath))
-                            {
-                                MonoScript script = MonoScript.FromScriptableObject(VIUProjectSettings.Instance);
-                                string path = AssetDatabase.GetAssetPath(script);
-                                asmdefFullPath = Path.GetFullPath(AssetDatabase.GetAssetPath(script) + "/../../../.asmdefs/Oculus/");
-                                Debug.Log("asmdefFullPath=" + asmdefFullPath);
-                            }
-                            string oculusFullPath = Path.GetFullPath(OCULUS_SDK_PATH);
-                            File.Copy(asmdefFullPath + AVATAR_ASMDEF_FILE_NAME, oculusFullPath + "Avatar/" + AVATAR_ASMDEF_FILE_NAME);
-                            File.Copy(asmdefFullPath + LIPSYNC_ASMDEF_FILE_NAME, oculusFullPath + "LipSync/" + LIPSYNC_ASMDEF_FILE_NAME);
-                            File.Copy(asmdefFullPath + LIPSYNC_EDITOR_ASMDEF_FILE_NAME, oculusFullPath + "LipSync/Editor/" + LIPSYNC_EDITOR_ASMDEF_FILE_NAME);
-                            File.Copy(asmdefFullPath + SPATIALIZER_ASMDEF_FILE_NAME, oculusFullPath + "Spatializer/" + SPATIALIZER_ASMDEF_FILE_NAME);
-                            File.Copy(asmdefFullPath + SPATIALIZER_EDITOR_ASMDEF_FILE_NAME, oculusFullPath + "Spatializer/Editor/" + SPATIALIZER_EDITOR_ASMDEF_FILE_NAME);
-                            AssetDatabase.Refresh();
-                        }
-                        catch (System.Exception e)
-                        {
-                            Debug.LogException(e);
+                            MonoScript script = MonoScript.FromScriptableObject(VIUProjectSettings.Instance);
+                            string path = AssetDatabase.GetAssetPath(script);
+                            asmdefFullPath = Path.GetFullPath(AssetDatabase.GetAssetPath(script) + "/../../../.asmdefs/Oculus/");
+                            //Debug.Log("asmdefFullPath=" + asmdefFullPath);
                         }
+                        string oculusFullPath = Path.GetFullPath(OCULUS_SDK_PATH);
+                        SafeCopy(asmdefFullPath + AVATAR_ASMDEF_FILE_NAME, oculusFullPath + "Avatar/" + AVATAR_ASMDEF_FILE_NAME);
+                        SafeCopy(asmdefFullPath + LIPSYNC_ASMDEF_FILE_NAME, oculusFullPath + "LipSync/" + LIPSYNC_ASMDEF_FILE_NAME);
+                        SafeCopy(asmdefFullPath + LIPSYNC_EDITOR_ASMDEF_FILE_NAME, oculusFullPath + "LipSync/Editor/" + LIPSYNC_EDITOR_ASMDEF_FILE_NAME);
+                        SafeCopy(asmdefFullPath + SPATIALIZER_ASMDEF_FILE_NAME, oculusFullPath + "Spatializer/" + SPATIALIZER_ASMDEF_FILE_NAME);
+                        SafeCopy(asmdefFullPath + SPATIALIZER_EDITOR_ASMDEF_FILE_NAME, oculusFullPath + "Spatializer/Editor/" + SPATIALIZER_EDITOR_ASMDEF_FILE_NAME);
+                        AssetDatabase.Refresh();
                     }
                 },
                 recommendedValue = true,
             });
         }
+
+        private static bool SafeCopy(string src, string dst)
+        {
+            try
+            {
+                if (!File.Exists(dst))
+                {
+                    File.Copy(src, dst);
+                    return true;
+                }
+            }
+            catch (System.Exception e)
+            {
+                Debug.LogException(e);
+            }
+
+            return false;
+        }
     }
 
     public static partial class VIUSettingsEditor

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatar.cs

@@ -1,16 +1,19 @@
-#if VIU_OCULUSVR_AVATAR
-using Oculus.Avatar;
-#endif
+//========= Copyright 2016-2022, HTC Corporation. All rights reserved. ===========
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
+#if VIU_OCULUSVR_AVATAR
+using Oculus.Avatar;
+#endif
+
 namespace HTC.UnityPlugin.Vive.OculusVRExtension
 {
     public class VIUOvrAvatar : MonoBehaviour
     {
-#if VIU_OCULUSVR_1_32_0_OR_NEWER
+#if VIU_OCULUSVR_AVATAR
         public const bool SUPPORTED = true;
 #if UNITY_ANDROID && !UNITY_EDITOR
         public const bool USE_MOBILE_TEXTURE_FORMAT = true;

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatarComponent.cs

@@ -1,17 +1,19 @@
-using System;
+//========= Copyright 2016-2022, HTC Corporation. All rights reserved. ===========
+
+using System;
 using System.Runtime.InteropServices;
 using UnityEngine;
 using System.Reflection;
 
-#if VIU_OCULUSVR_1_32_0_OR_NEWER
+#if VIU_OCULUSVR_AVATAR
 using Oculus.Avatar;
 #endif
 
 namespace HTC.UnityPlugin.Vive.OculusVRExtension
 {
     public class VIUOvrAvatarComponent : MonoBehaviour
     {
-#if VIU_OCULUSVR_1_32_0_OR_NEWER
+#if VIU_OCULUSVR_AVATAR
         [SerializeField]
         private VIUOvrAvatar owner;
         [SerializeField]