Add various improvements for resource providers.

PiperOrigin-RevId: 529706437
Change-Id: I20385e031446674584349c301982dbe13b812477
This commit is contained in:
Kyle Bayes
2023-05-05 07:02:51 -07:00
committed by Copybara-Service
parent b798f89212
commit 67f0f5154f
23 changed files with 576 additions and 193 deletions
+3 -3
View File
@@ -83,19 +83,19 @@ void mj_deactivate(void) {
// mj_loadXML helper function
mjModel* _loadXML(const char* filename, int default_provider,
mjModel* _loadXML(const char* filename, int vfs_provider,
char* error, int error_sz) {
// serialize access to themodel
std::lock_guard<std::mutex> lock(themutex);
// parse new model
mjCModel* newmodel = mjParseXML(filename, default_provider, error, error_sz);
mjCModel* newmodel = mjParseXML(filename, vfs_provider, error, error_sz);
if (!newmodel) {
return nullptr;
}
// compile new model
mjModel* m = newmodel->Compile(default_provider);
mjModel* m = newmodel->Compile(vfs_provider);
if (!m) {
mjCopyError(error, newmodel->GetError().message, error_sz);
delete newmodel;