From 56e00a5d4a0bdc7e0389f99b664544c8a33b1f71 Mon Sep 17 00:00:00 2001 From: Yuval Tassa Date: Sun, 4 Aug 2024 03:31:32 -0700 Subject: [PATCH] Re-order elements of mjSTATE_FULLPHYSICS. Fixes #1876 PiperOrigin-RevId: 659267096 Change-Id: Iaf1e13caa989c41179aa0bd635cfa17ac776d06d --- doc/includes/references.h | 2 +- include/mujoco/mjdata.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/includes/references.h b/doc/includes/references.h index d301a2c2..8ff4f43c 100644 --- a/doc/includes/references.h +++ b/doc/includes/references.h @@ -35,7 +35,7 @@ typedef enum mjtState_ { // state elements // convenience values for commonly used state specifications mjSTATE_PHYSICS = mjSTATE_QPOS | mjSTATE_QVEL | mjSTATE_ACT, - mjSTATE_FULLPHYSICS = mjSTATE_PHYSICS | mjSTATE_TIME | mjSTATE_PLUGIN, + mjSTATE_FULLPHYSICS = mjSTATE_TIME | mjSTATE_PHYSICS | mjSTATE_PLUGIN, mjSTATE_USER = mjSTATE_CTRL | mjSTATE_QFRC_APPLIED | mjSTATE_XFRC_APPLIED | mjSTATE_EQ_ACTIVE | mjSTATE_MOCAP_POS | mjSTATE_MOCAP_QUAT | mjSTATE_USERDATA, diff --git a/include/mujoco/mjdata.h b/include/mujoco/mjdata.h index 45c8229e..23a4f019 100644 --- a/include/mujoco/mjdata.h +++ b/include/mujoco/mjdata.h @@ -43,7 +43,7 @@ typedef enum mjtState_ { // state elements // convenience values for commonly used state specifications mjSTATE_PHYSICS = mjSTATE_QPOS | mjSTATE_QVEL | mjSTATE_ACT, - mjSTATE_FULLPHYSICS = mjSTATE_PHYSICS | mjSTATE_TIME | mjSTATE_PLUGIN, + mjSTATE_FULLPHYSICS = mjSTATE_TIME | mjSTATE_PHYSICS | mjSTATE_PLUGIN, mjSTATE_USER = mjSTATE_CTRL | mjSTATE_QFRC_APPLIED | mjSTATE_XFRC_APPLIED | mjSTATE_EQ_ACTIVE | mjSTATE_MOCAP_POS | mjSTATE_MOCAP_QUAT | mjSTATE_USERDATA,