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

Make Emscripten binding module names consistent

Browse Source 
PiperOrigin-RevId: 830902834
Change-Id: I64e004559cbfdb14fb84bc548f05b1ab49e94d4d
This commit is contained in:
Google DeepMind
2025-11-11 07:19:47 -08:00
committed by Copybara-Service
parent 5b859327cc
commit ff037f2e78
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/codegen/generated/bindings.cc
+3 -3
View File
@@ -6791,7 +6791,7 @@ val get_mjFRAMESTRING() { return MakeValArray(mjFRAMESTRING); }
val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); } val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); }
val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); } val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); }
EMSCRIPTEN_BINDINGS(constants) { EMSCRIPTEN_BINDINGS(mujoco_constants) {
// from mjmodel.h // from mjmodel.h
constant("mjPI", mjPI); constant("mjPI", mjPI);
constant("mjMAXVAL", mjMAXVAL); constant("mjMAXVAL", mjMAXVAL);
@@ -8541,8 +8541,7 @@ std::unique_ptr<MjSpec> parseXMLString(const std::string &xml) {
return std::unique_ptr<MjSpec>(new MjSpec(ptr)); return std::unique_ptr<MjSpec>(new MjSpec(ptr));
} }
EMSCRIPTEN_BINDINGS(mujoco_bindings) { EMSCRIPTEN_BINDINGS(mujoco_structs) {
function("parseXMLString", &parseXMLString, take_ownership());
emscripten::class_<MjContact>("MjContact") emscripten::class_<MjContact>("MjContact")
.constructor<>() .constructor<>()
.function("copy", &MjContact::copy, take_ownership()) .function("copy", &MjContact::copy, take_ownership())
@@ -12780,6 +12779,7 @@ EMSCRIPTEN_BINDINGS(mujoco_functions) {
function("mjs_asMaterial", &mjs_asMaterial_wrapper); function("mjs_asMaterial", &mjs_asMaterial_wrapper);
function("mjs_asPlugin", &mjs_asPlugin_wrapper); function("mjs_asPlugin", &mjs_asPlugin_wrapper);
function("parseXMLString", &parseXMLString, take_ownership());
function("error", &error_wrapper); function("error", &error_wrapper);
function("mju_printMatSparse", &mju_printMatSparse_wrapper); function("mju_printMatSparse", &mju_printMatSparse_wrapper);
function("mj_solveM", &mj_solveM_wrapper); function("mj_solveM", &mj_solveM_wrapper);
wasm/codegen/templates/bindings.cc
+3 -3
View File
@@ -284,7 +284,7 @@ val get_mjFRAMESTRING() { return MakeValArray(mjFRAMESTRING); }
val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); } val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); }
val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); } val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); }
EMSCRIPTEN_BINDINGS(constants) { EMSCRIPTEN_BINDINGS(mujoco_constants) {
// from mjmodel.h // from mjmodel.h
constant("mjPI", mjPI); constant("mjPI", mjPI);
constant("mjMAXVAL", mjMAXVAL); constant("mjMAXVAL", mjMAXVAL);
@@ -531,8 +531,7 @@ std::unique_ptr<MjSpec> parseXMLString(const std::string &xml) {
return std::unique_ptr<MjSpec>(new MjSpec(ptr)); return std::unique_ptr<MjSpec>(new MjSpec(ptr));
} }
EMSCRIPTEN_BINDINGS(mujoco_bindings) { EMSCRIPTEN_BINDINGS(mujoco_structs) {
function("parseXMLString", &parseXMLString, take_ownership());
// {{ AUTOGENNED_STRUCTS_BINDINGS }} // {{ AUTOGENNED_STRUCTS_BINDINGS }}
// TODO: should be generated in future CLs -- // // TODO: should be generated in future CLs -- //
@@ -1302,6 +1301,7 @@ void mjd_subQuat_wrapper(const NumberArray& qa, const NumberArray& qb, const val
EMSCRIPTEN_BINDINGS(mujoco_functions) { EMSCRIPTEN_BINDINGS(mujoco_functions) {
// {{ FUNCTION_BINDINGS }} // {{ FUNCTION_BINDINGS }}
function("parseXMLString", &parseXMLString, take_ownership());
function("error", &error_wrapper); function("error", &error_wrapper);
function("mju_printMatSparse", &mju_printMatSparse_wrapper); function("mju_printMatSparse", &mju_printMatSparse_wrapper);
function("mj_solveM", &mj_solveM_wrapper); function("mj_solveM", &mj_solveM_wrapper);