Skip to content

Commit a7aa4c8

Browse files
BrianWill-UnityBrianWill-Unity
committed
Physics 101 small fixes
1 parent 8c94830 commit a7aa4c8

22 files changed

Lines changed: 116 additions & 71 deletions

‎Dots101/Physics101/Assets/ActivationPlates/ActivationSystem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void OnCreate(ref SystemState state)
1717
{
1818
state.RequireForUpdate<SimulationSingleton>();
1919
state.RequireForUpdate<ActivationPlates.Config>();
20-
physicsUpdateCount = 1; // this prevents generating an erroneous Exit zone state in the first update
20+
physicsUpdateCount = 1; // start at 1 to prevent generating an erroneous Exit zone state in the first update
2121
}
2222

2323
[BurstCompile]

‎Dots101/Physics101/Assets/ActivationPlates/Box.prefab‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Transform:
2929
m_GameObject: {fileID: 609470847345214054}
3030
serializedVersion: 2
3131
m_LocalRotation: {x: -0.21834558, y: -0.10308238, z: -0.27764606, w: 0.9298451}
32-
m_LocalPosition: {x: 5.65, y: 0.5, z: -5.04}
32+
m_LocalPosition: {x: 1.2, y: 3.03, z: -11.4}
3333
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
3434
m_ConstrainProportionsScale: 0
3535
m_Children: []
@@ -60,6 +60,9 @@ MeshRenderer:
6060
m_ReflectionProbeUsage: 1
6161
m_RayTracingMode: 2
6262
m_RayTraceProcedural: 0
63+
m_RayTracingAccelStructBuildFlagsOverride: 0
64+
m_RayTracingAccelStructBuildFlags: 1
65+
m_SmallMeshCulling: 1
6366
m_RenderingLayerMask: 1
6467
m_RendererPriority: 0
6568
m_Materials:

‎Dots101/Physics101/Assets/ActivationPlates/Subscenes/ActivationPlatesSubscene.unity‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ BoxCollider:
187187
m_Bits: 0
188188
m_LayerOverridePriority: 0
189189
m_IsTrigger: 1
190-
m_ProvidesContacts: 1
190+
m_ProvidesContacts: 0
191191
m_Enabled: 1
192192
serializedVersion: 3
193193
m_Size: {x: 1, y: 1, z: 1}
@@ -301,7 +301,7 @@ GameObject:
301301
- component: {fileID: 389819656}
302302
- component: {fileID: 389819658}
303303
m_Layer: 0
304-
m_Name: OnTriggerStay
304+
m_Name: ContinuousTrigger
305305
m_TagString: Untagged
306306
m_Icon: {fileID: 0}
307307
m_NavMeshLayer: 0
@@ -323,7 +323,7 @@ BoxCollider:
323323
m_Bits: 0
324324
m_LayerOverridePriority: 0
325325
m_IsTrigger: 1
326-
m_ProvidesContacts: 1
326+
m_ProvidesContacts: 0
327327
m_Enabled: 1
328328
serializedVersion: 3
329329
m_Size: {x: 1, y: 1, z: 1}
@@ -437,7 +437,7 @@ GameObject:
437437
- component: {fileID: 598141967}
438438
- component: {fileID: 598141966}
439439
m_Layer: 0
440-
m_Name: OnTriggerExit
440+
m_Name: ExitTrigger
441441
m_TagString: Untagged
442442
m_Icon: {fileID: 0}
443443
m_NavMeshLayer: 0
@@ -485,7 +485,7 @@ BoxCollider:
485485
m_Bits: 0
486486
m_LayerOverridePriority: 0
487487
m_IsTrigger: 1
488-
m_ProvidesContacts: 1
488+
m_ProvidesContacts: 0
489489
m_Enabled: 1
490490
serializedVersion: 3
491491
m_Size: {x: 1, y: 1, z: 1}
@@ -832,7 +832,7 @@ GameObject:
832832
- component: {fileID: 1807978176}
833833
- component: {fileID: 1807978177}
834834
m_Layer: 0
835-
m_Name: OnTriggerEnter
835+
m_Name: ReenterableTrigger
836836
m_TagString: Untagged
837837
m_Icon: {fileID: 0}
838838
m_NavMeshLayer: 0
@@ -854,7 +854,7 @@ BoxCollider:
854854
m_Bits: 0
855855
m_LayerOverridePriority: 0
856856
m_IsTrigger: 1
857-
m_ProvidesContacts: 1
857+
m_ProvidesContacts: 0
858858
m_Enabled: 1
859859
serializedVersion: 3
860860
m_Size: {x: 1, y: 1, z: 1}

