mujoco 3.5.0__tar.gz → 3.7.0__tar.gz

{mujoco-3.5.0/mujoco.egg-info → mujoco-3.7.0}/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: mujoco
-Version: 3.5.0
+Version: 3.7.0
 Summary: MuJoCo Physics Simulator
 Author-email: Google DeepMind <mujoco@deepmind.com>
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/google-deepmind/mujoco
-Project-URL: Documentation, https://mujoco.readthedocs.io/en/3.5.0
+Project-URL: Documentation, https://mujoco.readthedocs.io/en/3.7.0
 Project-URL: Repository, https://github.com/google-deepmind/mujoco
-Project-URL: Changelog, https://mujoco.readthedocs.io/en/3.5.0/changelog.html
+Project-URL: Changelog, https://mujoco.readthedocs.io/en/3.7.0/changelog.html
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSES_THIRD_PARTY.md

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/CMakeLists.txt

@@ -51,6 +51,8 @@ endif()
 
 include(MujocoLinkOptions)
 get_mujoco_extra_link_options(EXTRA_LINK_OPTIONS)
+list(FILTER EXTRA_LINK_OPTIONS EXCLUDE REGEX "STACK")
+list(FILTER EXTRA_LINK_OPTIONS EXCLUDE REGEX "stack")
 add_link_options(${EXTRA_LINK_OPTIONS})
 
 include(MujocoMacOS)
