Skip to content

feat: Scene Registration Refactoring - New UIX Features #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4da4b22
refactor
NoelStephensUnity Jun 3, 2021
cfe461a
style and refactor
NoelStephensUnity Jun 3, 2021
70e07e8
refactor
NoelStephensUnity Jun 3, 2021
4cfbafd
refactor
NoelStephensUnity Jun 8, 2021
d47281e
refactor
NoelStephensUnity Jun 17, 2021
c2067fd
Merge branch 'develop' into refactor/MTT-819
NoelStephensUnity Jun 17, 2021
6466d6c
refactor and fix
NoelStephensUnity Jun 17, 2021
fdcaaea
Merge branch 'develop' into refactor/MTT-819
NoelStephensUnity Jun 17, 2021
bdfe6b5
Fix
NoelStephensUnity Jun 21, 2021
ab30892
fix
NoelStephensUnity Jun 21, 2021
7b90aaf
Merge branch 'develop' into refactor/MTT-819
NoelStephensUnity Jun 21, 2021
34b33b7
bug test
NoelStephensUnity Jun 21, 2021
83afebc
test
NoelStephensUnity Jun 21, 2021
242ac60
fix
NoelStephensUnity Jun 21, 2021
5ccf813
Merge branch 'refactor/MTT-819' into experimental/networkscenemanager…
NoelStephensUnity Jun 21, 2021
c31e9a0
fix
NoelStephensUnity Jun 22, 2021
44060ed
wip
NoelStephensUnity Jun 22, 2021
b8c6ac1
Merge branch 'refactor/MTT-819' into feat/MTT-820
NoelStephensUnity Jun 22, 2021
9c2d2b4
feat-wip
NoelStephensUnity Jun 22, 2021
a4b7604
SceneRegistration parenting (wip)
NoelStephensUnity Jun 22, 2021
acf4e8d
refactor
NoelStephensUnity Jun 23, 2021
549d82b
refactor and style
NoelStephensUnity Jun 23, 2021
432bfa9
fix
NoelStephensUnity Jun 24, 2021
6fc9283
refactor
NoelStephensUnity Jun 24, 2021
27130ac
refactor
NoelStephensUnity Jun 24, 2021
14eb18d
refactor
NoelStephensUnity Jun 24, 2021
c095ddd
feat
NoelStephensUnity Jun 24, 2021
ee67d97
refactor and fix
NoelStephensUnity Jun 25, 2021
5062baf
refactor
NoelStephensUnity Jun 25, 2021
e389eae
refactor
NoelStephensUnity Jun 26, 2021
b3d230a
fix
NoelStephensUnity Jun 26, 2021
3c666e3
fix
NoelStephensUnity Jun 26, 2021
3345f42
fix
NoelStephensUnity Jun 26, 2021
697791f
refactor
NoelStephensUnity Jun 26, 2021
1a7d881
refactor
NoelStephensUnity Jun 26, 2021
588b3d0
feat and refactor
NoelStephensUnity Jun 27, 2021
a7849a8
fix
NoelStephensUnity Jun 28, 2021
80c5f44
Update com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManag…
NoelStephensUnity Jun 28, 2021
0d8f574
fix
NoelStephensUnity Jun 28, 2021
1ded6de
Merge branch 'refactor/MTT-819' into feat/MTT-820
NoelStephensUnity Jun 28, 2021
77a87b5
fix
NoelStephensUnity Jun 28, 2021
82fb5a0
fix
NoelStephensUnity Jun 29, 2021
46a060c
refactor - wip
NoelStephensUnity Jul 1, 2021
cc09a44
refactor-wip
NoelStephensUnity Jul 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
Went through to re-assign scene assets to some of the SceneRegistration assets that were older versions that had lost their entries (the scenes remained in the build settings but this needed to be updated anyway).
SceneRegistraitonEditor needed to make sure the entries list was allocated before trying to assign anything.
Adding or already having assigned the same SceneAsset that also references the SceneRegistration could cause the primary scene asset (i.e. one that has the NetworkManager instance that references it) do be deleted from the list.  This fixes that issue.
  • Loading branch information
NoelStephensUnity committed Jun 29, 2021
commit 82fb5a028f085f07f265746eae7c41835e56636f
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,12 @@ private void AddEntry(ReorderableList list)
var newSceneEntry = new SceneEntry();
newSceneEntry.IncludeInBuild = true;
newSceneEntry.AddedToList();
if(m_SceneRegistration.SceneRegistrations == null)
{
m_SceneRegistration.SceneRegistrations = new List<SceneEntry>();
}
m_SceneRegistration.SceneRegistrations.Add(newSceneEntry);
m_SceneRegistration.ValidateBuildSettingsScenes();
}