‎Dots101/Physics101/Assets/Blender/BladeAuthoring.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using Unity.Entities;
22
using Unity.Mathematics;
33
using UnityEngine;
4+
using UnityEngine.Serialization;
45

56
namespace Blender
67
{
78
public class BladeAuthoring : MonoBehaviour
89
{
9-
public Vector3 RotatationAxis;
10+
public Vector3 AngularVelocity;
1011

1112
public class Baker : Baker<BladeAuthoring>
1213
{
@@ -15,15 +16,15 @@ public override void Bake(BladeAuthoring authoring)
1516
var entity = GetEntity(TransformUsageFlags.Dynamic);
1617
AddComponent(entity, new Blade
1718
{
18-
RotationAxis = authoring.RotatationAxis,
19+
AngularVelocity = authoring.AngularVelocity,
1920
});
2021
}
2122
}
2223
}
2324

2425
public struct Blade : IComponentData
2526
{
26-
public float3 RotationAxis;
27+
public float3 AngularVelocity;
2728
}
2829
}
2930

‎Dots101/Physics101/Assets/Blender/BuoyantSystem.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Unity.Physics;
44
using Unity.Transforms;
55
using Unity.Mathematics;
6+
using Unity.Physics.Extensions;
67

78
namespace Blender
89
{
@@ -19,13 +20,14 @@ public void OnUpdate(ref SystemState state)
1920
float deltaTime = SystemAPI.Time.DeltaTime;
2021

2122
foreach (var (buoyant, transform, velocity, mass) in
22-
SystemAPI.Query<RefRO<Buoyancy>, RefRW<LocalTransform>, RefRW<PhysicsVelocity>, RefRO<PhysicsMass>>())
23+
SystemAPI
24+
.Query<RefRO<Buoyancy>, RefRW<LocalTransform>, RefRW<PhysicsVelocity>, RefRO<PhysicsMass>>())
2325
{
2426
float3 currentPos = transform.ValueRW.Position;
25-
27+
2628
float depth = buoyant.ValueRO.WaterLevel - currentPos.y;
27-
float buoyancyForce = depth * buoyant.ValueRO.BuoyancyForce;
28-
velocity.ValueRW.Linear.y += buoyancyForce * deltaTime / mass.ValueRO.InverseMass;
29+
float buoyancyForce = depth * buoyant.ValueRO.BuoyancyForce * deltaTime;
30+
velocity.ValueRW.ApplyLinearImpulse(mass.ValueRO, new float3(0, buoyancyForce, 0));
2931

3032
// apply water drag
3133
velocity.ValueRW.Linear *= 1.0f - buoyant.ValueRO.Drag * deltaTime;

‎Dots101/Physics101/Assets/Blender/RotateBladeSystem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void OnUpdate(ref SystemState state)
1717
foreach (var (bladeData, velocity) in
1818
SystemAPI.Query<RefRO<Blade>, RefRW<PhysicsVelocity>>())
1919
{
20-
velocity.ValueRW.Angular = bladeData.ValueRO.RotationAxis;
20+
velocity.ValueRW.Angular = bladeData.ValueRO.AngularVelocity;
2121
}
2222
}
2323
}

‎Dots101/Physics101/Assets/Blender/Subscenes/BlenderSubscene.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ MonoBehaviour:
565565
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
566566
m_Name:
567567
m_EditorClassIdentifier:
568-
RotatationAxis: {x: 0, y: 7, z: 0}
568+
AngularVelocity: {x: 0, y: 7, z: 0}
569569
--- !u!54 &973478498
570570
Rigidbody:
571571
m_ObjectHideFlags: 0
@@ -823,7 +823,7 @@ MonoBehaviour:
823823
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
824824
m_Name:
825825
m_EditorClassIdentifier:
826-
RotatationAxis: {x: 0, y: 7, z: 0}
826+
AngularVelocity: {x: 0, y: 7, z: 0}
827827
--- !u!54 &1077795460
828828
Rigidbody:
829829
m_ObjectHideFlags: 0

