From a80089c8938aca0930149da4a66b3da162b746ae Mon Sep 17 00:00:00 2001 From: Diren D Bharwani Date: Fri, 3 Mar 2023 15:55:43 +0800 Subject: [PATCH] pointless changes --- Assets/CollisionTags.SHConfig | 2 +- Assets/Scenes/Level2.shade | 289 ++++++++++++++++++ Assets/Scenes/PhysicsTest.shade | 2 +- Assets/Scenes/SS_Playground.shade | 2 +- .../Collision/Broadphase/SHDynamicAABBTree.h | 2 +- .../src/Physics/Dynamics/SHContactManager.cpp | 2 - 6 files changed, 293 insertions(+), 6 deletions(-) diff --git a/Assets/CollisionTags.SHConfig b/Assets/CollisionTags.SHConfig index 3fb14287..7367425c 100644 --- a/Assets/CollisionTags.SHConfig +++ b/Assets/CollisionTags.SHConfig @@ -5,7 +5,7 @@ 4 ScoringWallCollider 0110000000000000 5 Homeowner 1100000000000000 6 Camera 0010000000000000 -7 8 0000000000000000 +7 8 0000001000000000 8 9 0000000000000000 9 10 0000000000000000 10 11 0000000000000000 diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index e3de1671..2147adb0 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -78,9 +78,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -129,9 +132,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -180,9 +186,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -231,9 +240,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -282,9 +294,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -333,9 +348,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -384,9 +402,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -435,9 +456,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -486,9 +510,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -541,9 +568,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -582,9 +612,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -623,9 +656,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -664,9 +700,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -705,9 +744,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -756,9 +798,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -807,9 +852,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -858,9 +906,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -909,9 +960,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -960,9 +1014,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1011,9 +1068,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1062,9 +1122,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1113,9 +1176,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1164,9 +1230,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1215,9 +1284,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1266,9 +1338,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1317,9 +1392,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1368,9 +1446,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1419,9 +1500,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1470,9 +1554,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1521,9 +1608,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1572,9 +1662,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1623,9 +1716,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1674,9 +1770,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1729,9 +1828,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1780,9 +1882,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1831,9 +1936,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1882,9 +1990,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1933,9 +2044,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -1984,9 +2098,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2035,9 +2152,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2088,9 +2208,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: true Sleeping Enabled: true Freeze Position X: false @@ -2150,9 +2273,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: true Sleeping Enabled: true Freeze Position X: false @@ -2251,6 +2377,7 @@ Text Renderer Component: Text: My name is Brandon. Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 199 @@ -2291,6 +2418,7 @@ Text Renderer Component: Text: My name is Brandon. Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 199 @@ -2311,6 +2439,7 @@ Text Renderer Component: Text: X2 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 199 @@ -2365,9 +2494,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: false + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2546,9 +2678,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2591,9 +2726,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2632,9 +2770,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2673,9 +2814,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2714,9 +2858,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2755,9 +2902,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2800,9 +2950,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2841,9 +2994,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2882,9 +3038,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2923,9 +3082,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -2964,9 +3126,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3009,9 +3174,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3050,9 +3218,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3091,9 +3262,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3132,9 +3306,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3173,9 +3350,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3218,9 +3398,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3259,9 +3442,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3300,9 +3486,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3341,9 +3530,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3382,9 +3574,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3427,9 +3622,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3468,9 +3666,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3509,9 +3710,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3550,9 +3754,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3591,9 +3798,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3636,9 +3846,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3677,9 +3890,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3718,9 +3934,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3759,9 +3978,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3800,9 +4022,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3845,9 +4070,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3886,9 +4114,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3927,9 +4158,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -3968,9 +4202,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4009,9 +4246,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4054,9 +4294,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4095,9 +4338,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4136,9 +4382,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4177,9 +4426,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4218,9 +4470,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4263,9 +4518,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4304,9 +4562,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4345,9 +4606,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4386,9 +4650,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4427,9 +4694,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4472,9 +4742,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4513,9 +4786,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4554,9 +4830,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4595,9 +4874,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4719,9 +5001,12 @@ IsActive: true RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: true Sleeping Enabled: true Freeze Position X: false @@ -4771,9 +5056,12 @@ IsActive: false RigidBody Component: Type: Dynamic + Auto Mass: false + Mass: 1 Drag: 0.00999999978 Angular Drag: 0.100000001 Use Gravity: true + Gravity Scale: 1 Interpolate: false Sleeping Enabled: true Freeze Position X: false @@ -4954,6 +5242,7 @@ Text Renderer Component: Text: Game Pause Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: false UI Component: Canvas ID: 10 diff --git a/Assets/Scenes/PhysicsTest.shade b/Assets/Scenes/PhysicsTest.shade index 442ff096..b82fdf12 100644 --- a/Assets/Scenes/PhysicsTest.shade +++ b/Assets/Scenes/PhysicsTest.shade @@ -166,7 +166,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 2 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 1} Friction: 0.400000006 diff --git a/Assets/Scenes/SS_Playground.shade b/Assets/Scenes/SS_Playground.shade index cedb2867..c151cd81 100644 --- a/Assets/Scenes/SS_Playground.shade +++ b/Assets/Scenes/SS_Playground.shade @@ -28,7 +28,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 6 Type: Sphere Radius: 1 Friction: 0.400000006 diff --git a/SHADE_Engine/src/Physics/Collision/Broadphase/SHDynamicAABBTree.h b/SHADE_Engine/src/Physics/Collision/Broadphase/SHDynamicAABBTree.h index 292c3528..73e44db9 100644 --- a/SHADE_Engine/src/Physics/Collision/Broadphase/SHDynamicAABBTree.h +++ b/SHADE_Engine/src/Physics/Collision/Broadphase/SHDynamicAABBTree.h @@ -71,7 +71,7 @@ namespace SHADE void Update (SHCollisionShapeID id, const SHAABB& AABB); void Remove (SHCollisionShapeID id) noexcept; - [[nodiscard]] const std::vector& Query(SHCollisionShapeID id, const SHAABB& AABB) const noexcept; + [[nodiscard]] const std::vector& Query(SHCollisionShapeID id, const SHAABB& AABB) const noexcept; [[nodiscard]] const std::vector& Query(const SHRay& ray, float distance) const noexcept; private: diff --git a/SHADE_Engine/src/Physics/Dynamics/SHContactManager.cpp b/SHADE_Engine/src/Physics/Dynamics/SHContactManager.cpp index 2e0c6bfc..caf2a7d6 100644 --- a/SHADE_Engine/src/Physics/Dynamics/SHContactManager.cpp +++ b/SHADE_Engine/src/Physics/Dynamics/SHContactManager.cpp @@ -159,8 +159,6 @@ namespace SHADE continue; } - SHLOG_INFO("State {}", static_cast(manifold.state)) - updateManifold(manifold, oldManifold); ++manifoldPair; }