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

Merge pull request #593 from Balint-H:feature/unity-ccd

Browse Source 
PiperOrigin-RevId: 489551476
Change-Id: I751d2faa95d82f201614e8a3f08a9629492bfbe7
This commit is contained in:
Copybara-Service
2022-11-18 13:38:51 -08:00
parent adc635f158 5c79a9a8fe
commit 6f2092bef2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unity/Runtime/Components/MjGlobalSettings.cs
+5 -1
View File
@@ -76,6 +76,7 @@ public struct MjcfOptionFlag {
public EnableDisableFlag Energy; public EnableDisableFlag Energy;
public EnableDisableFlag FwdInv; public EnableDisableFlag FwdInv;
public EnableDisableFlag SensorNoise; public EnableDisableFlag SensorNoise;
public EnableDisableFlag MultiCCD;
public static MjcfOptionFlag Default = new MjcfOptionFlag() { public static MjcfOptionFlag Default = new MjcfOptionFlag() {
Constraint = EnableDisableFlag.enable, Constraint = EnableDisableFlag.enable,
Equality = EnableDisableFlag.enable, Equality = EnableDisableFlag.enable,
@@ -92,7 +93,8 @@ public struct MjcfOptionFlag {
Override = EnableDisableFlag.disable, Override = EnableDisableFlag.disable,
Energy = EnableDisableFlag.disable, Energy = EnableDisableFlag.disable,
FwdInv = EnableDisableFlag.disable, FwdInv = EnableDisableFlag.disable,
SensorNoise = EnableDisableFlag.disable SensorNoise = EnableDisableFlag.disable,
MultiCCD = EnableDisableFlag.disable
}; };
public void FromMjcf(XmlElement mjcf) { public void FromMjcf(XmlElement mjcf) {
@@ -115,6 +117,7 @@ public struct MjcfOptionFlag {
Energy = mjcf.GetEnumAttribute<EnableDisableFlag>("energy", localDefault.Energy); Energy = mjcf.GetEnumAttribute<EnableDisableFlag>("energy", localDefault.Energy);
FwdInv = mjcf.GetEnumAttribute<EnableDisableFlag>("fwdinv", localDefault.FwdInv); FwdInv = mjcf.GetEnumAttribute<EnableDisableFlag>("fwdinv", localDefault.FwdInv);
SensorNoise = mjcf.GetEnumAttribute<EnableDisableFlag>("sensornoise", localDefault.SensorNoise); SensorNoise = mjcf.GetEnumAttribute<EnableDisableFlag>("sensornoise", localDefault.SensorNoise);
MultiCCD = mjcf.GetEnumAttribute<EnableDisableFlag>("multiccd", localDefault.MultiCCD);
} }
public void ToMjcf(XmlElement mjcf) { public void ToMjcf(XmlElement mjcf) {
@@ -134,6 +137,7 @@ public struct MjcfOptionFlag {
mjcf.SetAttribute("energy", Energy.ToString()); mjcf.SetAttribute("energy", Energy.ToString());
mjcf.SetAttribute("fwdinv", FwdInv.ToString()); mjcf.SetAttribute("fwdinv", FwdInv.ToString());
mjcf.SetAttribute("sensornoise", SensorNoise.ToString()); mjcf.SetAttribute("sensornoise", SensorNoise.ToString());
mjcf.SetAttribute("multiccd", MultiCCD.ToString());
} }
} }