Update to v1.12.2

* New Features
  - Add ControllerButtonMask to able to mask out multiple buttin input simultaneously
```csharp
// return true if right controller trigger or pad button pressed
ViveInput.GetAnyPress(HandRole.RightHand, new ControllerButtonMask(ControllerButton.Trigger, ControllerButton.Pad))

// return true if both right controller trigger and pad button pressed
ViveInput.GetAllPress(HandRole.RightHand, new ControllerButtonMask(ControllerButton.Trigger, ControllerButton.Pad))
```

* Bug Fixes
  - Fix error when Wave Essence RenderModel module is installed
  - Fix teleport in wrong height for some device in example 6

Author: lawwong

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources/RegistryToolSettings.asset

@@ -13,9 +13,9 @@ MonoBehaviour:
   m_Name: RegistryToolSettings
   m_EditorClassIdentifier: 
   ProjectManifestPath: Packages/manifest.json
-  LicenseResourcePath: LICENSE
-  ViveRegistry:
-    name: VIVE
-    url: https://npm-registry.vive.com
-    scopes:
+  AutoCheckEnabled: 1
+  Registry:
+    Name: VIVE
+    Url: https://npm-registry.vive.com
+    Scopes:
     - com.htc.upm

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Resources/RegistryToolSettings.asset.meta