@@ -84,7 +86,7 @@ if(NOT TARGET mujoco)
     if(MUJOCO_FRAMEWORK)
       message("MuJoCo framework is at ${MUJOCO_FRAMEWORK}/mujoco.framework")
       set(MUJOCO_LIBRARY
-          ${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.3.5.0.dylib
+          ${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.3.7.0.dylib
       )
       target_compile_options(mujoco INTERFACE -F${MUJOCO_FRAMEWORK})
     endif()
@@ -92,7 +94,7 @@ if(NOT TARGET mujoco)
 
   if(NOT MUJOCO_FRAMEWORK)
     find_library(
-      MUJOCO_LIBRARY mujoco mujoco.3.5.0 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED
+      MUJOCO_LIBRARY mujoco mujoco.3.7.0 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED
     )
     find_path(MUJOCO_INCLUDE mujoco/mujoco.h HINTS ${MUJOCO_INCLUDE_DIR} REQUIRED)
     message("MuJoCo is at ${MUJOCO_LIBRARY}")
@@ -191,7 +193,7 @@ findorfetch(
   GIT_REPO
   https://github.com/pybind/pybind11
   GIT_TAG
-  e86205cb2ba070755d582856430c0f83c0af6694 # v3.0.1
+  d0f1a2168f3335426f544171a3463c36edbd5cc3 # v3.0.3
   TARGETS
   pybind11::pybind11_headers
   EXCLUDE_FROM_ALL

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/__init__.py

@@ -56,11 +56,23 @@ from mujoco._constants import *
 from mujoco._enums import *
 from mujoco._errors import *
 from mujoco._functions import *
-from mujoco._render import *
 from mujoco._specs import *
 from mujoco._structs import *
-from mujoco.gl_context import *
-from mujoco.renderer import Renderer
+
+try:
+  from mujoco._render import *  # pytype: disable=import-error
+except ImportError:
+  pass
+
+try:
+  from mujoco.rendering.classic.renderer import Renderer  # pytype: disable=import-error
+except ImportError:
+  pass
+
+try:
+  from mujoco.rendering.classic.gl_context import *  # pytype: disable=import-error
+except ImportError:
+  pass
 
 MjStruct: TypeAlias = Union[
     _specs.MjsBody,

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/bindings_test.py

@@ -1881,6 +1881,29 @@ Euler integrator, semi-implicit in velocity.
     mujoco.mj_readSensor(model, data, 0, delay, result, interp=0)
     np.testing.assert_array_equal(result, [1, 0, 0, 0])
 
+  def test_poly_stiffness(self):
+    xml = r"""
+<mujoco>
+  <worldbody>
+    <body>
+      <geom type="sphere" size="0.1"/>
+      <joint name="slide" type="slide" stiffness="1 2 3"/>
+    </body>
+  </worldbody>
+</mujoco>
+"""
+    model = mujoco.MjModel.from_xml_string(xml)
+    data = mujoco.MjData(model)
+    self.assertEqual(model.jnt_stiffness[0], 1)
+    np.testing.assert_array_equal(
+        model.jnt_stiffnesspoly[0], [2, 3])
+
+    x = 0.5
+    data.qpos[0] = x
+    mujoco.mj_forward(model, data)
+    expected = -(1*x + 2*x*abs(x) + 3*x**3)
+    np.testing.assert_allclose(data.qfrc_spring[0], expected)
+
   def _assert_attributes_equal(self, actual_obj, expected_obj, attr_to_compare):
     for name in attr_to_compare:
       actual_value = getattr(actual_obj, name)

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/callbacks.cc

@@ -91,8 +91,7 @@ static enable_if_not_const_t<Raw, py::handle> MjWrapperLookup(Raw* ptr) {
   // TODO(stunya): Figure out a way to do this without invoking py::detail.
   {
     py::gil_scoped_acquire gil;
-    const auto [src, type] =
-        py::detail::type_caster_base<MjWrapper<Raw>>::src_and_type(wrapper);
+    auto* type = py::detail::get_type_info(typeid(MjWrapper<Raw>));
     if (type) {
       py::object instance = py::reinterpret_steal<py::object>(
           py::detail::find_registered_python_instance(wrapper, type));

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/cmake/MujocoDependencies.cmake

@@ -54,15 +54,10 @@ set(MUJOCO_DEP_VERSION_gtest
 )
 
 set(MUJOCO_DEP_VERSION_benchmark
-    5f7d66929fb66869d96dfcbacf0d8a586b33766d
+    5c55f5d4f45a1b09c5d98aa63a671993ebd42c69
     CACHE STRING "Version of `benchmark` to be fetched."
 )
 
-set(MUJOCO_DEP_VERSION_TriangleMeshDistance
-    2cb643de1436e1ba8e2be49b07ec5491ac604457
-    CACHE STRING "Version of `TriangleMeshDistance` to be fetched."
-)
-
 mark_as_advanced(MUJOCO_DEP_VERSION_lodepng)
 mark_as_advanced(MUJOCO_DEP_VERSION_MarchingCubeCpp)
 mark_as_advanced(MUJOCO_DEP_VERSION_tinyxml2)
@@ -73,7 +68,6 @@ mark_as_advanced(MUJOCO_DEP_VERSION_Eigen3)
 mark_as_advanced(MUJOCO_DEP_VERSION_abseil)
 mark_as_advanced(MUJOCO_DEP_VERSION_gtest)
 mark_as_advanced(MUJOCO_DEP_VERSION_benchmark)
-mark_as_advanced(MUJOCO_DEP_VERSION_TriangleMeshDistance)
 
 include(FetchContent)
 include(FindOrFetch)
@@ -202,30 +196,6 @@ if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
   unset(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
 endif()
 
-if(NOT TARGET trianglemeshdistance)
-  FetchContent_Declare(
-    trianglemeshdistance
-    GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/TriangleMeshDistance.git
-    GIT_TAG ${MUJOCO_DEP_VERSION_TriangleMeshDistance}
-  )
-
-  FetchContent_GetProperties(trianglemeshdistance)
-  if(NOT trianglemeshdistance_POPULATED)
-    FetchContent_Populate(trianglemeshdistance)
-    # Patch the source code to silence a warning/error related to a loop variable creating a copy.
-    # Since this is a header only library this fix is less intrusive than disabling the warning for
-    # any target including the header.
-    set(TMD_HEADER ${trianglemeshdistance_SOURCE_DIR}/TriangleMeshDistance/include/tmd/TriangleMeshDistance.h)
-    file(READ ${TMD_HEADER} TMD_CONTENT)
-    string(REPLACE
-      "for (const auto edge_count : edges_count) {"
-      "for (const auto& edge_count : edges_count) {"
-      TMD_CONTENT "${TMD_CONTENT}")
-    file(WRITE ${TMD_HEADER} "${TMD_CONTENT}")
-    include_directories(${trianglemeshdistance_SOURCE_DIR})
-  endif()
-endif()
-
 set(ENABLE_DOUBLE_PRECISION ON)
 set(CCD_HIDE_ALL_SYMBOLS ON)
 
@@ -339,9 +309,7 @@ if(MUJOCO_BUILD_TESTS)
         "sed"
         "-i"
         "-e"
-        "s/-std=c++11/-std=c++14/g"
-        "-e"
-        "s/HAVE_CXX_FLAG_STD_CXX11/HAVE_CXX_FLAG_STD_CXX14/g"
+        "s/-Wformat=2/-Wformat/g"
         "${CMAKE_BINARY_DIR}/_deps/benchmark-src/CMakeLists.txt"
     )
   endif()

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/cmake/MujocoLinkOptions.cmake

@@ -23,16 +23,12 @@ function(get_mujoco_extra_link_options OUTPUT_VAR)
     set(EXTRA_LINK_OPTIONS)
 
     if(WIN32)
-      set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,/STACK:16777216)
       set(CMAKE_REQUIRED_FLAGS "-fuse-ld=lld-link")
-      check_c_source_compiles("int main() {}" SUPPORTS_LLD)
-      if(SUPPORTS_LLD)
-        set(EXTRA_LINK_OPTIONS
-            ${EXTRA_LINK_OPTIONS}
-            -fuse-ld=lld-link
-            -Wl,/OPT:REF
-            -Wl,/OPT:ICF
-        )
+      check_c_source_compiles("int main() {}" SUPPORTS_LLD_LINK)
+      if(SUPPORTS_LLD_LINK)
+        set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -fuse-ld=lld-link -Wl,/STACK:16777216 -Wl,/OPT:REF -Wl,/OPT:ICF)
+      else()
+        set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,--stack,16777216)
       endif()
     else()
       set(CMAKE_REQUIRED_FLAGS "-fuse-ld=lld")
@@ -47,12 +43,12 @@ function(get_mujoco_extra_link_options OUTPUT_VAR)
         endif()
       endif()
 
-      set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,--gc-sections")
+      set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,--gc-sections")
       check_c_source_compiles("int main() {}" SUPPORTS_GC_SECTIONS)
       if(SUPPORTS_GC_SECTIONS)
         set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,--gc-sections)
       else()
-        set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,-dead_strip")
+        set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,-dead_strip")
         check_c_source_compiles("int main() {}" SUPPORTS_DEAD_STRIP)
         if(SUPPORTS_DEAD_STRIP)
           set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,-dead_strip)

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/constants.cc

@@ -70,6 +70,7 @@ PYBIND11_MODULE(_constants, pymodule) {
   X(mjNSENS);
   X(mjNSOLVER);
   X(mjNISLAND);
+  X(mjNPOLY);
 
   // from mjvisualize.h
   X(mjNGROUP);

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/enum_traits.h

@@ -208,6 +208,7 @@ struct mjtEq {
     std::make_pair("mjEQ_TENDON", ::mjtEq::mjEQ_TENDON),
     std::make_pair("mjEQ_FLEX", ::mjtEq::mjEQ_FLEX),
     std::make_pair("mjEQ_FLEXVERT", ::mjtEq::mjEQ_FLEXVERT),
+    std::make_pair("mjEQ_FLEXSTRAIN", ::mjtEq::mjEQ_FLEXSTRAIN),
     std::make_pair("mjEQ_DISTANCE", ::mjtEq::mjEQ_DISTANCE)};
 };
 
@@ -245,6 +246,7 @@ struct mjtDyn {
     std::make_pair("mjDYN_FILTER", ::mjtDyn::mjDYN_FILTER),
     std::make_pair("mjDYN_FILTEREXACT", ::mjtDyn::mjDYN_FILTEREXACT),
     std::make_pair("mjDYN_MUSCLE", ::mjtDyn::mjDYN_MUSCLE),
+    std::make_pair("mjDYN_DCMOTOR", ::mjtDyn::mjDYN_DCMOTOR),
     std::make_pair("mjDYN_USER", ::mjtDyn::mjDYN_USER)};
 };
 
@@ -255,6 +257,7 @@ struct mjtGain {
     std::make_pair("mjGAIN_FIXED", ::mjtGain::mjGAIN_FIXED),
     std::make_pair("mjGAIN_AFFINE", ::mjtGain::mjGAIN_AFFINE),
     std::make_pair("mjGAIN_MUSCLE", ::mjtGain::mjGAIN_MUSCLE),
+    std::make_pair("mjGAIN_DCMOTOR", ::mjtGain::mjGAIN_DCMOTOR),
     std::make_pair("mjGAIN_USER", ::mjtGain::mjGAIN_USER)};
 };
 
