Merge branch 'develop'

Examples/SlothCharacter/sloth_head_blendshapes.prefab

@@ -522,6 +522,13 @@ MonoBehaviour:
     m_BlendShapeOffset: 0
     m_BlendShapeCoefficient: 120
     m_BlendShapeMax: 100
+  - m_UseOverride: 0
+    m_Name: tongueOut
+    m_BlendShapeSmoothing: 0.1
+    m_BlendShapeThreshold: 0.01
+    m_BlendShapeOffset: 0
+    m_BlendShapeCoefficient: 120
+    m_BlendShapeMax: 100
 --- !u!137 &137532649854878984
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 1

Remote/Prefabs/Client.prefab

@@ -552,7 +552,7 @@ MonoBehaviour:
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
@@ -638,7 +638,7 @@ MonoBehaviour:
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
@@ -891,7 +891,7 @@ MonoBehaviour:
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
@@ -1019,8 +1019,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2bee8c0b839d4394a9d27a7b36be2eea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ClientGUI: {fileID: 114641071989034726}
-  m_StreamSettings: {fileID: 11400000, guid: 87ff99ce494718c46adee6b73f32e6d2, type: 2}
+  m_StreamSettings: {fileID: 11400000, guid: a40a3380648a240bab934a19984df455, type: 2}
 --- !u!114 &114511850193313110
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1373,7 +1372,7 @@ MonoBehaviour:
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
@@ -1560,11 +1559,11 @@ MonoBehaviour:
   m_WidthPercent: 0.5
   m_HeightPercent: 0.5
   m_Port: 9000
-  m_IP: 192.168.1.2
+  m_ServerIP: 192.168.1.2
   m_Client: {fileID: 114306834681226924}
   m_MainGUI: {fileID: 223724698400265780}
   m_FaceLostGUI: {fileID: 223011695432814138}
-  m_NotSupprotedGUI: {fileID: 223853865603706680}
+  m_NotSupportedGUI: {fileID: 223853865603706680}
   m_ConnectButton: {fileID: 114748139102597400}
   m_PortTextField: {fileID: 114268972160000486}
   m_IPTextField: {fileID: 114972750310622832}

Remote/Prefabs/StreamReader.prefab

@@ -84,7 +84,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8172ccacadb6046a58bb68b5e91ff386, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_StreamSettings: {fileID: 11400000, guid: 87ff99ce494718c46adee6b73f32e6d2, type: 2}
+  m_StreamSettings: {fileID: 11400000, guid: a40a3380648a240bab934a19984df455, type: 2}
   m_Port: 9000
   m_CatchUpThreshold: 16
   m_CatchUpSize: 3

Remote/Scene/Client.unity

@@ -292,42 +292,52 @@ Prefab:
       propertyPath: m_FaceAnchor
       value: 
       objectReference: {fileID: 750418578}
-    - target: {fileID: 114589279262755410, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114581911785387846, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
-      propertyPath: m_havePropertiesChanged
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114589279262755410, guid: f94950507ce7740dfaa5e4deb18906c8,
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+    - target: {fileID: 114263039297869100, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
-      propertyPath: m_isInputParsingRequired
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114003792004604690, guid: f94950507ce7740dfaa5e4deb18906c8,
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+    - target: {fileID: 114223131275093130, guid: f94950507ce7740dfaa5e4deb18906c8,
+        type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+    - target: {fileID: 114031656683952532, guid: f94950507ce7740dfaa5e4deb18906c8,
+        type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 2100000, guid: 641dabe3b66ed43478857b350ca6bf90, type: 2}
+    - target: {fileID: 114558417650017634, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114003792004604690, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114558417650017634, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114560001808669684, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114511850193313110, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114560001808669684, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114511850193313110, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114558417650017634, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114003792004604690, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114558417650017634, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114003792004604690, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_isInputParsingRequired
       value: 1
@@ -342,12 +352,12 @@ Prefab:
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114511850193313110, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114589279262755410, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114511850193313110, guid: f94950507ce7740dfaa5e4deb18906c8,
+    - target: {fileID: 114589279262755410, guid: f94950507ce7740dfaa5e4deb18906c8,
         type: 2}
       propertyPath: m_isInputParsingRequired
       value: 1
@@ -362,8 +372,14 @@ Prefab:
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1096829698670370, guid: f94950507ce7740dfaa5e4deb18906c8, type: 2}
-      propertyPath: m_IsActive
+    - target: {fileID: 114560001808669684, guid: f94950507ce7740dfaa5e4deb18906c8,
+        type: 2}
+      propertyPath: m_havePropertiesChanged
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114560001808669684, guid: f94950507ce7740dfaa5e4deb18906c8,
+        type: 2}
+      propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []

Remote/Scene/Server.unity

@@ -233,11 +233,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 114641533554280668, guid: 98f44cca61f34da4dbb00fe3ae4ca938,
-        type: 2}
-      propertyPath: m_CatchupSize
-      value: 3
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 98f44cca61f34da4dbb00fe3ae4ca938, type: 2}
   m_IsPrefabParent: 0