@@ -1,242 +1,46 @@
-#pragma warning disable 0649
-using HTC.UnityPlugin.UPMRegistryTool.SimpleJSON;
+#if UNITY_2018_1_OR_NEWER
+using HTC.UnityPlugin.UPMRegistryTool.Editor.Utils;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
-namespace HTC.UnityPlugin.UPMRegistryTool
+namespace HTC.UnityPlugin.UPMRegistryTool.Editor.Configs
 {
-    [CreateAssetMenu(menuName = "RegistryToolSettings", fileName = "RegistryToolSettings")]
     public class RegistryToolSettings : ScriptableObject
     {
-        [Serializable]
-        public struct ScopedRegistry
-        {
-            public string name;
-            public string url;
-            public List<string> scopes;
-
-            public bool Equals(ScopedRegistry otherInfo)
-            {
-                if (name != otherInfo.name || url != otherInfo.url) { return false; }
-
-                if (scopes == null || otherInfo.scopes == null)
-                {
-                    if (scopes == null && otherInfo.scopes == null) { return true; }
-                    return false;
-                }
-
-                if (scopes.Count != otherInfo.scopes.Count) { return false; }
-
-                for (int i = 0, imax = scopes.Count; i < imax; i++)
-                {
-                    if (scopes[i] != otherInfo.scopes[i])
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-        }
-
-        [SerializeField]
-        public string ProjectManifestPath;
-        [SerializeField]
-        public string LicenseResourcePath;
-        [SerializeField]
-        public ScopedRegistry ViveRegistry;
-
-        [NonSerialized]
-        public string ViveRegistryHost;
-        [NonSerialized]
-        public int ViveRegistryPort;
-
         private const string RESOURCES_PATH = "RegistryToolSettings";
-        private static RegistryToolSettings instance;
-
-        public static RegistryToolSettings Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = Resources.Load<RegistryToolSettings>(RESOURCES_PATH);
-
-                    if (instance != null)
-                    {
-                        var match = Regex.Match(instance.ViveRegistry.url, @"^https?:\/\/(.+?)(?::(\d+))?\/?$");
-                        instance.ViveRegistryHost = match.Success && match.Groups.Count > 1 ? match.Groups[1].Value : default(string);
-
-                        if (!int.TryParse(match.Groups[2].Value, out instance.ViveRegistryPort)) { instance.ViveRegistryPort = 80; }
-                    }
-                    else
-                    {
-                        Debug.LogErrorFormat("RegistrySettings.asset not found. ({0})", RESOURCES_PATH);
-                    }
-                }
-
-                return instance;
-            }
-        }
-
-        public static bool IsRegistryExists(ScopedRegistry reg)
-        {
-            JSONNode manifestNode;
-            if (!LoadManifestNode(out manifestNode)) { return false; }
-
-            return IsRegistryExists(manifestNode, reg);
-        }
-
-        public static void AddRegistry(ScopedRegistry reg)
-        {
-            JSONNode manifestNode;
-            if (!LoadManifestNode(out manifestNode)) { return; }
-
-            int nameMatchIndex;
-            if (!IsRegistryExists(manifestNode, reg, out nameMatchIndex))
-            {
-                if (nameMatchIndex < 0)
-                {
-                    AddRegistry(EnsureRegistriesNode(manifestNode), reg);
-                }
-                else
-                {
-                    AddRegistryAt(EnsureRegistriesNode(manifestNode), reg, nameMatchIndex);
-                }
-            }
-
-            SaveManifestNode(manifestNode);
-        }
-
-        public static void RemoveRegistry(ScopedRegistry reg)
-        {
-            JSONNode manifestNode;
-            if (!LoadManifestNode(out manifestNode)) { return; }
-
-            int nameMatchIndex;
-            IsRegistryExists(manifestNode, reg, out nameMatchIndex);
-            if (nameMatchIndex > 0)
-            {
-                RemoveRegistryAt(manifestNode, nameMatchIndex);
-            }
-
-            SaveManifestNode(manifestNode);
-        }
-
-        private static bool IsRegistryExists(JSONNode manifestNode, ScopedRegistry reg)
-        {
-            int i;
-            return IsRegistryExists(manifestNode, reg, out i);
-        }
-
-        private static bool IsRegistryExists(JSONNode manifestNode, ScopedRegistry reg, out int index)
-        {
-            index = -1;
-            var regsNode = manifestNode["scopedRegistries"];
-
-            if (!regsNode.IsArray) { return false; }
-            if (regsNode.Count == 0) { return false; }
 
-            for (int i = 0, imax = regsNode.Count; i < imax; ++i)
-            {
-                var regNode = regsNode[i];
-                var nameNode = regNode["name"];
-                var urlNode = regNode["url"];
-                var scopesNode = regNode["scopes"];
-
-                if (!nameNode.IsString || nameNode.Value != reg.name) { continue; }
-                index = i;
-
-                if (!urlNode.IsString || urlNode.Value != reg.url) { break; }
-                if (!scopesNode.IsArray) { break; }
-                if (scopesNode.Count != (reg.scopes == null ? 0 : reg.scopes.Count)) { break; }
-
-                var allMatch = true;
-                for (int j = scopesNode.Count - 1; j >= 0; --j)
-                {
-                    var scopeNode = scopesNode[j];
-                    if (!scopeNode.IsString) { allMatch = false; break; }
-                    if (scopeNode.Value != reg.scopes[j]) { allMatch = false; break; }
-                }
-                return allMatch;
-            }
+        private static RegistryToolSettings PrivateInstance;
 
-            return false;
-        }
-
-        private static JSONArray EnsureRegistriesNode(JSONNode manifestNode)
-        {
-            var regsNode = manifestNode["scopedRegistries"];
-            if (!regsNode.IsArray)
-            {
-                manifestNode.Add("scopedRegistries", regsNode = new JSONArray());
-            }
-            return regsNode.AsArray;
-        }
+        public string ProjectManifestPath;
+        public RegistryInfo Registry;
 
-        private static void AddRegistry(JSONArray regsNode, ScopedRegistry reg)
-        {
-            if (regsNode.Count == 0) { regsNode.Add(new JSONObject()); }
-            AddRegistryAt(regsNode, reg, regsNode.Count - 1);
-        }
+        [NonSerialized] public string RegistryHost;
+        [NonSerialized] public int RegistryPort;
 
-        private static void AddRegistryAt(JSONArray regsNode, ScopedRegistry reg, int index)
+        public static RegistryToolSettings Instance()
         {
-            var regNode = regsNode[index];
-            var nameNode = regNode["name"];
-            var urlNode = regNode["url"];
-            var scopesNode = regNode["scopes"];
-
-            if (nameNode.IsString) { nameNode.Value = reg.name; }
-            else { regNode.Add("name", new JSONString(reg.name)); }
-
-            if (urlNode.IsString) { urlNode.Value = reg.url; }
-            else { regNode.Add("url", new JSONString(reg.url)); }
-
-            if (!scopesNode.IsArray) { regNode.Add("scopes", scopesNode = new JSONArray()); }
-
-            int i = 0;
-            foreach (var scope in reg.scopes)
+            if (PrivateInstance == null)
             {
-                var scopeNode = scopesNode[i];
-                if (scopeNode.IsString) { scopeNode.Value = scope; }
-                else { scopesNode[i] = new JSONString(scope); }
-                ++i;
+                PrivateInstance = Resources.Load<RegistryToolSettings>(RESOURCES_PATH);
+                PrivateInstance.Init();
             }
 
-            while (scopesNode.Count > i) { scopesNode.Remove(scopesNode.Count - 1); }
+            return PrivateInstance;
         }
 
-        private static void RemoveRegistryAt(JSONNode manifestNode, int index)
+        private void Init()
         {
-            manifestNode["scopedRegistries"].Remove(index);
-        }
-
-        private static bool LoadManifestNode(out JSONNode node)
-        {
-            node = default(JSONNode);
+            Match match = Regex.Match(Registry.Url, @"^https?:\/\/(.+?)(?::(\d+))?\/?$");
+            RegistryHost = match.Groups[1].Value;
 
-            if (Instance == null) { return false; }
-
-            var json = File.ReadAllText(instance.ProjectManifestPath);
-            node = JSON.Parse(json);
-            if (!node.IsObject)
+            int port = 0;
+            RegistryPort = 80;
+            if (int.TryParse(match.Groups[2].Value, out port))
             {
-                Debug.LogError("Parse pkg manifest from " + instance.ProjectManifestPath + " faild, json=\n" + json, instance);
-                return false;
+                RegistryPort = port;
             }
-
-            return true;
-        }
-
-        private static void SaveManifestNode(JSONNode node)
-        {
-            if (Instance == null) { return; }
-
-            File.WriteAllText(instance.ProjectManifestPath, node.ToString(2));
         }
     }
