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

simulate python: fix cmake, glfw usage, update Python version of physics loop

Browse Source
This commit is contained in:
Levi Burner
2022-10-04 14:37:06 -04:00
parent 0b6bf42840
commit 95a4b1c551
12 changed files with 219 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulate/main.cc
+9 -3
View File
@@ -337,7 +337,10 @@ void PhysicsLoop(mj::Simulate& sim) {
mjData* dnew = nullptr;
if (mnew) dnew = mj_makeData(mnew);
if (dnew) {
sim.load(sim.dropfilename, mnew, dnew, true);
sim.load(sim.dropfilename, mnew, dnew);
if (d) mj_deleteData(d);
if (m) mj_deleteModel(m);
m = mnew;
d = dnew;
@@ -356,7 +359,10 @@ void PhysicsLoop(mj::Simulate& sim) {
mjData* dnew = nullptr;
if (mnew) dnew = mj_makeData(mnew);
if (dnew) {
sim.load(sim.filename, mnew, dnew, true);
sim.load(sim.filename, mnew, dnew);
if (d) mj_deleteData(d);
if (m) mj_deleteModel(m);
m = mnew;
d = dnew;
@@ -482,7 +488,7 @@ void PhysicsThread(mj::Simulate* sim, const char* filename) {
m = LoadModel(filename, *sim);
if (m) d = mj_makeData(m);
if (d) {
sim->load(filename, m, d, true);
sim->load(filename, m, d);
mj_forward(m, d);
// allocate ctrlnoise