Skip to content

Commit 50dbdd8

Browse files
authored
Update EntityComponentSystem Samples (#305)
* Update Entities 101 * Update Jobs101 * Update and cleanup DotsUI * Update Physics101 * Update EntitiesSamples * Update URP and HDRP samples * Update NetcodeSamples * Update Physics Samples * Update HDRP Samples * Update URP Samples * Fix and Update Netcode 101
1 parent 943b90b commit 50dbdd8

File tree

1,686 files changed

+169506
-32541
lines changed

Some content is hidden

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

1,686 files changed

+169506
-32541
lines changed

Dots101/Entities101/Assets/Firefighters/Common/Bot.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ MonoBehaviour:
133133
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
134134
m_Name:
135135
m_EditorClassIdentifier:
136-
version: 9
136+
version: 10

Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ MonoBehaviour:
133133
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
134134
m_Name:
135135
m_EditorClassIdentifier:
136-
version: 9
136+
version: 10

Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ExecuteAuthoring : MonoBehaviour
1111
public bool ExecuteTeamSystem;
1212
public bool ExecuteUISystem;
1313
public bool ExecuteAnimationSystem;
14-
14+
1515
class Baker : Baker<ExecuteAuthoring>
1616
{
1717
public override void Bake(ExecuteAuthoring authoring)
@@ -36,12 +36,12 @@ public override void Bake(ExecuteAuthoring authoring)
3636
{
3737
AddComponent<ExecuteTeam>(entity);
3838
}
39-
39+
4040
if (authoring.ExecuteUISystem)
4141
{
4242
AddComponent<ExecuteUI>(entity);
4343
}
44-
44+
4545
if (authoring.ExecuteAnimationSystem)
4646
{
4747
AddComponent<ExecuteAnimation>(entity);
@@ -50,27 +50,15 @@ public override void Bake(ExecuteAuthoring authoring)
5050
}
5151
}
5252

53-
public struct ExecuteHeat : IComponentData
54-
{
55-
}
53+
public struct ExecuteHeat : IComponentData { }
5654

57-
public struct ExecuteBot : IComponentData
58-
{
59-
}
55+
public struct ExecuteBot : IComponentData { }
6056

61-
public struct ExecuteBucket : IComponentData
62-
{
63-
}
57+
public struct ExecuteBucket : IComponentData { }
6458

65-
public struct ExecuteTeam : IComponentData
66-
{
67-
}
68-
69-
public struct ExecuteUI : IComponentData
70-
{
71-
}
72-
73-
public struct ExecuteAnimation : IComponentData
74-
{
75-
}
59+
public struct ExecuteTeam : IComponentData { }
60+
61+
public struct ExecuteUI : IComponentData { }
62+
63+
public struct ExecuteAnimation : IComponentData { }
7664
}

Dots101/Entities101/Assets/Firefighters/Common/GroundCell.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ MonoBehaviour:
133133
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
134134
m_Name:
135135
m_EditorClassIdentifier:
136-
version: 9
136+
version: 10

Dots101/Entities101/Assets/Firefighters/Common/Pond.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ MonoBehaviour:
133133
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
134134
m_Name:
135135
m_EditorClassIdentifier:
136-
version: 9
136+
version: 10

Dots101/Entities101/Assets/Firefighters/Common/Warrior/Materials/MAT_Warrior_Red.mat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _ALPHATEST_ON
16+
- _EMISSION
1617
- _METALLICSPECGLOSSMAP
1718
- _NORMALMAP
1819
m_InvalidKeywords: []
@@ -87,6 +88,7 @@ Material:
8788
m_Offset: {x: 0, y: 0}
8889
m_Ints: []
8990
m_Floats:
91+
- _AddPrecomputedVelocity: 0
9092
- _AlphaClip: 1
9193
- _AlphaToMask: 1
9294
- _Blend: 0
@@ -133,6 +135,7 @@ Material:
133135
- _Surface: 0
134136
- _UVSec: 0
135137
- _WorkflowMode: 1
138+
- _XRMotionVectorsPass: 1
136139
- _ZWrite: 1
137140
m_Colors:
138141
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
@@ -156,4 +159,4 @@ MonoBehaviour:
156159
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
157160
m_Name:
158161
m_EditorClassIdentifier:
159-
version: 9
162+
version: 10

Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ public struct TeamMember : IBufferElementData
1717
}
1818

