Skip to content

Commit 50d9d58

Browse files
michalChrobotmichalChrobot
committed
Updated NetcodeSamples to latest internal version
1 parent deb2b52 commit 50d9d58

100 files changed

Lines changed: 12412 additions & 2372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NetcodeSamples/Assets/Samples/Asteroids/Asteroids.unity‎

Lines changed: 606 additions & 7 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Unity.Entities;
2+
using Unity.NetCode.HostMigration;
23
using UnityEngine;
34

45
[DisallowMultipleComponent]
@@ -15,6 +16,7 @@ public override void Bake(ServerSettingsAuthoring authoring)
1516
component.levelData = authoring.levelData;
1617
var entity = GetEntity(TransformUsageFlags.Dynamic);
1718
AddComponent(entity, component);
19+
AddComponent<IncludeInMigration>(entity);
1820
}
1921
}
2022
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void Execute(ref ParticleEmitterComponentData emitter, in ShipStateCompon
3333
}
3434

3535
[UpdateInGroup(typeof(PresentationSystemGroup))]
36+
[BurstCompile]
3637
public partial class ShipTrackingSystem : SystemBase
3738
{
3839
EntityQuery m_LevelGroup;
@@ -54,7 +55,8 @@ protected override void OnDestroy()
5455
m_RenderOffset.Dispose();
5556
}
5657

57-
partial struct ShipTrackingJob : IJobEntity
58+
[BurstCompile]
59+
partial struct ShipTrackingJob : IJob
5860
{
5961
public float deltaTime;
6062
public int screenHeight;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ partial struct StaticAsteroidJob : IJobChunk
4040

4141
public void Execute(in ArchetypeChunk chunk, int unfilteredChunkIndex, bool useEnabledMask, in v128 chunkEnabledMask)
4242
{
43+
// This job is not written to support queries with enableable component types.
44+
UnityEngine.Assertions.Assert.IsFalse(useEnabledMask);
45+
4346
// We update the server values infrequently, as we only need the updated
4447
// LocalTransform positions for distance importance scaling & relevancy calculations.
4548
if (isServer && (chunk.SequenceNumber + tick.TickIndexForValidTick) % roundRobinFrequency >= simulationStepBatchSize) return;

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/Asteroid.mat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26-
- MOTIONVECTORS
2726
m_LockedProperties:
2827
m_SavedProperties:
2928
serializedVersion: 3
@@ -101,7 +100,6 @@ Material:
101100
- _Color: {r: 0.19607845, g: 0.6784314, b: 0.68235296, a: 1}
102101
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
103102
m_BuildTextureStacks: []
104-
m_AllowLocking: 1
105103
--- !u!114 &2431409381298675348
106104
MonoBehaviour:
107105
m_ObjectHideFlags: 11
@@ -114,4 +112,4 @@ MonoBehaviour:
114112
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
115113
m_Name:
116114
m_EditorClassIdentifier:
117-
version: 10
115+
version: 7

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/Bullet.mat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 10
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -36,7 +36,6 @@ Material:
3636
disabledShaderPasses:
3737
- SHADOWCASTER
3838
- DepthOnly
39-
- MOTIONVECTORS
4039
m_LockedProperties:
4140
m_SavedProperties:
4241
serializedVersion: 3
@@ -114,4 +113,3 @@ Material:
114113
- _Color: {r: 0.79215693, g: 0.050980397, b: 0.6039216, a: 1}
115114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
116115
m_BuildTextureStacks: []
117-
m_AllowLocking: 1

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/LevelBorder.mat‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 10
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,8 +32,7 @@ Material:
3232
m_CustomRenderQueue: 2000
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses:
36-
- MOTIONVECTORS
35+
disabledShaderPasses: []
3736
m_LockedProperties:
3837
m_SavedProperties:
3938
serializedVersion: 3
@@ -100,4 +99,3 @@ Material:
10099
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
101100
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
102101
m_BuildTextureStacks: []
103-
m_AllowLocking: 1

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/Particle.mat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26-
- MOTIONVECTORS
2726
m_LockedProperties:
2827
m_SavedProperties:
2928
serializedVersion: 3
@@ -137,7 +136,6 @@ Material:
137136
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
138137
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
139138
m_BuildTextureStacks: []
140-
m_AllowLocking: 1
141139
--- !u!114 &1789412101197660416
142140
MonoBehaviour:
143141
m_ObjectHideFlags: 11
@@ -150,4 +148,4 @@ MonoBehaviour:
150148
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
151149
m_Name:
152150
m_EditorClassIdentifier:
153-
version: 10
151+
version: 7

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/Ship.mat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 10
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -36,7 +36,6 @@ Material:
3636
disabledShaderPasses:
3737
- SHADOWCASTER
3838
- DepthOnly
39-
- MOTIONVECTORS
4039
m_LockedProperties:
4140
m_SavedProperties:
4241
serializedVersion: 3
@@ -136,4 +135,3 @@ Material:
136135
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
137136
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
138137
m_BuildTextureStacks: []
139-
m_AllowLocking: 1

‎NetcodeSamples/Assets/Samples/Asteroids/Materials/ShipWithShadow.mat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 10
15+
version: 7
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -36,7 +36,6 @@ Material:
3636
disabledShaderPasses:
3737
- SHADOWCASTER
3838
- DepthOnly
39-
- MOTIONVECTORS
4039
m_LockedProperties:
4140
m_SavedProperties:
4241
serializedVersion: 3
@@ -114,4 +113,3 @@ Material:
114113
- _Color: {r: 1, g: 0, b: 0, a: 1}
115114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
116115
m_BuildTextureStacks: []
117-
m_AllowLocking: 1

0 commit comments

Comments
 (0)