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

Move mjtByte definition from mjmodel.h to mjtnum.h.

Browse Source 
PiperOrigin-RevId: 516193927
Change-Id: Idbba21119ef2f7da3ab6f6f21611a757658aad23
This commit is contained in:
Yuval Tassa
2023-03-13 06:37:57 -07:00
committed by Copybara-Service
parent b4d29abfc1
commit c16d4d0d25
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/APIreference/APItypes.rst
+1 -2
View File
@@ -34,8 +34,7 @@ MuJoCo defines a large number of types:
Primitive types Primitive types
^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^
The two types below are defined in `mjtnum.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjtnum.h>`_ The two types below are defined in `mjtnum.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjtnum.h>`_.
and `mjmodel.h <https://github.com/deepmind/mujoco/blob/main/include/mujoco/mjmodel.h>`_, respectively.
.. _mjtNum: .. _mjtNum:
include/mujoco/mjmodel.h
+1 -4
View File
@@ -40,10 +40,7 @@
#define mjNSOLVER 1000 // size of mjData.solver_XXX arrays #define mjNSOLVER 1000 // size of mjData.solver_XXX arrays
//---------------------------------- primitive types (mjt) ----------------------------------------- //---------------------------------- enum types (mjt) ----------------------------------------------
typedef unsigned char mjtByte; // used for true/false
typedef enum mjtDisableBit_ { // disable default feature bitflags typedef enum mjtDisableBit_ { // disable default feature bitflags
mjDSBL_CONSTRAINT = 1<<0, // entire constraint solver mjDSBL_CONSTRAINT = 1<<0, // entire constraint solver
include/mujoco/mjtnum.h
+8 -1
View File
@@ -15,7 +15,7 @@
#ifndef MUJOCO_INCLUDE_MJTNUM_H_ #ifndef MUJOCO_INCLUDE_MJTNUM_H_
#define MUJOCO_INCLUDE_MJTNUM_H_ #define MUJOCO_INCLUDE_MJTNUM_H_
//---------------------------------- floating-point definitions ------------------------------------ //---------------------------------- floating-point definition -------------------------------------
// compile-time configuration options // compile-time configuration options
#define mjUSEDOUBLE // single or double precision for mjtNum #define mjUSEDOUBLE // single or double precision for mjtNum
@@ -31,4 +31,11 @@
#endif #endif
//-------------------------------------- byte definition -------------------------------------------
typedef unsigned char mjtByte; // used for true/false
#endif // MUJOCO_INCLUDE_MJTNUM_H_ #endif // MUJOCO_INCLUDE_MJTNUM_H_