Remote/Scripts/BlendShapeUtils.cs

@@ -63,9 +63,9 @@ public static class BlendShapeUtils
         public const string  MouthUpperUpRight   =   ARBlendShapeLocation.MouthUpperUpRight;
         public const string  NoseSneerLeft       =   ARBlendShapeLocation.NoseSneerLeft;
         public const string  NoseSneerRight      =   ARBlendShapeLocation.NoseSneerRight;
-#if ARKIT_2_0
+#if !(ARKIT_1_5)
         public const string  TongueOut           =   ARBlendShapeLocation.TongueOut;
-#endif //ARKIT_2_0
+#endif //ARKIT_1_5
 #else
         public const string  BrowDownLeft        =   "browDown_L";
         public const string  BrowDownRight       =   "browDown_R";
@@ -118,9 +118,9 @@ public static class BlendShapeUtils
         public const string  MouthUpperUpRight   =   "mouthUpperUp_R";
         public const string  NoseSneerLeft       =   "noseSneer_L";
         public const string  NoseSneerRight      =   "noseSneer_R";
-#if ARKIT_2_0
+#if !(ARKIT_1_5)
         public const string  TongueOut           =   "tongueOut";
-#endif //ARKIT_2_0
+#endif //ARKIT_1_5
 #endif
 
         /// <summary>

Remote/Scripts/BlendShapesController.cs

@@ -58,6 +58,26 @@ public class BlendShapesController : MonoBehaviour, IUsesStreamReader
 
         void Start()
         {
+            var streamSource = streamReader.streamSource;
+            if (streamSource == null)
+            {
+                Debug.LogError("Disabling BlendShapesController. No stream source set.", this);
+                enabled = false;
+                return;
+            }
+
+            var streamSettings = streamSource.streamSettings;
+            if (streamSettings == null)
+            {
+                Debug.LogError("Disabling BlendShapesController. No stream settings", this);
+                enabled = false;
+                return;
+            }
+
+            var blendShapesCount = streamSettings.BlendShapeCount;
+            if (m_Overrides.Length != blendShapesCount)
+                Array.Resize(ref m_Overrides, blendShapesCount);
+
             var filteredList = new List<SkinnedMeshRenderer>();
             foreach (var renderer in m_SkinnedMeshRenderers)
             {

Remote/Scripts/ClientGUI.cs

@@ -4,7 +4,10 @@
 using System.Threading;
 using TMPro;
 using UnityEngine;
+using UnityEngine.Serialization;
+#if UNITY_IOS
 using UnityEngine.iOS;
+#endif
 using UnityEngine.UI;
 
 namespace Unity.Labs.FacialRemote
@@ -40,7 +43,7 @@ class ClientGUI : MonoBehaviour
         Canvas m_FaceLostGUI;
 
         [SerializeField]
-        Canvas m_NotSupprotedGUI;
+        Canvas m_NotSupportedGUI;
 
         [SerializeField]
         Button m_ConnectButton;
@@ -61,19 +64,23 @@ class ClientGUI : MonoBehaviour
         void Awake()
         {
             m_Camera = Camera.main;
+#if UNITY_IOS
             if (Device.generation == DeviceGeneration.iPhoneX)
             {
                 m_MainGUI.enabled = false;
                 m_FaceLostGUI.enabled = false;
-                m_NotSupprotedGUI.enabled = false;
+                m_NotSupportedGUI.enabled = false;
             }
             else
             {
+#endif
                 m_MainGUI.enabled = false;
                 m_FaceLostGUI.enabled = false;
-                m_NotSupprotedGUI.enabled = true;
+                m_NotSupportedGUI.enabled = true;
                 enabled = false;
+#if UNITY_IOS
             }
+#endif
         }
 
         void Start()