Merge branch 'update_toolkit' into develop

Author: Tim

3dti_AudioToolkit

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [ 
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+} 

Binaural/BuildUnityWrapperPackage/.vsconfig

@@ -1,18 +1,92 @@
-using System.Collections.Generic;       // List
+using System;
+using System.Collections.Generic;       // List
 using System.Collections.ObjectModel;   // ReadOnlyCollection
+using UnityEngine;
 
 namespace API_3DTI_Common
 {
     //////////////////////////////////////////////////////////////
     // PUBLIC TYPE DEFINITIONS
     //////////////////////////////////////////////////////////////
+    
 
+    [System.AttributeUsage(System.AttributeTargets.Field)]
+    public class ParameterAttribute : System.Attribute
+    {
+        // For parameters that are not ear-specific, pluginNameLeft == pluginNameRight and mixerNameLeft == mixerNameRight
+        public string pluginNameLeft;
+        public string pluginNameRight;
+        public string mixerNameLeft;
+        public string mixerNameRight;
+        public Type type;
+        // Label used in GUI
+        public string label;
+        // Tooltip used in GUI
+        public string description;
+        // For numeric values, the units label, e.g. "dB"
+        public string units;
+        // For int/float parameters: limit to these discrete values. Leave as null for no limits.
+        public float[] validValues;
+
+        public bool isSharedBetweenEars()
+        {
+            Debug.Assert((pluginNameLeft == pluginNameRight) == (mixerNameLeft == mixerNameRight));
+            return pluginNameLeft == pluginNameRight;
+        }
+
+        public string pluginName(T_ear ear)
+        {
+            if (!(isSharedBetweenEars() == (ear == T_ear.BOTH)))
+            {
+                Debug.Assert(isSharedBetweenEars() == (ear == T_ear.BOTH), $"This parameter is shared between both ears so must be called with ear=={T_ear.BOTH}");
+            }
+            return ear.HasFlag(T_ear.LEFT) ? pluginNameLeft : pluginNameRight;
+        }
+
+        public string mixerName(T_ear ear)
+        {
+            Debug.Assert(isSharedBetweenEars() == (ear == T_ear.BOTH), $"This parameter is shared between both ears so must be called with ear=={T_ear.BOTH}");
+            return ear.HasFlag(T_ear.LEFT) ? mixerNameLeft : mixerNameRight;
+        }
+
+    }
+
+    public static class EnumHelper
+    {
+        // https://stackoverflow.com/a/9276348
+        /// <summary>
+        /// Gets an attribute on an enum field value
+        /// </summary>
+        /// <typeparam name="T">The type of the attribute you want to retrieve</typeparam>
+        /// <param name="enumVal">The enum value</param>
+        /// <returns>The attribute of type T that exists on the enum value</returns>
+        /// <example><![CDATA[string desc = myEnumVariable.GetAttributeOfType<DescriptionAttribute>().Description;]]></example>
+        public static T GetAttribute<T>(this Enum enumVal) where T : System.Attribute
+        {
+            var type = enumVal.GetType();
+            var memInfo = type.GetMember(enumVal.ToString());
+            var attributes = memInfo[0].GetCustomAttributes(typeof(T), false);
+            return (attributes.Length > 0) ? (T)attributes[0] : null;
+        }
+    }
+
+
+
+    //public class Parameter<T> where T : Enum
+    //{
+    //    //public T id;
+    //    public string pluginName;
+    //    public string mixerName;
+    //    public Type type;
+    //    public object value;
+    //}
+
+    [Flags]
     public enum T_ear
     {
-        LEFT = 0,   // Left ear
-        RIGHT = 1,  // Right ear
-        BOTH = 2   // Both ears
-                    //NONE = 3    // No ear
+        LEFT = 1,   // Left ear
+        RIGHT = 2,  // Right ear
+        BOTH = LEFT | RIGHT,   // Both ears
     };
 
     //public class T_LevelsList: List<float> { }
@@ -90,5 +164,7 @@ public static float Bool2Float(bool v)
             else
                 return 0.0f;
         }
+
+       
     }
 }

Binaural/BuildUnityWrapperPackage/Assets/3DTuneIn/APIScripts/API_3DTI_Common.cs

@@ -251,11 +251,7 @@ public bool GetNormalizationOffset(T_ear ear, out float offset)
     // GLOBAL METHODS
     //////////////////////////////////////////////////////////////
 
-    // Convenience method that avoids custom type allowing it to be connected to a UI element in the Editor.
-    public void EnableHAInBothEars(bool isEnabled)
-    {
-        SwitchHAOnOff(T_ear.BOTH, isEnabled);
-    }
+
 
     /// <summary>
     /// Switch on/off whole HA process