Skip to content

Commit b8fa7d6

Browse files
chore: 6000.3.0a6 updates (#3600)
## Purpose of this PR Adding asmdef define for 6000.3.0a6 or higher and using that within RigidbodyContactEventManager to switch from using otherBodyInstanceID to otherBodyEntityId. ### Jira ticket NA ### Changelog NA <!-- Uncomment and mark items off with a * if this PR deprecates any API: ### Deprecated API - [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter yyyy-mm-dd)` entry. - [ ] An [api updater](https://confluence.unity3d.com/display/DEV/Obsolete+API+updaters) was added. - [ ] Deprecation of the API is explained in the CHANGELOG. - [ ] The users can understand why this API was removed and what they should use instead. --> ## Documentation [//]: # ( This section is REQUIRED and should mention what documentation changes were following the changes in this PR. We should always evaluate if the changes in this PR require any documentation changes. ) - No documentation changes or additions were necessary. ## Testing & QA [//]: # ( This section is REQUIRED and should describe how the changes were tested and how should they be tested when Playtesting for the release. It can range from "edge case covered by unit tests" to "manual testing required and new sample was added". Expectation is that PR creator does some manual testing and provides a summary of it here.) ### Functional Testing [//]: # (If checked, List manual tests that have been performed.) _Manual testing :_ - [ ] `Manual testing done` _Automated tests:_ - [X] `Covered by existing automated tests` - [ ] `Covered by new automated tests` _Does the change require QA team to:_ - [ ] `Review automated tests`? - [ ] `Execute manual tests`? If any boxes above are checked, please add QA as a PR reviewer. ## Backport This is an NGO v2.x.x only update since NGO v1.x.x will not be supported on 6.3.
1 parent 8292b0f commit b8fa7d6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,13 @@ public void Execute(int index)
374374

375375
var result = new JobResultStruct()
376376
{
377+
#if UNITY_6000_3_0A6_OR_HIGHER
378+
ThisInstanceID = PairedHeaders[index].bodyEntityId,
379+
OtherInstanceID = PairedHeaders[index].otherBodyEntityId,
380+
#else
377381
ThisInstanceID = PairedHeaders[index].bodyInstanceID,
378382
OtherInstanceID = PairedHeaders[index].otherBodyInstanceID,
383+
#endif
379384
AverageNormal = averageNormal,
380385
HasCollisionStay = collisionStaycount != 0,
381386
AverageCollisionStayNormal = averageCollisionStay,

com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
"name": "Unity",
7878
"expression": "6000.1.0a1",
7979
"define": "HOSTNAME_RESOLUTION_AVAILABLE"
80+
},
81+
{
82+
"name": "Unity",
83+
"expression": "6000.3.0a6",
84+
"define": "UNITY_6000_3_0A6_OR_HIGHER"
8085
}
8186
],
8287
"noEngineReferences": false

0 commit comments

Comments
 (0)