Merge pull request #307 from Unity-Technologies/netcodeSamples-update-after-1-12-0-release

Updating NetcodeSamples to latest 1.12.0 package state

Author: michalChrobot

NetcodeSamples/Assets/Samples/Asteroids/Asteroids.unity

@@ -1,4 +1,5 @@
 using Unity.Entities;
+using Unity.NetCode.HostMigration;
 using UnityEngine;
 
 [DisallowMultipleComponent]
@@ -15,6 +16,7 @@ public override void Bake(ServerSettingsAuthoring authoring)
             component.levelData = authoring.levelData;
             var entity = GetEntity(TransformUsageFlags.Dynamic);
             AddComponent(entity, component);
+            AddComponent<IncludeInMigration>(entity);
         }
     }
 }

NetcodeSamples/Assets/Samples/Asteroids/Authoring/Server/ServerSettingsAuthoring.cs

@@ -33,6 +33,7 @@ public void Execute(ref ParticleEmitterComponentData emitter, in ShipStateCompon
     }
 
     [UpdateInGroup(typeof(PresentationSystemGroup))]
+    [BurstCompile]
     public partial class ShipTrackingSystem : SystemBase
     {
         EntityQuery m_LevelGroup;
@@ -54,7 +55,8 @@ protected override void OnDestroy()
             m_RenderOffset.Dispose();
         }
 
-        partial struct ShipTrackingJob : IJobEntity
+        [BurstCompile]
+        partial struct ShipTrackingJob : IJob
         {
             public float deltaTime;
             public int screenHeight;

NetcodeSamples/Assets/Samples/Asteroids/Client/Systems/Rendering/ShipTrackingSystem.cs

@@ -40,6 +40,9 @@ partial struct StaticAsteroidJob : IJobChunk
 
             public void Execute(in ArchetypeChunk chunk, int unfilteredChunkIndex, bool useEnabledMask, in v128 chunkEnabledMask)
             {
+                // This job is not written to support queries with enableable component types.
+                UnityEngine.Assertions.Assert.IsFalse(useEnabledMask);
+
                 // We update the server values infrequently, as we only need the updated
                 // LocalTransform positions for distance importance scaling & relevancy calculations.
                 if (isServer && (chunk.SequenceNumber + tick.TickIndexForValidTick) % roundRobinFrequency >= simulationStepBatchSize) return;

NetcodeSamples/Assets/Samples/Asteroids/Client/Systems/StaticAsteroidSystem.cs

@@ -0,0 +1,51 @@
+using System;
+using Unity.Entities;
+using Unity.NetCode;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Samples.Asteroids.Host.UI
+{
+    public class GameOptions : MonoBehaviour
+    {
+        GameObject m_OptionsPanel;
+        InputField m_AsteroidCountTextBox;
+        EntityQuery m_ServerSettingsQuery;
+
+        void Start()
+        {
+            m_OptionsPanel = gameObject.transform.Find("Panel").gameObject;
+            m_OptionsPanel.SetActive(false);
+            m_AsteroidCountTextBox = m_OptionsPanel.transform.Find("Count").GetComponent<InputField>();
+        }
+
+        void Update()
+        {
+            // Can only set options on the host/server
+            if (ClientServerBootstrap.ServerWorld == null)
+                return;
+
+            if ( Input.GetKeyDown("o") )
+            {
+                m_OptionsPanel.SetActive(!m_OptionsPanel.activeSelf);
+
+                if (m_OptionsPanel.activeSelf)
+                {
+                    if (m_ServerSettingsQuery==default)
+                        m_ServerSettingsQuery = ClientServerBootstrap.ServerWorld.EntityManager.CreateEntityQuery(typeof(ServerSettings));
+
+                    if (m_ServerSettingsQuery.IsEmpty)
+                        return;
+
+                    var numAsteroids = m_ServerSettingsQuery.GetSingleton<ServerSettings>().levelData.numAsteroids;
+                    m_AsteroidCountTextBox.text = $"{numAsteroids}";
+                }
+            }
+        }
+
+        public void SetAsteroidCount()
+        {
+            m_ServerSettingsQuery.GetSingletonRW<ServerSettings>().ValueRW.levelData.numAsteroids = Int32.Parse( m_AsteroidCountTextBox.text );
+        }
+    }
+}

NetcodeSamples/Assets/Samples/Asteroids/Server/GameOptions.cs

@@ -352,14 +352,19 @@ public void Execute()
 
                     ecb.SetComponent(e, trans);
                     if (staticAsteroidOptimization == 1)
+                    {
+                        UnityEngine.Debug.Assert(tick.IsValid);
                         ecb.SetComponent(e,
                             new StaticAsteroid
                             {
                                 InitialPosition = trans.Position.xy, InitialVelocity = vel.Value, InitialAngle = angle,
-                                SpawnTick = tick
+                                SpawnTick = tick,
                             });
+                    }
                     else
+                    {
                         ecb.SetComponent(e, vel);
+                    }
                 }
 
                 random.Value = rand;

NetcodeSamples/Assets/Samples/Asteroids/Server/GameOptions.cs.meta

@@ -0,0 +1,30 @@
+using Unity.Burst;
+using Unity.Entities;
+using Unity.Jobs;
+using Unity.Collections;
+using Unity.NetCode;
+using Unity.Mathematics;
+using Unity.NetCode.HostMigration;
+using System;
+
+namespace Asteroids.Server
+{
+    [BurstCompile]
+    [WorldSystemFilter(WorldSystemFilterFlags.ServerSimulation)]
+    [UpdateBefore(typeof(RpcSystem))]
+    public partial struct RegisterMigrationTypesSystem : ISystem
+    {
+        public void OnCreate(ref SystemState state)
+        {
+            var migrationTypesEntity = state.EntityManager.CreateSingletonBuffer<NonGhostMigrationComponents>();
+            var migreationTypesBuffer = state.EntityManager.GetBuffer<NonGhostMigrationComponents>(migrationTypesEntity, false);
+
+            migreationTypesBuffer.Add( new NonGhostMigrationComponents(){ ComponentToMigrate = ComponentType.ReadOnly<ServerSettings>() } );
+        }
+
+        [BurstCompile]
+        public void OnUpdate(ref SystemState state)
+        {
+        }
+    }
+}

NetcodeSamples/Assets/Samples/Asteroids/Server/Systems/AsteroidGameSpawnSystem.cs

@@ -49,7 +49,7 @@ public override bool Initialize(string defaultWorldName)
             var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
             if (!isFromCommandLine) targetScene = activeScene;
 
-            var isFrontend = targetScene == frontendScene;
+            var isFrontend = targetScene.Contains(frontendScene);
 
             // Handle server setup errors:
             if (IsServerPlatform)