1919
// used as a flag to signal that the team needs to be repositioned
20-
public struct RepositionLine : IComponentData, IEnableableComponent
21-
{
22-
}
20+
public struct RepositionLine : IComponentData, IEnableableComponent { }
2321

2422
public struct Heat : IBufferElementData
2523
{
2624
public float Value;
2725
}
28-
26+
2927
public class BotAnimation : IComponentData
3028
{
31-
public GameObject AnimatedGO; // the GO that is rendered and animated
29+
public GameObject AnimatedGO; // the GO that is rendered and animated
3230
}
3331
}

Dots101/Entities101/Assets/Firefighters/Step 1/GroundCellAuthoring.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ public override void Bake(GroundCellAuthoring authoring)
1515
}
1616
}
1717

18-
public struct GroundCell : IComponentData
19-
{
20-
21-
}
18+
public struct GroundCell : IComponentData { }
2219
}
23-

Dots101/Entities101/Assets/Firefighters/Step 1/PondAuthoring.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ public override void Bake(PondAuthoring authoring)
1515
}
1616
}
1717

18-
public struct Pond : IComponentData
19-
{
20-
21-
}
18+
public struct Pond : IComponentData { }
2219
}
23-

Dots101/Entities101/Assets/HelloCube/1. MainThread/HelloCube_MainThread.unity

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 10
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
47-
m_GIWorkflowMode: 1
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4847
m_GISettings:
4948
serializedVersion: 2
5049
m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
6968
m_TextureCompression: 1
70-
m_FinalGather: 0
71-
m_FinalGatherFiltering: 1
72-
m_FinalGatherRayCount: 256
7369
m_ReflectionCompression: 2
7470
m_MixedBakeMode: 2
7571
m_BakeBackend: 1
@@ -97,7 +93,7 @@ LightmapSettings:
9793
m_ExportTrainingData: 0
9894
m_TrainingDataDestination: TrainingData
9995
m_LightProbeSampleCountMultiplier: 4
100-
m_LightingDataAsset: {fileID: 0}
96+
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
10197
m_LightingSettings: {fileID: 0}
10298
--- !u!196 &4
10399
NavMeshSettings:
@@ -159,8 +155,8 @@ Camera:
159155
m_GameObject: {fileID: 194095666}
160156
m_Enabled: 1
161157
serializedVersion: 2
162-
m_ClearFlags: 1
163-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
158+
m_ClearFlags: 2
159+
m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1}
164160
m_projectionMatrixMode: 1
165161
m_GateFitMode: 2
166162
m_FOVAxisMode: 0
@@ -208,14 +204,14 @@ Transform:
208204
m_PrefabInstance: {fileID: 0}
209205
m_PrefabAsset: {fileID: 0}
210206
m_GameObject: {fileID: 194095666}
211-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
212-
m_LocalPosition: {x: 0, y: 1, z: -10}
207+
serializedVersion: 2
208+
m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
209+
m_LocalPosition: {x: 0, y: 3, z: -3}
213210
m_LocalScale: {x: 1, y: 1, z: 1}
214211
m_ConstrainProportionsScale: 0
215212
m_Children: []
216213
m_Father: {fileID: 0}
217-
m_RootOrder: 0
218-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
214+
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
219215
--- !u!114 &194095670
220216
MonoBehaviour:
221217
m_ObjectHideFlags: 0
@@ -246,19 +242,20 @@ MonoBehaviour:
246242
m_Dithering: 0
247243
m_ClearDepth: 1
248244
m_AllowXRRendering: 1
245+
m_AllowHDROutput: 1
249246
m_UseScreenCoordOverride: 0
250247
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
251248
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
252249
m_RequiresDepthTexture: 0
253250
m_RequiresColorTexture: 0
254-
m_Version: 2
255251
m_TaaSettings:
256-
quality: 3
257-
frameInfluence: 0.1
258-
jitterScale: 1
259-
mipBias: 0
260-
varianceClampScale: 0.9
261-
contrastAdaptiveSharpening: 0
252+
m_Quality: 3
253+
m_FrameInfluence: 0.1
254+
m_JitterScale: 1
255+
m_MipBias: 0
256+
m_VarianceClampScale: 0.9
257+
m_ContrastAdaptiveSharpening: 0
258+
m_Version: 2
262259
--- !u!1 &948347921
263260
GameObject:
264261
m_ObjectHideFlags: 0
@@ -285,10 +282,9 @@ Light:
285282
m_PrefabAsset: {fileID: 0}
286283
m_GameObject: {fileID: 948347921}
287284
m_Enabled: 1
288-
serializedVersion: 10
285+
serializedVersion: 11
289286
m_Type: 1
290-
m_Shape: 0
291-
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
287+
m_Color: {r: 1, g: 1, b: 1, a: 1}
292288
m_Intensity: 1
293289
m_Range: 10
294290
m_SpotAngle: 30
@@ -298,7 +294,7 @@ Light:
298294
m_Type: 2
299295
m_Resolution: -1
300296
m_CustomResolution: -1
301-
m_Strength: 1
297+
m_Strength: 0.5
302298
m_Bias: 0.05
303299
m_NormalBias: 0.4
304300
m_NearPlane: 0.2
@@ -337,22 +333,26 @@ Light:
337333
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
338334
m_UseBoundingSphereOverride: 0
339335
m_UseViewFrustumForShadowCasterCull: 1
336+
m_ForceVisible: 0
340337
m_ShadowRadius: 0
341338
m_ShadowAngle: 0
339+
m_LightUnit: 1
340+
m_LuxAtDistance: 1
341+
m_EnableSpotReflector: 1
342342
--- !u!4 &948347923
343343
Transform:
344344
m_ObjectHideFlags: 0
345345
m_CorrespondingSourceObject: {fileID: 0}
346346
m_PrefabInstance: {fileID: 0}
347347
m_PrefabAsset: {fileID: 0}
348348
m_GameObject: {fileID: 948347921}
349+
serializedVersion: 2
349350
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
350351
m_LocalPosition: {x: 0, y: 3, z: 0}
351352
m_LocalScale: {x: 1, y: 1, z: 1}
352353
m_ConstrainProportionsScale: 0
353354
m_Children: []
354355
m_Father: {fileID: 0}
355-
m_RootOrder: 1
356356
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
357357
--- !u!114 &948347924
358358
MonoBehaviour:
@@ -366,17 +366,23 @@ MonoBehaviour:
366366
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
367367
m_Name:
368368
m_EditorClassIdentifier:
369-
m_Version: 3
370369
m_UsePipelineSettings: 1
371370
m_AdditionalLightsShadowResolutionTier: 2
372-
m_LightLayerMask: 1
373-
m_RenderingLayers: 1
374371
m_CustomShadowLayers: 0
375-
m_ShadowLayerMask: 1
376-
m_ShadowRenderingLayers: 1
377372
m_LightCookieSize: {x: 1, y: 1}
378373
m_LightCookieOffset: {x: 0, y: 0}
379374
m_SoftShadowQuality: 2
375+
m_RenderingLayersMask:
376+
serializedVersion: 0
377+
m_Bits: 1
378+
m_ShadowRenderingLayersMask:
379+
serializedVersion: 0
380+
m_Bits: 1
381+
m_Version: 4
382+
m_LightLayerMask: 1
383+
m_ShadowLayerMask: 1
384+
m_RenderingLayers: 1
385+
m_ShadowRenderingLayers: 1
380386
--- !u!1 &1382613142
381387
GameObject:
382388
m_ObjectHideFlags: 0
@@ -422,11 +428,18 @@ Transform:
422428
m_PrefabInstance: {fileID: 0}
423429
m_PrefabAsset: {fileID: 0}
424430
m_GameObject: {fileID: 1382613142}
431+
serializedVersion: 2
425432
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
426433
m_LocalPosition: {x: 0, y: 0, z: 0}
427434
m_LocalScale: {x: 1, y: 1, z: 1}
428435
m_ConstrainProportionsScale: 0
429436
m_Children: []
430437
m_Father: {fileID: 0}
431-
m_RootOrder: 2
432438
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
439+
--- !u!1660057539 &9223372036854775807
440+
SceneRoots:
441+
m_ObjectHideFlags: 0
442+
m_Roots:
443+
- {fileID: 194095669}
444+
- {fileID: 948347923}
445+
- {fileID: 1382613144}

0 commit comments

Comments
 (0)