Version 2.1.2: Python bindings, OBJ assets support, bugfixes.

PiperOrigin-RevId: 434731612
Change-Id: I0cfda3e7a3d1c72036764986efc252ffa1b8c6b0
This commit is contained in:
Saran Tunyasuvunakool
2022-03-15 14:04:44 +00:00
parent 175d25cd9f
commit 3577e2cf8b
304 changed files with 23906 additions and 1013 deletions
+11 -8
View File
@@ -18,18 +18,21 @@
#include <string>
#include <thread>
#include "mujoco.h"
#include <mujoco.h>
// maximum number of threads
const int maxthread = 512;
// model and per-thread data
mjModel* m = NULL;
mjData* d[64];
mjData* d[maxthread];
// per-thread statistics
int contacts[64];
int constraints[64];
double simtime[64];
int contacts[maxthread];
int constraints[maxthread];
double simtime[maxthread];
// timer
@@ -121,8 +124,8 @@ int main(int argc, const char** argv) {
// clamp ctrlnoise to [0.0, 1.0]
ctrlnoise = mjMAX(0.0, mjMIN(ctrlnoise, 1.0));
// clamp nthread to [1, 64]
nthread = mjMAX(1, mjMIN(64, nthread));
// clamp nthread to [1, maxthread]
nthread = mjMAX(1, mjMIN(maxthread, nthread));
// get filename, determine file type
std::string filename(argv[1]);
@@ -169,7 +172,7 @@ int main(int argc, const char** argv) {
}
// run simulation, record total time
std::thread th[64];
std::thread th[maxthread];
double starttime = gettm();
for (int id=0; id<nthread; id++) {
th[id] = std::thread(simulate, id, nstep, ctrlnoise);