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

Add content_type attribute that takes a MIME type to specify the file contents for meshes, hfields, and textures.

Browse Source 
PiperOrigin-RevId: 549302344
Change-Id: I30a8adfef5b5d87bb20479329f3396892f5137ff
This commit is contained in:
Kyle Bayes
2023-07-19 06:50:35 -07:00
committed by Copybara-Service
parent 5f327b0c31
commit 5fcdae771b
12 changed files with 556 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_mesh.cc
+10 -8
View File
@@ -188,21 +188,23 @@ void mjCMesh::Compile(int vfs_provider) {
file = mjuu_strippath(file);
}
// load STL, OBJ or MSH
string ext = mjuu_getext(file);
if (strcasecmp(ext.c_str(), ".stl") &&
strcasecmp(ext.c_str(), ".obj") &&
strcasecmp(ext.c_str(), ".msh")) {
throw mjCError(this, "Unknown mesh file type: %s", file.c_str());
std::string asset_type = GetAssetContentType(file, content_type);
if (asset_type.empty()) {
throw mjCError(this, "unknown mesh content type for file: '%s'", file.c_str());
}
if (asset_type != "model/stl" && asset_type != "model/obj"
&& asset_type != "model/vnd.mujoco.msh") {
throw mjCError(this, "unsupported content type: '%s'", asset_type.c_str());
}
string filename = mjuu_makefullname(model->modelfiledir, model->meshdir, file);
mjResource* resource = LoadResource(filename, vfs_provider);
try {
if (!strcasecmp(ext.c_str(), ".stl")) {
if (asset_type == "model/stl") {
LoadSTL(resource);
} else if (!strcasecmp(ext.c_str(), ".obj")) {
} else if (asset_type == "model/obj") {
LoadOBJ(resource);
} else {
LoadMSH(resource);