Replace mjCModel with mjmModel in mjXBase.
PiperOrigin-RevId: 611762880 Change-Id: I22254689b6cbf10fe7b61f9742b6ffd6c2074477
This commit is contained in:
committed by
Copybara-Service
parent
419be4c605
commit
1bd44e73bb
+3
-5
@@ -19,9 +19,7 @@
|
||||
#include <string>
|
||||
|
||||
#include "tinyxml2.h"
|
||||
#include <mujoco/mjmodel.h>
|
||||
#include "user/user_model.h"
|
||||
#include "user/user_objects.h"
|
||||
#include "user/user_api.h"
|
||||
#include "xml/xml_util.h"
|
||||
|
||||
|
||||
@@ -89,13 +87,13 @@ class mjXBase : public mjXUtil {
|
||||
};
|
||||
|
||||
// set the model allocated externally
|
||||
void SetModel(mjCModel*);
|
||||
virtual void SetModel(mjmModel*);
|
||||
|
||||
// read alternative orientation specification
|
||||
static int ReadAlternative(tinyxml2::XMLElement* elem, mjmOrientation& alt);
|
||||
|
||||
protected:
|
||||
mjCModel* model; // internally-allocated mjCModel object
|
||||
mjmModel* model; // internally-allocated model
|
||||
};
|
||||
|
||||
#endif // MUJOCO_SRC_XML_XML_BASE_H_
|
||||
|
||||
Reference in New Issue
Block a user