Remove mj_activate and mj_deactivate.
PiperOrigin-RevId: 538799120 Change-Id: I4d6729131e20ab9ae15c94c221ba83ae5732e942
This commit is contained in:
committed by
Copybara-Service
parent
188b04fba5
commit
466c9aca82
+2
-14
@@ -62,26 +62,14 @@ void GlobalModel::Clear() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// single instance of global model, protected with mutex
|
||||
static GlobalModel themodel;
|
||||
static std::mutex themutex;
|
||||
|
||||
|
||||
|
||||
//---------------------------------- Functions -----------------------------------------------------
|
||||
|
||||
// Return 1 (for backward compatibility).
|
||||
int mj_activate(const char* filename) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Do nothing (for backward compatibility).
|
||||
void mj_deactivate(void) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// mj_loadXML helper function
|
||||
mjModel* _loadXML(const char* filename, int vfs_provider,
|
||||
char* error, int error_sz) {
|
||||
|
||||
@@ -23,11 +23,6 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
// activate license, call mju_error on failure; return 1 if ok, 0 if failure
|
||||
MJAPI int mj_activate(const char* filename);
|
||||
|
||||
// deactivate license, free memory
|
||||
MJAPI void mj_deactivate(void);
|
||||
|
||||
// parse XML file in MJCF or URDF format, compile it, return low-level model
|
||||
// if vfs is not NULL, look up files in vfs before reading from disk
|
||||
|
||||
Reference in New Issue
Block a user