Merge pull request #2893 from joanllobera:fix/passive-attribute-droped
PiperOrigin-RevId: 878958794 Change-Id: I2d1fe080bd02b5c3e685cefbf36d45821cdfb46d
This commit is contained in:
@@ -22,8 +22,8 @@ public static class ConvertMj2Rca {
|
||||
private static MjActuator[] _actuators;
|
||||
private static MjExclude[] _excludes;
|
||||
public static GameObject ConvertTree(MjBody mjRoot) {
|
||||
_excludes = GameObject.FindObjectsOfType<MjExclude>();
|
||||
_actuators = GameObject.FindObjectsOfType<MjActuator>();
|
||||
_excludes = GameObject.FindObjectsByType<MjExclude>(FindObjectsSortMode.None);
|
||||
_actuators = GameObject.FindObjectsByType<MjActuator>(FindObjectsSortMode.None);
|
||||
// does it have joints with its parent?
|
||||
bool jointFound = false;
|
||||
foreach (Transform mjChild in mjRoot.transform) {
|
||||
@@ -283,7 +283,7 @@ public static class ConvertMj2Rca {
|
||||
}
|
||||
|
||||
// The list of available ArticulationBodies changes as the recursion advances
|
||||
foreach (var rcOther in GameObject.FindObjectsOfType<ArticulationBody>()) {
|
||||
foreach (var rcOther in GameObject.FindObjectsByType<ArticulationBody>(FindObjectsSortMode.None)) {
|
||||
// don't add explicit exclusion to immediate parent (no children yet)
|
||||
if (rcParentParent != rcOther && rcOther.gameObject.name == other) {
|
||||
// MISSING: Physics.IgnoreCollision statements between all colliders of rcParent
|
||||
|
||||
Reference in New Issue
Block a user