chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2893 from joanllobera:fix/passive-attribute-droped

Browse Source 
PiperOrigin-RevId: 878958794
Change-Id: I2d1fe080bd02b5c3e685cefbf36d45821cdfb46d
This commit is contained in:
Copybara-Service
2026-03-05 03:18:10 -08:00
parent aef44210cb 1a9469765f
commit f1bcac2952
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unity/Runtime/Components/MjGlobalSettings.cs
+1 -1
View File
@@ -327,7 +327,7 @@ public class MjGlobalSettings : MonoBehaviour {
public static MjGlobalSettings Instance {
get {
if (_instance == null) {
var instances = FindObjectsOfType<MjGlobalSettings>();
var instances = FindObjectsByType<MjGlobalSettings>(FindObjectsSortMode.None);
if (instances.Length > 1) {
throw new InvalidOperationException(
"Only one MjGlobalSettings instance is allowed - please resolve manually.");
unity/Runtime/Components/MjScene.cs
+3 -3
View File
@@ -50,7 +50,7 @@ public class MjScene : MonoBehaviour {
public static MjScene Instance {
get {
if (_instance == null) {
var instances = FindObjectsOfType<MjScene>();
var instances = FindObjectsByType<MjScene>(FindObjectsSortMode.None);
if (instances.Length >= 1) { // even one is too much - _instance shouldn't have been null.
throw new InvalidOperationException(
"A MjScene singleton is created automatically, yet multiple instances exist.");
@@ -135,7 +135,7 @@ public class MjScene : MonoBehaviour {
// I briefly explored that approach, but decided against it. It increases the amount of code
// on the side of the individual components. This solution allows to restrict the code in the
// components to a bare minimum, at the expense of one extra method here.
var hierarchyRoots = FindObjectsOfType<MjComponent>()
var hierarchyRoots = FindObjectsByType<MjComponent>(FindObjectsSortMode.None)
.Where(component => MjHierarchyTool.FindParentComponent(component) == null)
.Select(component => component.transform)
.Distinct();
@@ -209,7 +209,7 @@ public class MjScene : MonoBehaviour {
// 4. rehydrate the physics scene, and sync the Unity scene to it.
public unsafe void RecreateScene() {
// cache joint states in order to re-apply it to the new scene
var joints = FindObjectsOfType<MjBaseJoint>();
var joints = FindObjectsByType<MjBaseJoint>(FindObjectsSortMode.None);
var positions = new Dictionary<MjBaseJoint, double[]>();
var velocities = new Dictionary<MjBaseJoint, double[]>();
foreach (var joint in joints) {