Skip to content

Commit 3288750

Browse files
committed
readablity
1 parent d5618a5 commit 3288750

File tree

1 file changed

+32
-17
lines changed

1 file changed

+32
-17
lines changed

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

+32-17
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,37 @@
44
import org.bytedeco.javacpp.annotation.*;
55
import org.bytedeco.javacpp.tools.*;
66

7-
@Properties(value = { @Platform(includepath = { "/tmp/mujoco/include/" }, linkpath = { "/tmp/mujoco/lib/" }, include = {
8-
"mujoco/mjtnum.h",
9-
10-
"mujoco/mjexport.h", "mujoco/mujoco.h", "mujoco/mjmacro.h", "mujoco/mjthread.h", "mujoco/mjdata.h",
11-
"mujoco/mjmodel.h", "mujoco/mjrender.h", "mujoco/mjui.h", "mujoco/mjvisualize.h",
12-
13-
"mujoco/mjplugin.h", "mujoco/mjspec.h",
14-
// "mujoco/mjxmacro.h" // This will not work with JavaCPP
15-
}, link = { "mujoco" }),
16-
@Platform(value = "windows-x86_64", includepath = { "mujoco/include/",
17-
"C:/Users/runneradmin/AppData/Local/Temp/mujoco/include/" }, linkpath = { "mujoco/lib/",
18-
"C:/Users/runneradmin/AppData/Local/Temp/mujoco/lib/" }) }, target = "org.mujoco.MuJoCoLib")
7+
@Properties(
8+
value = {
9+
@Platform(
10+
includepath = { "/tmp/mujoco/include/" },
11+
linkpath = { "/tmp/mujoco/lib/" },
12+
13+
include = {
14+
"mujoco/mjtnum.h",
15+
16+
"mujoco/mjexport.h", "mujoco/mujoco.h", "mujoco/mjmacro.h", "mujoco/mjthread.h", "mujoco/mjdata.h",
17+
"mujoco/mjmodel.h", "mujoco/mjrender.h", "mujoco/mjui.h", "mujoco/mjvisualize.h",
18+
19+
"mujoco/mjplugin.h", "mujoco/mjspec.h",
20+
// "mujoco/mjxmacro.h" // This will not work with JavaCPP
21+
},
22+
link = {
23+
"mujoco"
24+
}
25+
)
26+
,
27+
@Platform(value = "windows-x86_64",
28+
includepath = { "mujoco/include/",
29+
"C:/Users/runneradmin/AppData/Local/Temp/mujoco/include/" },
30+
linkpath = { "mujoco/lib/",
31+
"C:/Users/runneradmin/AppData/Local/Temp/mujoco/lib/" }) },
32+
target = "org.mujoco.MuJoCoLib")
1933

2034
public class MuJoCoConfig implements InfoMapper {
2135
public void map(InfoMap infoMap) {
22-
infoMap.put(new Info("MJ_STATIC").define(true));
36+
37+
infoMap.put(new Info("MJ_STATIC").define(true));
2338
infoMap.put(new Info("mjtNum").cast().valueTypes("double").pointerTypes("DoublePointer"));
2439
// infoMap.put(new Info("mjString")
2540
// .cast()
@@ -62,11 +77,11 @@ public void map(InfoMap infoMap) {
6277
infoMap.put(new Info("std::vector<double>").pointerTypes("DoublePointer").valueTypes("DoubleBuffer"));
6378

6479
// Handle mjByteVec (std::vector<std::byte>)
65-
// infoMap.put(new Info("mjByteVec").skip());
66-
// infoMap.put(new Info("std::vector<std::byte>").pointerTypes("BytePointer").valueTypes("ByteBuffer"));
67-
// For unsigned char:
6880
infoMap.put(new Info("mjByteVec").skip());
69-
infoMap.put(new Info("std::vector<unsigned char>").pointerTypes("BytePointer").valueTypes("ByteBuffer"));
81+
infoMap.put(new Info("std::vector<std::byte>").pointerTypes("BytePointer").valueTypes("ByteBuffer"));
82+
// For unsigned char:
83+
// infoMap.put(new Info("mjByteVec").skip());
84+
// infoMap.put(new Info("std::vector<unsigned char>").pointerTypes("BytePointer").valueTypes("ByteBuffer"));
7085

7186
// mjString
7287
// infoMap.put(new

0 commit comments

Comments
 (0)