From 5c79a9a8fef439b82574b75f6918e0db03543c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Hodossy?= Date: Fri, 18 Nov 2022 13:10:06 +0000 Subject: [PATCH] Add multiccd option in Unity MJCF parser and writer --- unity/Runtime/Components/MjGlobalSettings.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unity/Runtime/Components/MjGlobalSettings.cs b/unity/Runtime/Components/MjGlobalSettings.cs index 1bdb75c3..398a707f 100644 --- a/unity/Runtime/Components/MjGlobalSettings.cs +++ b/unity/Runtime/Components/MjGlobalSettings.cs @@ -76,6 +76,7 @@ public struct MjcfOptionFlag { public EnableDisableFlag Energy; public EnableDisableFlag FwdInv; public EnableDisableFlag SensorNoise; + public EnableDisableFlag MultiCCD; public static MjcfOptionFlag Default = new MjcfOptionFlag() { Constraint = EnableDisableFlag.enable, Equality = EnableDisableFlag.enable, @@ -92,7 +93,8 @@ public struct MjcfOptionFlag { Override = EnableDisableFlag.disable, Energy = EnableDisableFlag.disable, FwdInv = EnableDisableFlag.disable, - SensorNoise = EnableDisableFlag.disable + SensorNoise = EnableDisableFlag.disable, + MultiCCD = EnableDisableFlag.disable }; public void FromMjcf(XmlElement mjcf) { @@ -115,6 +117,7 @@ public struct MjcfOptionFlag { Energy = mjcf.GetEnumAttribute("energy", localDefault.Energy); FwdInv = mjcf.GetEnumAttribute("fwdinv", localDefault.FwdInv); SensorNoise = mjcf.GetEnumAttribute("sensornoise", localDefault.SensorNoise); + MultiCCD = mjcf.GetEnumAttribute("multiccd", localDefault.MultiCCD); } public void ToMjcf(XmlElement mjcf) { @@ -134,6 +137,7 @@ public struct MjcfOptionFlag { mjcf.SetAttribute("energy", Energy.ToString()); mjcf.SetAttribute("fwdinv", FwdInv.ToString()); mjcf.SetAttribute("sensornoise", SensorNoise.ToString()); + mjcf.SetAttribute("multiccd", MultiCCD.ToString()); } }