charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: naming convention

Browse Source
This commit is contained in:
Paul Pacheco 2019-04-06 07:43:55 -05:00
parent adb16921c8
commit a302c180d3
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Assets/Mirror/Editor/NetworkIdentityEditor.cs
View File

@ -8,55 +8,55 @@ namespace Mirror
[CanEditMultipleObjects] [CanEditMultipleObjects]
public class NetworkIdentityEditor : Editor public class NetworkIdentityEditor : Editor
{ {
SerializedProperty m_ServerOnlyProperty; SerializedProperty serverOnlyProperty;
SerializedProperty m_LocalPlayerAuthorityProperty; SerializedProperty localPlayerAuthorityProperty;
GUIContent m_ServerOnlyLabel = new GUIContent("Server Only", "True if the object should only exist on the server."); GUIContent serverOnlyLabel = new GUIContent("Server Only", "True if the object should only exist on the server.");
GUIContent m_LocalPlayerAuthorityLabel = new GUIContent("Local Player Authority", "True if this object will be controlled by a player on a client."); GUIContent localPlayerAuthorityLabel = new GUIContent("Local Player Authority", "True if this object will be controlled by a player on a client.");
GUIContent m_SpawnLabel = new GUIContent("Spawn Object", "This causes an unspawned server object to be spawned on clients"); GUIContent spawnLabel = new GUIContent("Spawn Object", "This causes an unspawned server object to be spawned on clients");
NetworkIdentity m_NetworkIdentity; NetworkIdentity networkIdentity;
bool m_Initialized; bool initialized;
bool m_ShowObservers; bool showObservers;
void Init() void Init()
{ {
if (m_Initialized) if (initialized)
{ {
return; return;
} }
m_Initialized = true; initialized = true;
m_NetworkIdentity = target as NetworkIdentity; networkIdentity = target as NetworkIdentity;
m_ServerOnlyProperty = serializedObject.FindProperty("m_ServerOnly"); serverOnlyProperty = serializedObject.FindProperty("m_ServerOnly");
m_LocalPlayerAuthorityProperty = serializedObject.FindProperty("m_LocalPlayerAuthority"); localPlayerAuthorityProperty = serializedObject.FindProperty("m_LocalPlayerAuthority");
} }
public override void OnInspectorGUI() public override void OnInspectorGUI()
{ {
if (m_ServerOnlyProperty == null) if (serverOnlyProperty == null)
{ {
m_Initialized = false; initialized = false;
} }
Init(); Init();
serializedObject.Update(); serializedObject.Update();
if (m_ServerOnlyProperty.boolValue) if (serverOnlyProperty.boolValue)
{ {
EditorGUILayout.PropertyField(m_ServerOnlyProperty, m_ServerOnlyLabel); EditorGUILayout.PropertyField(serverOnlyProperty, serverOnlyLabel);
EditorGUILayout.LabelField("Local Player Authority cannot be set for server-only objects"); EditorGUILayout.LabelField("Local Player Authority cannot be set for server-only objects");
} }
else if (m_LocalPlayerAuthorityProperty.boolValue) else if (localPlayerAuthorityProperty.boolValue)
{ {
EditorGUILayout.LabelField("Server Only cannot be set for Local Player Authority objects"); EditorGUILayout.LabelField("Server Only cannot be set for Local Player Authority objects");
EditorGUILayout.PropertyField(m_LocalPlayerAuthorityProperty, m_LocalPlayerAuthorityLabel); EditorGUILayout.PropertyField(localPlayerAuthorityProperty, localPlayerAuthorityLabel);
} }
else else
{ {
EditorGUILayout.PropertyField(m_ServerOnlyProperty, m_ServerOnlyLabel); EditorGUILayout.PropertyField(serverOnlyProperty, serverOnlyLabel);
EditorGUILayout.PropertyField(m_LocalPlayerAuthorityProperty, m_LocalPlayerAuthorityLabel); EditorGUILayout.PropertyField(localPlayerAuthorityProperty, localPlayerAuthorityLabel);
} }
serializedObject.ApplyModifiedProperties(); serializedObject.ApplyModifiedProperties();
@ -70,13 +70,13 @@ public override void OnInspectorGUI()
EditorGUILayout.Separator(); EditorGUILayout.Separator();
if (m_NetworkIdentity.observers != null && m_NetworkIdentity.observers.Count > 0) if (networkIdentity.observers != null && networkIdentity.observers.Count > 0)
{ {
m_ShowObservers = EditorGUILayout.Foldout(m_ShowObservers, "Observers"); showObservers = EditorGUILayout.Foldout(showObservers, "Observers");
if (m_ShowObservers) if (showObservers)
{ {
EditorGUI.indentLevel += 1; EditorGUI.indentLevel += 1;
foreach (KeyValuePair<int, NetworkConnection> kvp in m_NetworkIdentity.observers) foreach (KeyValuePair<int, NetworkConnection> kvp in networkIdentity.observers)
{ {
if (kvp.Value.playerController != null) if (kvp.Value.playerController != null)
EditorGUILayout.ObjectField("Connection " + kvp.Value.connectionId, kvp.Value.playerController.gameObject, typeof(GameObject), false); EditorGUILayout.ObjectField("Connection " + kvp.Value.connectionId, kvp.Value.playerController.gameObject, typeof(GameObject), false);
@ -87,16 +87,16 @@ public override void OnInspectorGUI()
} }
} }
if (PrefabUtility.IsPartOfPrefabAsset(m_NetworkIdentity.gameObject)) if (PrefabUtility.IsPartOfPrefabAsset(networkIdentity.gameObject))
return; return;
if (m_NetworkIdentity.gameObject.activeSelf && m_NetworkIdentity.netId == 0 && NetworkServer.active) if (networkIdentity.gameObject.activeSelf && networkIdentity.netId == 0 && NetworkServer.active)
{ {
EditorGUILayout.BeginHorizontal(); EditorGUILayout.BeginHorizontal();
EditorGUILayout.LabelField(m_SpawnLabel); EditorGUILayout.LabelField(spawnLabel);
if (GUILayout.Toggle(false, "Spawn", EditorStyles.miniButtonLeft)) if (GUILayout.Toggle(false, "Spawn", EditorStyles.miniButtonLeft))
{ {
NetworkServer.Spawn(m_NetworkIdentity.gameObject); NetworkServer.Spawn(networkIdentity.gameObject);
EditorUtility.SetDirty(target); // preview window STILL doens't update immediately.. EditorUtility.SetDirty(target); // preview window STILL doens't update immediately..
} }
EditorGUILayout.EndHorizontal(); EditorGUILayout.EndHorizontal();