From ff037f2e7856412d459886728a9a59e4acd865e2 Mon Sep 17 00:00:00 2001 From: Google DeepMind Date: Tue, 11 Nov 2025 07:19:47 -0800 Subject: [PATCH] Make Emscripten binding module names consistent PiperOrigin-RevId: 830902834 Change-Id: I64e004559cbfdb14fb84bc548f05b1ab49e94d4d --- wasm/codegen/generated/bindings.cc | 6 +++--- wasm/codegen/templates/bindings.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wasm/codegen/generated/bindings.cc b/wasm/codegen/generated/bindings.cc index 5fb94cd1..30c1b26a 100644 --- a/wasm/codegen/generated/bindings.cc +++ b/wasm/codegen/generated/bindings.cc @@ -6791,7 +6791,7 @@ val get_mjFRAMESTRING() { return MakeValArray(mjFRAMESTRING); } val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); } val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); } -EMSCRIPTEN_BINDINGS(constants) { +EMSCRIPTEN_BINDINGS(mujoco_constants) { // from mjmodel.h constant("mjPI", mjPI); constant("mjMAXVAL", mjMAXVAL); @@ -8541,8 +8541,7 @@ std::unique_ptr parseXMLString(const std::string &xml) { return std::unique_ptr(new MjSpec(ptr)); } -EMSCRIPTEN_BINDINGS(mujoco_bindings) { - function("parseXMLString", &parseXMLString, take_ownership()); +EMSCRIPTEN_BINDINGS(mujoco_structs) { emscripten::class_("MjContact") .constructor<>() .function("copy", &MjContact::copy, take_ownership()) @@ -12780,6 +12779,7 @@ EMSCRIPTEN_BINDINGS(mujoco_functions) { function("mjs_asMaterial", &mjs_asMaterial_wrapper); function("mjs_asPlugin", &mjs_asPlugin_wrapper); + function("parseXMLString", &parseXMLString, take_ownership()); function("error", &error_wrapper); function("mju_printMatSparse", &mju_printMatSparse_wrapper); function("mj_solveM", &mj_solveM_wrapper); diff --git a/wasm/codegen/templates/bindings.cc b/wasm/codegen/templates/bindings.cc index 8e14df51..dc55ecce 100644 --- a/wasm/codegen/templates/bindings.cc +++ b/wasm/codegen/templates/bindings.cc @@ -284,7 +284,7 @@ val get_mjFRAMESTRING() { return MakeValArray(mjFRAMESTRING); } val get_mjVISSTRING() { return MakeValArray3(mjVISSTRING); } val get_mjRNDSTRING() { return MakeValArray3(mjRNDSTRING); } -EMSCRIPTEN_BINDINGS(constants) { +EMSCRIPTEN_BINDINGS(mujoco_constants) { // from mjmodel.h constant("mjPI", mjPI); constant("mjMAXVAL", mjMAXVAL); @@ -531,8 +531,7 @@ std::unique_ptr parseXMLString(const std::string &xml) { return std::unique_ptr(new MjSpec(ptr)); } -EMSCRIPTEN_BINDINGS(mujoco_bindings) { - function("parseXMLString", &parseXMLString, take_ownership()); +EMSCRIPTEN_BINDINGS(mujoco_structs) { // {{ AUTOGENNED_STRUCTS_BINDINGS }} // 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) { // {{ FUNCTION_BINDINGS }} + function("parseXMLString", &parseXMLString, take_ownership()); function("error", &error_wrapper); function("mju_printMatSparse", &mju_printMatSparse_wrapper); function("mj_solveM", &mj_solveM_wrapper);