Move meshdir and texturedir to mjsCompiler.

For backwards compatibility in the Python bindings, both `spec.compiler.meshdir` and `spec.meshdir` are now allowed.

Fixes #2834.

PiperOrigin-RevId: 809060113
Change-Id: Ie23f1c5dd57de43568312a8e062906f4013bb474
This commit is contained in:
Alessio Quaglino
2025-09-19 09:04:42 -07:00
committed by Copybara-Service
parent 681f5767b2
commit 77e025ea98
16 changed files with 98 additions and 79 deletions
+11 -2
View File
@@ -148,8 +148,6 @@ class mjCModel_ : public mjsElement {
std::string spec_comment_;
std::string spec_modelfiledir_;
std::string spec_modelname_;
std::string spec_meshdir_;
std::string spec_texturedir_;
};
// mjCModel contains everything needed to generate the low-level model.
@@ -330,7 +328,18 @@ class mjCModel : public mjCModel_, private mjSpec {
// check for repeated names in list
void CheckRepeat(mjtObj type);
// increment and decrement reference count
void AddRef() { ++refcount; }
int GetRef() const { return refcount; }
void Release() {
if (--refcount == 0) {
delete this;
}
}
private:
int refcount = 1;
// settings for each defaults class
std::vector<mjCDef*> defaults_;