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

Add compiler settings to mjmModel.

Browse Source 
PiperOrigin-RevId: 608908314
Change-Id: Id3b0d8c62ca710b5b6d6e423abbbddcb7e7079a1
This commit is contained in:
Alessio Quaglino
2024-02-21 01:57:19 -08:00
committed by Copybara-Service
parent abf6d41b7f
commit 042760eba8
12 changed files with 130 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_objects.cc
+4 -4
View File
@@ -1246,7 +1246,7 @@ void mjCFrame::Compile() {
}
CopyFromSpec();
const char* err = alt_.Set(quat, model->degree, model->euler);
const char* err = alt_.Set(quat, model->spec.degree, model->spec.euler);
if (err) {
throw mjCError(this, "orientation specification error '%s' in site %d", err, id);
}
@@ -2599,7 +2599,7 @@ void mjCHField::Compile(const mjVFS* vfs) {
throw mjCError(this, "unsupported content type: '%s'", asset_type.c_str());
}
string filename = mjuu_makefullname(model->modelfiledir, model->meshdir, file_);
string filename = mjuu_makefullname(model->modelfiledir, model->meshdir_, file_);
mjResource* resource = LoadResource(filename, vfs);
try {
@@ -3218,7 +3218,7 @@ void mjCTexture::LoadCubeSeparate(const mjVFS* vfs) {
}
// make filename
string filename = mjuu_makefullname(model->modelfiledir, model->texturedir, cubefiles_[i]);
string filename = mjuu_makefullname(model->modelfiledir, model->texturedir_, cubefiles_[i]);
// load PNG or custom
unsigned int w, h;
@@ -3318,7 +3318,7 @@ void mjCTexture::Compile(const mjVFS* vfs) {
}
// make filename
string filename = mjuu_makefullname(model->modelfiledir, model->texturedir, file_);
string filename = mjuu_makefullname(model->modelfiledir, model->texturedir_, file_);
// dispatch
if (type==mjTEXTURE_2D) {