Skip to content

feat: fulfilling interface for tools to find network objects from an id #1086

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Aug 26, 2021
Merged

feat: fulfilling interface for tools to find network objects from an id #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
348783f
fulfilling interface for tools to find network objects from an id
becksebenius-unity Aug 25, 2021
a0c0192
Merge branch 'develop' into feature/provide-network-objects-to-tools-…
becksebenius-unity Aug 25, 2021
b725acd
updated tools reference in testproject
becksebenius-unity Aug 25, 2021
f79cb6a
fixed missing #if around the tools call
becksebenius-unity Aug 25, 2021
1fd1714
Fixed another compiler incompat w/ tools package
becksebenius-unity Aug 25, 2021
0c05fc0
Moved using out of the topline directives
becksebenius-unity Aug 25, 2021
1c0168e
adjusted fix from previous commit
becksebenius-unity Aug 25, 2021
8849ce5
Merge branch 'develop' into feature/provide-network-objects-to-tools-…
becksebenius-unity Aug 25, 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
10 changes: 10 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#if UNITY_EDITOR
using UnityEditor;
#endif
#if MULTIPLAYER_TOOLS
using Unity.Multiplayer.Tools;
#endif
using Unity.Profiling;
using UnityEngine.SceneManagement;
using Debug = UnityEngine.Debug;
Expand Down Expand Up @@ -396,6 +399,13 @@ private void Initialize(bool server)
#endif
}

#if MULTIPLAYER_TOOLS
NetworkSolutionInterface.SetInterface(new NetworkSolutionInterfaceParameters
{
NetworkObjectProvider = new NetworkObjectProvider(this)
});
#endif

if (NetworkConfig.NetworkTransport == null)
{
if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
Expand Down
27 changes: 27 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Metrics/NetworkObjectProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#if MULTIPLAYER_TOOLS
using Unity.Multiplayer.Tools;
using UnityEngine;

namespace Unity.Netcode
{
class NetworkObjectProvider : INetworkObjectProvider
{
private readonly NetworkManager m_NetworkManager;

public NetworkObjectProvider(NetworkManager networkManager)
{
m_NetworkManager = networkManager;
}

public Object GetNetworkObject(ulong networkObjectId)
{
if(m_NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(networkObjectId, out NetworkObject value))
{
return value;
}

return null;
}
}
}
#endif
3 changes: 3 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Metrics/NetworkObjectProvider.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"references": [
"Unity.Multiplayer.MetricTypes",
"Unity.Multiplayer.NetStats",
"Unity.Multiplayer.NetStatsReporting"
"Unity.Multiplayer.NetStatsReporting",
"Unity.Multiplayer.NetworkSolutionInterface"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
2 changes: 1 addition & 1 deletion testproject-tools-integration/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dependencies": {
"com.unity.ide.rider": "3.0.7",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.multiplayer.tools": "0.0.1-preview.3",
"com.unity.multiplayer.tools": "0.0.1-preview.4",
"com.unity.multiplayer.transport.utp": "file:../../com.unity.multiplayer.transport.utp",
"com.unity.test-framework": "1.1.26",
"com.unity.modules.ai": "1.0.0",
Expand Down