|
4 | 4 | import org.bytedeco.javacpp.annotation.*;
|
5 | 5 | import org.bytedeco.javacpp.tools.*;
|
6 | 6 |
|
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") |
19 | 33 |
|
20 | 34 | public class MuJoCoConfig implements InfoMapper {
|
21 | 35 | public void map(InfoMap infoMap) {
|
22 |
| - infoMap.put(new Info("MJ_STATIC").define(true)); |
| 36 | + |
| 37 | + infoMap.put(new Info("MJ_STATIC").define(true)); |
23 | 38 | infoMap.put(new Info("mjtNum").cast().valueTypes("double").pointerTypes("DoublePointer"));
|
24 | 39 | // infoMap.put(new Info("mjString")
|
25 | 40 | // .cast()
|
@@ -62,11 +77,11 @@ public void map(InfoMap infoMap) {
|
62 | 77 | infoMap.put(new Info("std::vector<double>").pointerTypes("DoublePointer").valueTypes("DoubleBuffer"));
|
63 | 78 |
|
64 | 79 | // 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: |
68 | 80 | 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")); |
70 | 85 |
|
71 | 86 | // mjString
|
72 | 87 | // infoMap.put(new
|
|
0 commit comments