xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

pointless changes

This commit is contained in:
Diren D Bharwani 2023-03-03 15:55:43 +08:00
parent 87d2afbd9a
commit a80089c893
6 changed files with 293 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/CollisionTags.SHConfig
View File

@ -5,7 +5,7 @@
4 ScoringWallCollider 0110000000000000 4 ScoringWallCollider 0110000000000000
5 Homeowner 1100000000000000 5 Homeowner 1100000000000000
6 Camera 0010000000000000 6 Camera 0010000000000000
7 8 0000000000000000 7 8 0000001000000000
8 9 0000000000000000 8 9 0000000000000000
9 10 0000000000000000 9 10 0000000000000000
10 11 0000000000000000 10 11 0000000000000000

289
Assets/Scenes/Level2.shade
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/PhysicsTest.shade
View File

@ -166,7 +166,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 2 Collision Tag: 7
Type: Box Type: Box
Half Extents: {x: 1, y: 1, z: 1} Half Extents: {x: 1, y: 1, z: 1}
Friction: 0.400000006 Friction: 0.400000006

2
Assets/Scenes/SS_Playground.shade
View File

@ -28,7 +28,7 @@
Collider Component: Collider Component:
Colliders: Colliders:
- Is Trigger: false - Is Trigger: false
Collision Tag: 1 Collision Tag: 6
Type: Sphere Type: Sphere
Radius: 1 Radius: 1
Friction: 0.400000006 Friction: 0.400000006

2
SHADE_Engine/src/Physics/Collision/Broadphase/SHDynamicAABBTree.h
View File

@ -71,7 +71,7 @@ namespace SHADE
void Update (SHCollisionShapeID id, const SHAABB& AABB); void Update (SHCollisionShapeID id, const SHAABB& AABB);
void Remove (SHCollisionShapeID id) noexcept; void Remove (SHCollisionShapeID id) noexcept;
[[nodiscard]] const std::vector<SHCollisionShapeID>& Query(SHCollisionShapeID id, const SHAABB& AABB) const noexcept; [[nodiscard]] const std::vector<SHCollisionShapeID>& Query(SHCollisionShapeID id, const SHAABB& AABB) const noexcept;
[[nodiscard]] const std::vector<SHCollisionShapeID>& Query(const SHRay& ray, float distance) const noexcept; [[nodiscard]] const std::vector<SHCollisionShapeID>& Query(const SHRay& ray, float distance) const noexcept;
private: private:

2
SHADE_Engine/src/Physics/Dynamics/SHContactManager.cpp
View File

@ -159,8 +159,6 @@ namespace SHADE
continue; continue;
} }
SHLOG_INFO("State {}", static_cast<int>(manifold.state))
updateManifold(manifold, oldManifold); updateManifold(manifold, oldManifold);
++manifoldPair; ++manifoldPair;
} }