chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move mjCSite attributes to mjmSite struct.

Browse Source 
PiperOrigin-RevId: 603051589
Change-Id: I31eeeccffa15b96e7393b8e64f6be8c964fc5948
This commit is contained in:
Alessio Quaglino
2024-01-31 08:06:50 -08:00
committed by Copybara-Service
parent fae1f3e56d
commit 7a98038e88
6 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_model.cc
+3 -2
View File
@@ -651,7 +651,7 @@ void mjCModel::MakeLists(mjCBody* body) {
// delete material with given name or all materials if the name is omitted
template <class T>
static void DeleteMaterial(std::vector<T*>& list, std::string_view name = "") {
void mjCModel::DeleteMaterial(std::vector<T*>& list, std::string_view name) {
for (T* plist : list) {
if (name.empty() || plist->material == name) {
plist->material.clear();
@@ -660,6 +660,7 @@ static void DeleteMaterial(std::vector<T*>& list, std::string_view name = "") {
}
// delete texture with given name or all textures if the name is omitted
template <class T>
static void DeleteTexture(std::vector<T*>& list, std::string_view name = "") {
@@ -2900,7 +2901,7 @@ void mjCModel::TryCompile(mjModel*& m, mjData*& d, const mjVFS* vfs) {
if (nuser_site == -1) {
nuser_site = 0;
for (int i=0; i<sites.size(); i++) {
nuser_site = mjMAX(nuser_site, sites[i]->userdata.size());
nuser_site = mjMAX(nuser_site, sites[i]->spec.userdata.size());
}
}
if (nuser_cam == -1) {