Automated g4 rollback of changelist 885555524.
*** Reason for rollback *** Rolling back obj/stl decoder inclusion as sources due to broken windows build. *** Original change description *** Include obj and stl decoder plugins as sources in CMake builds. This removes the need to load these decoders via mj_loadAllPluginLibraries when using MuJoCo built with CMake. Other plugins are unchanged. *** PiperOrigin-RevId: 885576586 Change-Id: I31e6fa4d10697862f7d800d0d771ca752747e36d
This commit is contained in:
committed by
Copybara-Service
parent
15ca42ff68
commit
ef78f07ffb
@@ -187,6 +187,12 @@ int main(int argc, char** argv) {
|
||||
nthread = mjMAX(1, mjMIN(maxthread, nthread));
|
||||
npoolthread = mjMAX(1, mjMIN(maxthread, npoolthread));
|
||||
|
||||
// load plugins from MUJOCO_PLUGIN_DIR if set
|
||||
const char* plugin_dir = std::getenv("MUJOCO_PLUGIN_DIR");
|
||||
if (plugin_dir) {
|
||||
mj_loadAllPluginLibraries(plugin_dir, nullptr);
|
||||
}
|
||||
|
||||
// get filename, determine file type
|
||||
std::string filename(argv[1]);
|
||||
bool binary = (filename.find(".mjb") != std::string::npos); // NOLINT
|
||||
|
||||
Reference in New Issue
Block a user