Expand All @@ -131,6 +136,8 @@ private void RemoveEntry(ReorderableList list)
m_SceneRegistration.SceneRegistrations.Remove(sceneEntry);

}

m_SceneRegistration.ValidateBuildSettingsScenes();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ internal void ValidateBuildSettingsScenes()
}
}
}

if(NetworkManagerScene != null)
{
AddOrRemoveSceneAsset(NetworkManagerScene, true);
}

}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: EnableDisableSceneRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: 619b9eba5892d5a4e9dd1d6cafb0059a, type: 3}
IncludeInBuild: 1
AdditiveSceneGroup: {fileID: 0}
m_KnownAdditiveSceneGroup: {fileID: 0}
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 619b9eba5892d5a4e9dd1d6cafb0059a, type: 3}
SceneEntryName: EnableDisableSceneNetworkObject
m_NetworkManagerScene:
NetworkManagerScene: {fileID: 0}
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: EnableDisableSceneNetworkObject
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: 619b9eba5892d5a4e9dd1d6cafb0059a,
type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b9f97901b434bd84bb2a433719183485, type: 3}
m_Name: AdditiveSceneGroup1
m_EditorClassIdentifier:
m_AdditiveSceneGroups: []
m_KnownAdditiveSceneGroups: []
m_AdditiveSceneGroups:
- {fileID: 11400000, guid: 6ad30cb0c1be4f44ba9b86d536988a50, type: 2}
m_KnownAdditiveSceneGroups:
- {fileID: 0}
m_AdditiveScenes:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 466e828eb554ee44c900882db6c9d3a7, type: 3}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_AdditiveSceneGroups: []
m_KnownAdditiveSceneGroups: []
m_AdditiveScenes: []
m_AdditiveScenes:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: b12634a7636aba845801ca83d4ba61c2, type: 3}
SceneEntryName: AdditiveScene 4
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 9904940443bdd09489233649a5b6e0b8, type: 3}
SceneEntryName: AdditiveScene 5
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 2fc7efd990522b74caaa4cc1b42dfdc5, type: 3}
SceneEntryName: AdditiveScene 6
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,25 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: SceneRegistration
m_EditorClassIdentifier:
SceneRegistrations: []
m_NetworkManagerScene:
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 228aa7771c79e6341a8fa9bc684c5766, type: 3}
SceneEntryName: SceneLevel-1
KnownAdditiveSceneGroup: {fileID: 11400000, guid: 863734e265d8f81478833cbf1902f460,
type: 2}
AdditiveSceneGroup: {fileID: 11400000, guid: 863734e265d8f81478833cbf1902f460,
type: 2}
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 5add0389cebf7fa438efb6c2ac0a6fe1, type: 3}
SceneEntryName: SceneLevel-2
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 45a35678967fd6744bae54a375eec459, type: 3}
SceneEntryName: SceneLevel-3
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: TestScene
m_KnownSceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 228aa7771c79e6341a8fa9bc684c5766, type: 3}
Expand All @@ -25,4 +42,5 @@ MonoBehaviour:
SceneEntryName: SceneLevel-1
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
NetworkManagerScene: {fileID: 0}
NetworkManagerScene: {fileID: 102900000, guid: e729f848287dcb94c99ff859aefc8511,
type: 3}
6 changes: 4 additions & 2 deletions testproject/Assets/Samples/SceneRegistration/TestScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ MonoBehaviour:
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 97227792}
SceneRegistration: {fileID: 0}
SceneRegistration: {fileID: 11400000, guid: ea4a0987e5ce32244af3b8e7699fc223,
type: 2}
RegisteredScenes:
- TestScene
AllowRuntimeSceneChanges: 0
Expand All @@ -210,7 +211,8 @@ MonoBehaviour:
EnableMessageBuffering: 1
MessageBufferTimeout: 20
EnableNetworkLogs: 1
m_SceneRegistration: {fileID: 0}
m_SceneRegistration: {fileID: 11400000, guid: ea4a0987e5ce32244af3b8e7699fc223,
type: 2}
--- !u!4 &97227794
Transform:
m_ObjectHideFlags: 0
Expand Down
11 changes: 6 additions & 5 deletions testproject/Assets/Scenes/SampleSceneRegistration.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: SampleSceneRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab, type: 3}
IncludeInBuild: 1
AdditiveSceneGroup: {fileID: 0}
m_KnownAdditiveSceneGroup: {fileID: 0}
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab, type: 3}
SceneEntryName: SampleScene
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: SampleScene
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab,
type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: ConnectionApprovalSceneRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: dd570b5916593cb41bab8beb1c9d9315, type: 3}
IncludeInBuild: 1
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: dd570b5916593cb41bab8beb1c9d9315, type: 3}
SceneEntryName: ConnectionApprovalTest
m_KnownAdditiveSceneGroup: {fileID: 0}
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: ConnectionApprovalTest
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: dd570b5916593cb41bab8beb1c9d9315,
type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: NetworkSceneManagerCallbacksSceneRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: 073bd2111475c0643be45b7abe6a97ad, type: 3}
IncludeInBuild: 1
m_KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
SceneEntryName: SceneWeAreSwitchingFrom
- Scene: {fileID: 102900000, guid: ee4d4a69e7f79bc4c861cd9a4b99dd0f, type: 3}
IncludeInBuild: 1
m_KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: ee4d4a69e7f79bc4c861cd9a4b99dd0f, type: 3}
SceneEntryName: SceneWeAreSwitchingTo
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: SceneWeAreSwitchingFrom
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: 073bd2111475c0643be45b7abe6a97ad,
type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: RpcSceneRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: 931469794d88a874998f1d5edd265522, type: 3}
IncludeInBuild: 1
AdditiveSceneGroup: {fileID: 0}
m_KnownAdditiveSceneGroup: {fileID: 0}
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 931469794d88a874998f1d5edd265522, type: 3}
SceneEntryName: RpcTesting
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: RpcTesting
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: 931469794d88a874998f1d5edd265522,
type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 180fe42d996da264ab3d32e3fc9033ca, type: 3}
m_Name: SceneTransitioningRegistration
m_EditorClassIdentifier:
m_SceneRegistrations:
- Scene: {fileID: 102900000, guid: 1c2375a896b2e8c4a841aa61224b8494, type: 3}
IncludeInBuild: 1
SceneEntryName: SceneTransitioningTest
m_KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
- Scene: {fileID: 102900000, guid: 79c2bf7d6b7a06a42a94982aaf1904d8, type: 3}
IncludeInBuild: 1
SceneRegistrations:
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 79c2bf7d6b7a06a42a94982aaf1904d8, type: 3}
SceneEntryName: SecondSceneToLoad
m_KnownAdditiveSceneGroup: {fileID: 0}
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
- Scene: {fileID: 102900000, guid: 637ab8340e96a2949adfe5bfdd42b924, type: 3}
IncludeInBuild: 1
- IncludeInBuild: 1
Scene: {fileID: 102900000, guid: 637ab8340e96a2949adfe5bfdd42b924, type: 3}
SceneEntryName: ThirdSceneToLoad
m_KnownAdditiveSceneGroup: {fileID: 0}
KnownAdditiveSceneGroup: {fileID: 0}
AdditiveSceneGroup: {fileID: 0}
m_NetworkManagerScene: SceneTransitioningTest
m_KnownSceneRegistrations: []
NetworkManagerScene: {fileID: 102900000, guid: 1c2375a896b2e8c4a841aa61224b8494,
type: 3}
33 changes: 33 additions & 0 deletions testproject/ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,42 @@ EditorBuildSettings:
- enabled: 1
path: Assets/MainMenu.unity
guid: 21c7fd68cda9dd9488fc0cc01f885e39
- enabled: 1
path: Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity
guid: 619b9eba5892d5a4e9dd1d6cafb0059a
- enabled: 1
path: Assets/Samples/SamplesMenu.unity
guid: 037562c9b1a469f498dfb34256ddf86f
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 1.unity
guid: 466e828eb554ee44c900882db6c9d3a7
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 2.unity
guid: ddb4e18dbd30daf4ab011d3232a63786
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 3.unity
guid: c4ebb19d1542fdb4a8fe49b774ab16a0
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 4.unity
guid: b12634a7636aba845801ca83d4ba61c2
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 5.unity
guid: 9904940443bdd09489233649a5b6e0b8
- enabled: 1
path: Assets/Samples/SceneRegistration/AdditiveScenes/AdditiveScene 6.unity
guid: 2fc7efd990522b74caaa4cc1b42dfdc5
- enabled: 1
path: Assets/Samples/SceneRegistration/SceneLevel-1.unity
guid: 228aa7771c79e6341a8fa9bc684c5766
- enabled: 1
path: Assets/Samples/SceneRegistration/SceneLevel-2.unity
guid: 5add0389cebf7fa438efb6c2ac0a6fe1
- enabled: 1
path: Assets/Samples/SceneRegistration/SceneLevel-3.unity
guid: 45a35678967fd6744bae54a375eec459
- enabled: 1
path: Assets/Samples/SceneRegistration/TestScene.unity
guid: e729f848287dcb94c99ff859aefc8511
- enabled: 1
path: Assets/Scenes/SampleScene.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
Expand Down