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

Version 2.1.4: Switch to GLAD, minor improvements to simulate.

Browse Source 
PiperOrigin-RevId: 439277749
Change-Id: I741d1c499ae88753338fcc6d141a65e92e13023e
This commit is contained in:
Saran Tunyasuvunakool
2022-04-04 13:53:21 +01:00
parent 3c71720d83
commit 90dea1bdfb
23 changed files with 270 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unity/Runtime/Bindings/MujocoBinaryRetriever.cs
+2 -2
View File
@@ -35,7 +35,7 @@ public class MujocoBinaryRetriever {
if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/mujoco.dylib") == null) {
File.Copy(
"/Applications/MuJoCo.app/Contents/Frameworks" +
"/MuJoCo.framework/Versions/Current/libmujoco.2.1.3.dylib",
"/MuJoCo.framework/Versions/Current/libmujoco.2.1.4.dylib",
mujocoPath + "/mujoco.dylib");
AssetDatabase.Refresh();
}
@@ -43,7 +43,7 @@ public class MujocoBinaryRetriever {
if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/libmujoco.so") == null) {
File.Copy(
Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) +
"/.mujoco/mujoco-2.1.3/lib/libmujoco_nogl.so.2.1.3",
"/.mujoco/mujoco-2.1.4/lib/libmujoco.so.2.1.4",
mujocoPath + "/libmujoco.so");
AssetDatabase.Refresh();
}
unity/Runtime/Bindings/MujocoBindings.cs
+2 -2
View File
@@ -83,7 +83,7 @@ public const int mjMAXOVERLAY = 500;
public const int mjMAXLINE = 100;
public const int mjMAXLINEPNT = 1000;
public const int mjMAXPLANEGRID = 200;
public const int mjVERSION_HEADER = 213;
public const int mjVERSION_HEADER = 214;
// ------------------------------------Enums------------------------------------
@@ -2201,7 +2201,7 @@ public unsafe struct mjrContext_ {
public fixed int charWidthBig[127];
public int charHeight;
public int charHeightBig;
public int glewInitialized;
public int glInitialized;
public int windowAvailable;
public int windowSamples;
public int windowStereo;