Skip to content

Commit e906423

Browse files
BrianWill-UnityBrianWill-Unity
committed
update samples for the 1.3 packages and Unity 6
1 parent 15105e7 commit e906423

File tree

707 files changed

+45739
-6989
lines changed

Some content is hidden

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

707 files changed

+45739
-6989
lines changed

‎EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -131,3 +132,4 @@ Material:
131132
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132133
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133134
m_BuildTextureStacks: []
135+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Baking/AutoAuthoring/Green.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -131,3 +132,4 @@ Material:
131132
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132133
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133134
m_BuildTextureStacks: []
135+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Baking/AutoAuthoring/Red.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -131,3 +132,4 @@ Material:
131132
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132133
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133134
m_BuildTextureStacks: []
135+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Baking/AutoAuthoring/SpawnerSystem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void OnUpdate(ref SystemState state)
5353

5454
var materialMeshInfo = em.GetComponentData<MaterialMeshInfo>(entity);
5555
var renderMeshArray = em.GetSharedComponentManaged<RenderMeshArray>(entity);
56-
renderMeshArray.Materials[MaterialMeshInfo.StaticIndexToArrayIndex(materialMeshInfo.Material)] =
56+
renderMeshArray.MaterialReferences[MaterialMeshInfo.StaticIndexToArrayIndex(materialMeshInfo.Material)] =
5757
spawner.Material;
5858
renderMeshArray.ResetHash128();
5959

‎EntitiesSamples/Assets/Baking/Default.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -118,6 +119,7 @@ Material:
118119
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119120
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120121
m_BuildTextureStacks: []
122+
m_AllowLocking: 1
121123
--- !u!114 &7955112743622329414
122124
MonoBehaviour:
123125
m_ObjectHideFlags: 11
@@ -130,4 +132,4 @@ MonoBehaviour:
130132
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
131133
m_Name:
132134
m_EditorClassIdentifier:
133-
version: 7
135+
version: 9

‎EntitiesSamples/Assets/Baking/PrefabReference/Green.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -131,3 +132,4 @@ Material:
131132
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132133
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133134
m_BuildTextureStacks: []
135+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Boids/SampleAssets/Materials/Fish.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_DoubleSidedGI: 0
3333
m_CustomRenderQueue: -1
3434
stringTagMap: {}
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -189,3 +190,4 @@ Material:
189190
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
190191
- _SpecColor: {r: 0.16176468, g: 0.16176468, b: 0.16176468, a: 1}
191192
m_BuildTextureStacks: []
193+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Boids/SampleAssets/Materials/Floor1.mat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: 2000
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -125,6 +126,7 @@ Material:
125126
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
126127
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
127128
m_BuildTextureStacks: []
129+
m_AllowLocking: 1
128130
--- !u!114 &5030888136031534409
129131
MonoBehaviour:
130132
m_ObjectHideFlags: 11
@@ -137,4 +139,4 @@ MonoBehaviour:
137139
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
138140
m_Name:
139141
m_EditorClassIdentifier:
140-
version: 7
142+
version: 9

‎EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: 2000
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -138,3 +139,4 @@ Material:
138139
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
139140
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
140141
m_BuildTextureStacks: []
142+
m_AllowLocking: 1

‎EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall2.mat‎

Lines changed: 4 additions & 2 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: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
3333
m_CustomRenderQueue: 2000
3434
stringTagMap:
3535
RenderType: Opaque
36-
disabledShaderPasses: []
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
3738
m_LockedProperties:
3839
m_SavedProperties:
3940
serializedVersion: 3
@@ -139,3 +140,4 @@ Material:
139140
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
140141
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
141142
m_BuildTextureStacks: []
143+
m_AllowLocking: 1

0 commit comments

Comments
 (0)