Merge pull request #302 from Unity-Technologies/netcode-1-9-1-update

Changes to NetcodeSamples after N4Ev1.9.1 release

Author: michalChrobot

NetcodeSamples/Assets/Default.globalconfig

@@ -1,14 +1,14 @@
-# global config file must have the is_global=true present in the first line.
+# Global config file must have the is_global=true present in the first line.
 is_global=true
 
-# enabe/disable the Netcode source generator files output in the temp folder. 0 disable, empty or 1 enable.
+# Enable/disable the Netcode source generator files output in the temp folder. 0 disable, empty or 1 enable.
 unity.netcode.sourcegenerator.write_files_to_disk=0
 
-# enable/disable Netcode source generator logs output to the Temp/NetCodeGenerated/sourcegenerato.log file. 0 disable, empty or 1 enable.
+# Enable/disable Netcode source generator logs output to the Temp/NetCodeGenerated/SourceGenerator.log file. 0 disable, empty or 1 enable.
 unity.netcode.sourcegenerator.write_logs_to_disk=0
 
-# the default Netcode source generator logging level is error.
-unity.netcode.sourcegenerator.logging_level=error
+# The default Netcode source generator logging level is hardcoded to Info, but options are [Debug, Info, Warning, Error].
+unity.netcode.sourcegenerator.logging_level=
 
 # Netcode source generator will emit profile timings. 0 disable, empty or 1 enable.
 unity.netcode.sourcegenerator.emit_timing=0

NetcodeSamples/Assets/RenderGraphAutoAdoption.cs

@@ -0,0 +1,51 @@
+#if UNITY_6000_0_OR_NEWER && UNITY_EDITOR && !URP_COMPATIBILITY_MODE
+
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+
+public class RenderGraphAutoAdoption : IPreprocessBuildWithReport
+{
+    public int callbackOrder => int.MinValue + 99; // just before URPPreprocessBuild
+
+    void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report)
+    {
+        if (GraphicsSettings.currentRenderPipelineAssetType != typeof(UniversalRenderPipelineAsset))
+            return;
+
+        //changing the boolean through serialization as it is private
+        var settings = GraphicsSettings.GetRenderPipelineSettings<RenderGraphSettings>();
+        var global = GraphicsSettings.GetSettingsForRenderPipeline<UniversalRenderPipeline>();
+        var so = new SerializedObject(global);
+        SerializedProperty settingsProperty = null;
+
+        //finding back RenderGraphSettings in global settings serilized object
+        var propertyIterator = so.FindProperty("m_Settings.m_SettingsList.m_List"); //start from the root of settings collection
+        var end = propertyIterator.GetEndProperty();
+        propertyIterator.NextVisible(true); //enter collection
+        while (!SerializedProperty.EqualContents(propertyIterator, end))
+        {
+            if (propertyIterator?.boxedValue == settings)
+            {
+                settingsProperty = propertyIterator;
+                break;
+            }
+            propertyIterator.NextVisible(false);
+        }
+        if (settingsProperty == null)
+            throw new BuildFailedException("Missing RenderGraphSettings in UniversalRenderPipeline's IRenderPipelineGraphicsSettings");
+
+        //update to use RenderGraph
+        var flag = settingsProperty.FindPropertyRelative("m_EnableRenderCompatibilityMode");
+        if (!flag.boolValue)
+            return;
+
+        flag.boolValue = false;
+        so.ApplyModifiedPropertiesWithoutUndo();
+        AssetDatabase.SaveAssetIfDirty(global);
+    }
+}
+
+#endif

NetcodeSamples/Assets/Samples/Asteroids/Authoring/CollisionSphereComponentAuthoring.cs.meta renamed to NetcodeSamples/Assets/RenderGraphAutoAdoption.cs.meta

@@ -13,7 +13,6 @@ GameObject:
   - component: {fileID: 3551607053619548655}
   - component: {fileID: 379170053741580826}
   - component: {fileID: 141469976173954253}
