Skip to content

Commit b29ad74

Browse files
backport of minor physics sample fixes for 1.2
1 parent b00d925 commit b29ad74

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

PhysicsSamples/Assets/9. Modify/Prefabs/ExplosionSpawner.prefab

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Transform:
3030
m_ConstrainProportionsScale: 0
3131
m_Children: []
3232
m_Father: {fileID: 0}
33-
m_RootOrder: 0
3433
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3534
--- !u!114 &7414927642867552315
3635
MonoBehaviour:
@@ -46,5 +45,5 @@ MonoBehaviour:
4645
m_EditorClassIdentifier:
4746
Prefab: {fileID: 9019979733640190286, guid: b58133b914c853f43aaf1cd8cb3333a7, type: 3}
4847
Count: 200
49-
Countdown: 100
48+
Countdown: 50
5049
Force: 500

PhysicsSamples/Assets/9. Modify/Scripts/Systems/RotateThroughCollisionFiltersSystem.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ in SystemAPI.Query<RefRO<PhysicsCollider>, RenderMeshArray, RefRO<ChangeCollisio
9191

9292
if (index > -1)
9393
{
94-
var newMeshInfo = MaterialMeshInfo.FromRenderMeshArrayIndices(
95-
index, 0);
96-
EntityManager.SetComponentData(entity, newMeshInfo);
94+
var newMeshInfo = EntityManager.GetComponentData<MaterialMeshInfo>(entity);
95+
newMeshInfo.Material = MaterialMeshInfo.ArrayIndexToStaticIndex(index);
9796
}
9897
}
9998
}

0 commit comments

Comments
 (0)