Merge pull request #5 from CommonWealthRobotics/kh/update-to-3.x.x

Kh/update to 3.x.x

Author: madhephaestus

.github/workflows/main.yml

@@ -2,9 +2,7 @@
 name: CI
 
 on:  
-   push:
-       branches:
-         - main
+   push
 
 jobs:
   linux:

mujocoRelease.txt

@@ -1 +1 @@
-2.2.0
+3.1.1

src/main/java/org/mujoco/MuJoCoConfig.java

@@ -12,14 +12,21 @@
 	        includepath = {"/tmp/mujoco/include/"},
 	        linkpath = {"/tmp/mujoco/lib/"},
 	        include = {
+	        		"mujoco/mjtnum.h",
+
 	        		"mujoco/mjexport.h",
+	        		"mujoco/mujoco.h"   ,   		
+	        		"mujoco/mjmacro.h",
+	        		"mujoco/mjthread.h",
 	        		"mujoco/mjdata.h",
 	        		"mujoco/mjmodel.h",
 	        		"mujoco/mjrender.h",
-	        		"mujoco/mjtnum.h",
 	        		"mujoco/mjui.h",
 	        		"mujoco/mjvisualize.h",
-	        		"mujoco/mujoco.h"      		
+
+
+	        		//"mujoco/mjxmacro.h",
+	        		"mujoco/mjplugin.h"
 	        		},  
 	        link = {"mujoco"}
 	    ),
@@ -36,6 +43,7 @@ public class MuJoCoConfig implements InfoMapper {
 	public void map(InfoMap infoMap) {
 		infoMap.put(new Info("MJ_STATIC").define(true));
 		infoMap.put(new Info("mjtNum").cast().valueTypes("double").pointerTypes("DoublePointer"));
+		
 		infoMap.put(new Info("MJOPTION_VECTORS").skip());
 		infoMap.put(new Info("MJMODEL_POINTERS").skip());
 		infoMap.put(new Info("MJDATA_VECTOR").skip());
@@ -60,5 +68,23 @@ public void map(InfoMap infoMap) {
 		infoMap.put(new Info("MUJOCO_HELPER_DLL_EXPORT").skip());
 		infoMap.put(new Info("MUJOCO_HELPER_DLL_LOCAL").skip());
 		infoMap.put(new Info("mjCOLLISIONFUNC").skip());
+		infoMap.put(new Info("mjEXTERNC").skip());
+		infoMap.put(new Info("mjDLLMAIN").skip());
+		infoMap.put(new Info("XMJV").skip());
+		//infoMap.put(new Info("X").skip());
+		//infoMap.put(new Info("MJOPTION_FLOATS").skip());
+		//infoMap.put(new Info("MJOPTION_INTS").skip());
+		//infoMap.put(new Info("MJOPTION_SCALARS").skip());
+		infoMap.put(new Info("mjPLUGIN_LIB_INIT").skip());
+		infoMap.put(new Info("mjfPluginLibraryLoadCallback").skip());
+		infoMap.put(new Info("mjfGeneric").skip());
+		infoMap.put(new Info("mjfConFilt").skip());
+		infoMap.put(new Info("mjfSensor").skip());
+		infoMap.put(new Info("mjfTime").skip());
+		infoMap.put(new Info("mjfAct").skip());
+		infoMap.put(new Info("mjfCollision").skip());
+//		infoMap.put(new Info("").skip());
+//		infoMap.put(new Info("").skip());
+		
     }
 }