-  - component: {fileID: 5545635316504383999}
   - component: {fileID: -6806299268768155248}
   - component: {fileID: -7024135913551965333}
   - component: {fileID: 8275377465224962184}
@@ -62,6 +61,7 @@ MonoBehaviour:
   TrackInterpolationDelay: 0
   GhostGroup: 0
   UsePreSerialization: 0
+  UseSingleBaseline: 0
   RollbackPredictedSpawnedGhostState: 0
   RollbackPredictionOnStructuralChanges: 1
 --- !u!114 &3551607053619548655
@@ -106,19 +106,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4a71d6901096bc4989c0261d1b54c3f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &5545635316504383999
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1179405006722280534}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 617574f4a9c8931469c423d5ea412677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 15
 --- !u!23 &-6806299268768155248
 MeshRenderer:
   m_ObjectHideFlags: 0

NetcodeSamples/Assets/Resources.meta

@@ -157,17 +157,34 @@ MonoBehaviour:
     levelHeight: 2048
     shipForwardForce: 50
     shipRotationRate: 140
+    shipCollisionRadius: 10
     bulletVelocity: 500
+    bulletCollisionRadius: 5
     bulletRofCooldownTicks: 3
     asteroidVelocity: 10
+    asteroidCollisionRadius: 15
     numAsteroids: 800
     asteroidsDamageShips: 1
     shipPvP: 1
     asteroidsDestroyedOnShipContact: 1
     bulletsDestroyedOnContact: 1
-    relevancyRadius: 1200
+    relevancyRadius: 1400
     staticAsteroidOptimization: 1
     enableGhostImportanceScaling: 1
+    distanceImportanceTileConfig:
+      TileSize:
+        x: 512
+        y: 512
+        z: 10240
+      TileCenter:
+        x: 0
+        y: 0
+        z: 0
+      TileBorderWidth:
+        x: 1
+        y: 1
+        z: 1
+    collisionSystemRoundRobinSegments: 1
 --- !u!4 &83804743
 Transform:
   m_ObjectHideFlags: 0

NetcodeSamples/Assets/Samples/Asteroids/Asteroid.prefab

@@ -5,7 +5,7 @@
 public class ServerSettingsAuthoring : MonoBehaviour
 {
     [RegisterBinding(typeof(ServerSettings), "levelData")]
-    public LevelComponent levelData;
+    public LevelComponent levelData = LevelComponent.Default;
 
     class Baker : Baker<ServerSettingsAuthoring>
     {

NetcodeSamples/Assets/Samples/Asteroids/Asteroids/AsteroidsEntityScene.unity

@@ -13,7 +13,6 @@ GameObject:
   - component: {fileID: 7355874651087019441}
   - component: {fileID: -3232764338705290451}
   - component: {fileID: 8842576389108237569}
-  - component: {fileID: 5797329235442628069}
   - component: {fileID: 5785325454680195951}
   - component: {fileID: 3331244637684336934}
   - component: {fileID: 2033488040994855750}
@@ -64,6 +63,7 @@ MonoBehaviour:
   TrackInterpolationDelay: 0
   GhostGroup: 0
   UsePreSerialization: 0
+  UseSingleBaseline: 0
   RollbackPredictedSpawnedGhostState: 0
   RollbackPredictionOnStructuralChanges: 1
 --- !u!114 &7355874651087019441
@@ -108,19 +108,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8a02d0bfe041460eafdbd0af99b85622, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &5797329235442628069
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4440235226870903317}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 617574f4a9c8931469c423d5ea412677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  radius: 5
 --- !u!114 &5785325454680195951
 MonoBehaviour:
   m_ObjectHideFlags: 0

NetcodeSamples/Assets/Samples/Asteroids/Authoring/CollisionSphereComponentAuthoring.cs

@@ -0,0 +1,19 @@
+{
+    "name": "Asteroids.CI",
+    "references": [
+        "Unity.Entities",
+        "Unity.Collections",
+        "Unity.Networking.Transport",
+        "Unity.NetCode",
+        "Unity.Burst"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}