Merge branch 'develop' into feature/profiler_override

Author: JS Fauteux

CONTRIBUTING.md

@@ -42,7 +42,7 @@ We accept changes and improvements to our documentation. Just submit a Pull Requ
 
 ## <a name="cla"></a> Contributor License Agreements
 
-When you open a pull request, you will be asked to acknolwedge our Contributor License Agreement. We allow both individual contributions and contributions made on behalf of companies. We use an open source tool called CLA assistant. If you have any questions on our CLA, please submit an issue
+When you open a pull request, you will be asked to enter into Unity's License Agreement which is based on The Apache Software Foundation's contribution agreement. We allow both individual contributions and contributions made on behalf of companies. We use an open source tool called CLA assistant. If you have any questions on our CLA, please submit an issue
 
 ## <a name="submit-pr"></a> Pull Request Submission Guidelines
 

com.unity.multiplayer.mlapi/Editor/NetworkedAnimatorEditor.cs

@@ -9,92 +9,70 @@ namespace UnityEditor
     [CanEditMultipleObjects]
     public class NetworkAnimatorEditor : Editor
     {
-        // TODO @mfatihmar (Unity): Re-implement this after `NetworkedAnimator` re-implementation
-        /*
-        private NetworkedAnimator networkedAnimatorTarget;
+        private NetworkedAnimator m_Target;
+
         [NonSerialized]
-        private bool initialized;
+        private bool m_Initialized;
 
-        private SerializedProperty animatorProperty;
-        private GUIContent animatorLabel;
+        private SerializedProperty m_AnimatorProperty;
+        private GUIContent m_AnimatorLabel;
 
-        void Init()
+        private void Initialize()
         {
-            if (initialized)
-                return;
-
-            initialized = true;
-            networkedAnimatorTarget = target as NetworkedAnimator;
+            if (m_Initialized) return;
 
-            animatorProperty = serializedObject.FindProperty("_animator");
-            animatorLabel = new GUIContent("Animator", "The Animator component to synchronize.");
-        }
+            m_Initialized = true;
+            m_Target = target as NetworkedAnimator;
 
-        public override void OnInspectorGUI()
-        {
-            Init();
-            serializedObject.Update();
-            DrawControls();
-            serializedObject.ApplyModifiedProperties();
+            m_AnimatorProperty = serializedObject.FindProperty("m_Animator");
+            m_AnimatorLabel = new GUIContent("Animator", "The Animator component to synchronize.");
         }
 
-        void DrawControls()
+        private void DrawControls()
         {
             EditorGUI.BeginChangeCheck();
-            EditorGUILayout.PropertyField(animatorProperty, animatorLabel);
+            EditorGUILayout.PropertyField(m_AnimatorProperty, m_AnimatorLabel);
+            if (EditorGUI.EndChangeCheck()) m_Target.ResetTrackedParams();
 
-            if (EditorGUI.EndChangeCheck())
-                networkedAnimatorTarget.ResetParameterOptions();
+            var animator = m_Target.animator;
+            if (ReferenceEquals(animator, null)) return;
 
-            if (networkedAnimatorTarget.animator == null)
-                return;
+            var animatorController = animator.runtimeAnimatorController as AnimatorController;
+            if (ReferenceEquals(animatorController, null)) return;
 
-            var controller = networkedAnimatorTarget.animator.runtimeAnimatorController as AnimatorController;
-            if (controller != null)
+            EditorGUI.indentLevel += 1;
+            var showWarning = false;
             {
-                var showWarning = false;
-                EditorGUI.indentLevel += 1;
-                int i = 0;
-
-                foreach (var p in controller.parameters)
+                int paramIndex = 0;
+                foreach (var animParam in animatorController.parameters)
                 {
-                    if (i >= 32)
+                    if (paramIndex >= 32)
                     {
                         showWarning = true;
                         break;
                     }
 
-                    bool oldSend = networkedAnimatorTarget.GetParameterAutoSend(i);
-                    bool send = EditorGUILayout.Toggle(p.name, oldSend);
-                    if (send != oldSend)
+                    bool wasTracking = m_Target.GetParamTracking(paramIndex);
+                    bool isTracking = EditorGUILayout.Toggle(animParam.name, wasTracking);
+                    if (isTracking != wasTracking)
                     {
-                        networkedAnimatorTarget.SetParameterAutoSend(i, send);
+                        m_Target.SetParamTracking(paramIndex, isTracking);
                         EditorUtility.SetDirty(target);
                     }
-                    i += 1;
-                }
 
-                if (showWarning)
-                    EditorGUILayout.HelpBox("NetworkAnimator can only select between the first 32 parameters in a mecanim controller", MessageType.Warning);
-
-                EditorGUI.indentLevel -= 1;
+                    paramIndex++;
+                }
             }
+            if (showWarning) EditorGUILayout.HelpBox("NetworkAnimator can only select between the first 32 parameters in a mecanim controller", MessageType.Warning);
+            EditorGUI.indentLevel -= 1;
+        }
 
-            if (Application.isPlaying)
-            {
-                EditorGUILayout.Separator();
-                if (networkedAnimatorTarget.param0 != "")
-                    EditorGUILayout.LabelField("Param 0", networkedAnimatorTarget.param0);
-                if (networkedAnimatorTarget.param1 != "")
-                    EditorGUILayout.LabelField("Param 1", networkedAnimatorTarget.param1);
-                if (networkedAnimatorTarget.param2 != "")
-                    EditorGUILayout.LabelField("Param 2", networkedAnimatorTarget.param2);
-                if (networkedAnimatorTarget.param3 != "")
-                    EditorGUILayout.LabelField("Param 3", networkedAnimatorTarget.param3);
-                if (networkedAnimatorTarget.param4 != "")
-                    EditorGUILayout.LabelField("Param 4", networkedAnimatorTarget.param4);
-            }
+        public override void OnInspectorGUI()
+        {
+            Initialize();
+            serializedObject.Update();
+            DrawControls();
+            serializedObject.ApplyModifiedProperties();
         }
-        */
     }
-}
+}