@@ -265,6 +268,7 @@ struct mjtBias {
     std::make_pair("mjBIAS_NONE", ::mjtBias::mjBIAS_NONE),
     std::make_pair("mjBIAS_AFFINE", ::mjtBias::mjBIAS_AFFINE),
     std::make_pair("mjBIAS_MUSCLE", ::mjtBias::mjBIAS_MUSCLE),
+    std::make_pair("mjBIAS_DCMOTOR", ::mjtBias::mjBIAS_DCMOTOR),
     std::make_pair("mjBIAS_USER", ::mjtBias::mjBIAS_USER)};
 };
 
@@ -538,7 +542,6 @@ struct mjtWarning {
     std::make_pair("mjWARN_INERTIA", ::mjtWarning::mjWARN_INERTIA),
     std::make_pair("mjWARN_CONTACTFULL", ::mjtWarning::mjWARN_CONTACTFULL),
     std::make_pair("mjWARN_CNSTRFULL", ::mjtWarning::mjWARN_CNSTRFULL),
-    std::make_pair("mjWARN_VGEOMFULL", ::mjtWarning::mjWARN_VGEOMFULL),
     std::make_pair("mjWARN_BADQPOS", ::mjtWarning::mjWARN_BADQPOS),
     std::make_pair("mjWARN_BADQVEL", ::mjtWarning::mjWARN_BADQVEL),
     std::make_pair("mjWARN_BADQACC", ::mjtWarning::mjWARN_BADQACC),

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/function_traits.h

@@ -198,6 +198,17 @@ struct mj_parse {
   }
 };
 