‎Dots101/Physics101/Assets/Blender/Subscenes/BuoyancySubscene.unity‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ GameObject:
349349
- component: {fileID: 427673393}
350350
- component: {fileID: 427673394}
351351
m_Layer: 0
352-
m_Name: BuoyancyTrigger
352+
m_Name: BuoyancyZone
353353
m_TagString: Untagged
354354
m_Icon: {fileID: 0}
355355
m_NavMeshLayer: 0
@@ -436,8 +436,8 @@ MonoBehaviour:
436436
m_Name:
437437
m_EditorClassIdentifier:
438438
WaterLevel: 14
439-
BuoyancyForce: 5
440-
Drag: 1
439+
BuoyancyForce: 3.5
440+
Drag: 1.5
441441
--- !u!65 &427673394
442442
BoxCollider:
443443
m_ObjectHideFlags: 0
@@ -492,7 +492,7 @@ MonoBehaviour:
492492
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
493493
m_Name:
494494
m_EditorClassIdentifier:
495-
RotatationAxis: {x: 0, y: 4, z: 0}
495+
AngularVelocity: {x: 0, y: 6, z: 0}
496496
--- !u!65 &515670738
497497
BoxCollider:
498498
m_ObjectHideFlags: 0
@@ -642,7 +642,7 @@ MonoBehaviour:
642642
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
643643
m_Name:
644644
m_EditorClassIdentifier:
645-
RotatationAxis: {x: 0, y: 4, z: 0}
645+
AngularVelocity: {x: 0, y: 6, z: 0}
646646
--- !u!65 &559039355
647647
BoxCollider:
648648
m_ObjectHideFlags: 0
@@ -900,7 +900,7 @@ MonoBehaviour:
900900
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
901901
m_Name:
902902
m_EditorClassIdentifier:
903-
RotatationAxis: {x: 0, y: 4, z: 0}
903+
AngularVelocity: {x: 0, y: 6, z: 0}
904904
--- !u!65 &1352772677
905905
BoxCollider:
906906
m_ObjectHideFlags: 0
@@ -1050,7 +1050,7 @@ MonoBehaviour:
10501050
m_Script: {fileID: 11500000, guid: 160977355ff864198a448fb2d4bbf94a, type: 3}
10511051
m_Name:
10521052
m_EditorClassIdentifier:
1053-
RotatationAxis: {x: 0, y: 4, z: 0}
1053+
AngularVelocity: {x: 0, y: 6, z: 0}
10541054
--- !u!65 &1633175646
10551055
BoxCollider:
10561056
m_ObjectHideFlags: 0

‎Dots101/Physics101/Assets/BreakingBricks/Ball.prefab‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ MeshRenderer:
6161
m_ReflectionProbeUsage: 1
6262
m_RayTracingMode: 2
6363
m_RayTraceProcedural: 0
64+
m_RayTracingAccelStructBuildFlagsOverride: 0
65+
m_RayTracingAccelStructBuildFlags: 1
66+
m_SmallMeshCulling: 1
6467
m_RenderingLayerMask: 1
6568
m_RendererPriority: 0
6669
m_Materials:
@@ -146,4 +149,3 @@ MonoBehaviour:
146149
m_Script: {fileID: 11500000, guid: 39f9aa8562e843cda34bea2f33cd3f3e, type: 3}
147150
m_Name:
148151
m_EditorClassIdentifier:
149-
TimeToLive: 10

‎Dots101/Physics101/Assets/BreakingBricks/Brick.prefab‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ MeshRenderer:
6161
m_ReflectionProbeUsage: 1
6262
m_RayTracingMode: 2
6363
m_RayTraceProcedural: 0
64+
m_RayTracingAccelStructBuildFlagsOverride: 0
65+
m_RayTracingAccelStructBuildFlags: 1
66+
m_SmallMeshCulling: 1
6467
m_RenderingLayerMask: 1
6568
m_RendererPriority: 0
6669
m_Materials:
@@ -102,7 +105,7 @@ BoxCollider:
102105
m_Bits: 0
103106
m_LayerOverridePriority: 0
104107
m_IsTrigger: 0
105-
m_ProvidesContacts: 0
108+
m_ProvidesContacts: 1
106109
m_Enabled: 1
107110
serializedVersion: 3
108111
m_Size: {x: 1, y: 1, z: 1}

0 commit comments

Comments
 (0)