-}
+}
+#endif

Assets/HTC.UnityPlugin/UPMRegistryTool/Editor/Scripts/Configs/RegistryToolSettings.cs

@@ -0,0 +1,86 @@
+#if UNITY_2018_1_OR_NEWER
+using HTC.UnityPlugin.UPMRegistryTool.Editor.Configs;
+using HTC.UnityPlugin.UPMRegistryTool.Editor.Utils.SimpleJSON;
+using System.IO;
+
+namespace HTC.UnityPlugin.UPMRegistryTool.Editor.Utils
+{
+    public static class ManifestUtils
+    {
+        public const string SCOPED_REGISTRIES_KEY = "scopedRegistries";
+        public const int JSON_INDENT_SPACE_COUNT = 2;
+
+        public static bool CheckRegistryExists(RegistryInfo registryInfo)
+        {
+            JSONObject manifestJson = LoadProjectManifest();
+            if (!manifestJson.HasKey(SCOPED_REGISTRIES_KEY))
+            {
+                return false;
+            }
+
+            JSONArray registries = manifestJson[SCOPED_REGISTRIES_KEY].AsArray;
+            foreach (JSONNode regNode in registries)
+            {
+                RegistryInfo regInfo = RegistryInfo.FromJson(regNode.AsObject);
+                if (registryInfo.Equals(regInfo))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public static void AddRegistry(RegistryInfo registryInfo)
+        {
+            RemoveRegistry(registryInfo.Name);
+
+            JSONObject manifestJson = LoadProjectManifest();
+            if (!manifestJson.HasKey(SCOPED_REGISTRIES_KEY))
+            {
+                manifestJson.Add(SCOPED_REGISTRIES_KEY, new JSONArray());
+            }
+
+            JSONArray registries = manifestJson[SCOPED_REGISTRIES_KEY].AsArray;
+            registries.Add(registryInfo.ToJson());
+
+            Save(manifestJson);
+        }
+
+        public static void RemoveRegistry(string registryName)
+        {
+            JSONObject manifestJson = LoadProjectManifest();
+            if (!manifestJson.HasKey(SCOPED_REGISTRIES_KEY))
+            {
+                return;
+            }
+
+            JSONArray registries = manifestJson[SCOPED_REGISTRIES_KEY].AsArray;
+            for (int i = registries.Count - 1; i >= 0; i--)
+            {
+                RegistryInfo reg = RegistryInfo.FromJson(registries[i].AsObject);
+                if (reg.Name == registryName)
+                {
+                    registries.Remove(i);
+                }
+            }
+
+            Save(manifestJson);
+        }
+
+        private static JSONObject LoadProjectManifest()
+        {
+            string manifestString = File.ReadAllText(RegistryToolSettings.Instance().ProjectManifestPath);
+            JSONObject manifestJson = JSONNode.Parse(manifestString).AsObject;
+
+            return manifestJson;
+        }
+
+        private static void Save(JSONObject newJson)
+        {
+            string jsonString = newJson.ToString(JSON_INDENT_SPACE_COUNT);
+            File.WriteAllText(RegistryToolSettings.Instance().ProjectManifestPath, jsonString);
+        }
+    }
+} 
+#endif