+struct mj_encode {
+  static constexpr char name[] = "mj_encode";
+  static constexpr char doc[] = "Encode spec/model to a file using a registered encoder. Returns the number of bytes written on success, -1 on failure.";
+  using type = int (const mjSpec *, const mjModel *, const char *, const char *, const mjVFS *, char *, int);
+  static constexpr auto param_names = std::make_tuple("s", "m", "filename", "content_type", "vfs", "error", "error_sz");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return ::mj_encode;
+  }
+};
+
 struct mj_compile {
   static constexpr char name[] = "mj_compile";
   static constexpr char doc[] = "Compile spec to model.";
@@ -1642,7 +1653,7 @@ struct mj_objectAcceleration {
 struct mj_geomDistance {
   static constexpr char name[] = "mj_geomDistance";
   static constexpr char doc[] = "Return smallest signed distance between two geoms and optionally segment from geom1 to geom2.";
-  using type = mjtNum (const mjModel *, const mjData *, int, int, mjtNum, mjtNum (*)[6]);
+  using type = mjtNum (const mjModel *, mjData *, int, int, mjtNum, mjtNum (*)[6]);
   static constexpr auto param_names = std::make_tuple("m", "d", "geom1", "geom2", "distmax", "fromto");
 
   MUJOCO_ALWAYS_INLINE static type& GetFunc() {
@@ -4048,6 +4059,39 @@ struct mjp_findDecoder {
   }
 };
 
+struct mjp_registerEncoder {
+  static constexpr char name[] = "mjp_registerEncoder";
+  static constexpr char doc[] = "Globally register an encoder. This function is thread-safe. If an identical mjpEncoder is already registered, this function does nothing. If a non-identical mjpEncoder with the same name is already registered, an mju_error is raised.";
+  using type = void (const mjpEncoder *);
+  static constexpr auto param_names = std::make_tuple("encoder");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return ::mjp_registerEncoder;
+  }
+};
+
+struct mjp_defaultEncoder {
+  static constexpr char name[] = "mjp_defaultEncoder";
+  static constexpr char doc[] = "Set default resource encoder definition.";
+  using type = void (mjpEncoder *);
+  static constexpr auto param_names = std::make_tuple("encoder");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return ::mjp_defaultEncoder;
+  }
+};
+
+struct mjp_findEncoder {
+  static constexpr char name[] = "mjp_findEncoder";
+  static constexpr char doc[] = "Return the encoder that matches against the content type or filename extension. If no match, return NULL.";
+  using type = const mjpEncoder * (const char *, const char *);
+  static constexpr auto param_names = std::make_tuple("filename", "content_type");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return ::mjp_findEncoder;
+  }
+};
+
 struct mju_openResource {
   static constexpr char name[] = "mju_openResource";
   static constexpr char doc[] = "Open a resource; if the name doesn't have a prefix matching a registered resource provider, then the OS filesystem is used.";
@@ -4565,6 +4609,17 @@ struct mjs_setToAdhesion {
   }
 };
 
+struct mjs_setToDCMotor {
+  static constexpr char name[] = "mjs_setToDCMotor";
+  static constexpr char doc[] = "Set actuator to DC motor; return error if any.";
+  using type = const char * (mjsActuator *, double (*)[2], double, double (*)[3], double (*)[3], double (*)[2], double (*)[3], double (*)[6], double (*)[6], double (*)[5], int);
+  static constexpr auto param_names = std::make_tuple("actuator", "motorconst", "resistance", "nominal", "saturation", "inductance", "cogging", "controller", "thermal", "lugre", "input_mode");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return *reinterpret_cast<type*>(&::mjs_setToDCMotor);
+  }
+};
+
 struct mjs_addMesh {
   static constexpr char name[] = "mjs_addMesh";
   static constexpr char doc[] = "Add mesh.";
@@ -4642,6 +4697,17 @@ struct mjs_getSpec {
   }
 };
 
+struct mjs_getCompiler {
+  static constexpr char name[] = "mjs_getCompiler";
+  static constexpr char doc[] = "Get compiler associated with element's origin spec.";
+  using type = mjsCompiler * (mjsElement *);
+  static constexpr auto param_names = std::make_tuple("element");
+
+  MUJOCO_ALWAYS_INLINE static type& GetFunc() {
+    return ::mjs_getCompiler;
+  }
+};
+
 struct mjs_findSpec {
   static constexpr char name[] = "mjs_findSpec";
   static constexpr char doc[] = "Find spec (model asset) by name.";

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/functions.cc

@@ -663,7 +663,7 @@ PYBIND11_MODULE(_functions, pymodule) {
   Def<traits::mj_contactForce>(pymodule);
   Def<traits::mj_geomDistance>(
       pymodule,
-      [](const raw::MjModel* m, const raw::MjData* d,
+      [](const raw::MjModel* m, raw::MjData* d,
          int geom1, int geom2, mjtNum distmax,
          std::optional<Eigen::Ref<EigenArrayXX>> fromto) {
         if (fromto.has_value() && fromto->size() != 6) {

mujoco-3.7.0/mujoco/gl_context.py

@@ -0,0 +1,21 @@
+# Copyright 2022 DeepMind Technologies Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Wrapper around mujoco.rendering.classic.gl_context for backwards compatibility."""
+
+
+try:
+  from mujoco.rendering.classic.gl_context import *  # pytype: disable=import-error
+except ImportError:
+  pass

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/indexer_xmacro.h

@@ -15,7 +15,7 @@
 #ifndef MUJOCO_PYTHON_INDEXER_XMACRO_H_
 #define MUJOCO_PYTHON_INDEXER_XMACRO_H_
 
-#include <mujoco/mjxmacro.h>
+#include <mujoco/mjxmacro.h>  // IWYU pragma: keep
 
 #define MJMODEL_ACTUATOR                                          \
   X( int,     actuator_, trntype,      nu, 1                    ) \
@@ -132,6 +132,7 @@
   X( mjtNum,  jnt_, pos,          njnt, 3               ) \
   X( mjtNum,  jnt_, axis,         njnt, 3               ) \
   X( mjtNum,  jnt_, stiffness,    njnt, 1               ) \
+  X( mjtNum,  jnt_, stiffnesspoly, njnt, mjNPOLY        ) \
   X( mjtNum,  jnt_, range,        njnt, 2               ) \
   X( mjtNum,  jnt_, margin,       njnt, 1               ) \
   X( mjtNum,  jnt_, user,         njnt, MJ_M(nuser_jnt) ) \
@@ -145,6 +146,7 @@
   X( mjtNum,  dof_, frictionloss, nv,   1               ) \
   X( mjtNum,  dof_, armature,     nv,   1               ) \
   X( mjtNum,  dof_, damping,      nv,   1               ) \
+  X( mjtNum,  dof_, dampingpoly,  nv,   mjNPOLY         ) \
   X( mjtNum,  dof_, invweight0,   nv,   1               ) \
   X( mjtNum,  dof_, M0,           nv,   1               )
 
@@ -253,13 +255,18 @@
   X( mjtNum,  tendon, _range,        ntendon, 2                  ) \
   X( mjtNum,  tendon, _margin,       ntendon, 1                  ) \
   X( mjtNum,  tendon, _stiffness,    ntendon, 1                  ) \
+  X( mjtNum,  tendon, _stiffnesspoly, ntendon, mjNPOLY           ) \
   X( mjtNum,  tendon, _damping,      ntendon, 1                  ) \
+  X( mjtNum,  tendon, _dampingpoly,  ntendon, mjNPOLY            ) \
   X( mjtNum,  tendon, _frictionloss, ntendon, 1                  ) \
   X( mjtNum,  tendon, _lengthspring, ntendon, 1                  ) \
   X( mjtNum,  tendon, _length0,      ntendon, 1                  ) \
   X( mjtNum,  tendon, _invweight0,   ntendon, 1                  ) \
   X( mjtNum,  tendon, _user,         ntendon, MJ_M(nuser_tendon) ) \
-  X( float,   tendon, _rgba,         ntendon, 4                  )
+  X( float,   tendon, _rgba,         ntendon, 4                  ) \
+  X( int,     ten_,   J_rownnz,      ntendon, 1                  ) \
+  X( int,     ten_,   J_rowadr,      ntendon, 1                  ) \
+  X( int,     ten_,   J_colind,      ntendon, MJ_M(nv)           )
 
 #define MJMODEL_TEXTURE                   \
   X( int,     tex_, type,     ntex,     1 ) \
@@ -402,11 +409,7 @@
 #define MJDATA_TENDON                            \
   X( int, ten_,    wrapadr , ntendon, 1        ) \
   X( int, ten_,    wrapnum , ntendon, 1        ) \
-  X( int, ten_,    J_rownnz, ntendon, 1        ) \
-  X( int, ten_,    J_rowadr, ntendon, 1        ) \
-  X( int, ten_,    J_colind, ntendon, MJ_M(nv) ) \
   X( mjtNum, ten_, length  , ntendon, 1        ) \
-  X( mjtNum, ten_, J       , ntendon, MJ_M(nv) ) \
   X( mjtNum, ten_, velocity, ntendon, 1        )
 
 #define MJDATA_VIEW_GROUPS                                           \

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/introspect/codegen/generate_structs.py

@@ -41,6 +41,8 @@ _ANONYMOUS_KEY_PATTERN = re.compile(r'\d+:\d+(?=\))')
 _EXCLUDED = (
     'mjpDecoder',
     'mjpDecoder_',
+    'mjpEncoder',
+    'mjpEncoder_',
     'mjpPlugin',
     'mjpPlugin_',
     'mjpResourceProvider',

{mujoco-3.5.0 → mujoco-3.7.0}/mujoco/introspect/enums.py

@@ -222,7 +222,8 @@ ENUMS: Mapping[str, EnumDecl] = dict([
              ('mjEQ_TENDON', 3),
              ('mjEQ_FLEX', 4),
              ('mjEQ_FLEXVERT', 5),
-             ('mjEQ_DISTANCE', 6),
+             ('mjEQ_FLEXSTRAIN', 6),
+             ('mjEQ_DISTANCE', 7),
          ]),
      )),
     ('mjtWrap',
@@ -262,7 +263,8 @@ ENUMS: Mapping[str, EnumDecl] = dict([
              ('mjDYN_FILTER', 2),
              ('mjDYN_FILTEREXACT', 3),
              ('mjDYN_MUSCLE', 4),
-             ('mjDYN_USER', 5),
+             ('mjDYN_DCMOTOR', 5),
+             ('mjDYN_USER', 6),
          ]),
      )),
     ('mjtGain',
@@ -273,7 +275,8 @@ ENUMS: Mapping[str, EnumDecl] = dict([
              ('mjGAIN_FIXED', 0),
              ('mjGAIN_AFFINE', 1),
              ('mjGAIN_MUSCLE', 2),
-             ('mjGAIN_USER', 3),
+             ('mjGAIN_DCMOTOR', 3),
+             ('mjGAIN_USER', 4),
          ]),
      )),
     ('mjtBias',
@@ -284,7 +287,8 @@ ENUMS: Mapping[str, EnumDecl] = dict([
              ('mjBIAS_NONE', 0),
              ('mjBIAS_AFFINE', 1),
              ('mjBIAS_MUSCLE', 2),
-             ('mjBIAS_USER', 3),
+             ('mjBIAS_DCMOTOR', 3),
+             ('mjBIAS_USER', 4),
          ]),
      )),
     ('mjtObj',
@@ -574,12 +578,11 @@ ENUMS: Mapping[str, EnumDecl] = dict([
              ('mjWARN_INERTIA', 0),
              ('mjWARN_CONTACTFULL', 1),
              ('mjWARN_CNSTRFULL', 2),
-             ('mjWARN_VGEOMFULL', 3),
-             ('mjWARN_BADQPOS', 4),
-             ('mjWARN_BADQVEL', 5),
-             ('mjWARN_BADQACC', 6),
-             ('mjWARN_BADCTRL', 7),
-             ('mjNWARNING', 8),
+             ('mjWARN_BADQPOS', 3),
+             ('mjWARN_BADQVEL', 4),
+             ('mjWARN_BADQACC', 5),
+             ('mjWARN_BADCTRL', 6),
+             ('mjNWARNING', 7),
          ]),
      )),
     ('mjtTimer',