Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/user/user_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1415,10 +1415,19 @@ static mjsElement* GetNext(const std::vector<T*>& list, const mjsElement* child)
return list[0]->spec.element;
}

// TODO: use id for direct indexing instead of a loop
for (unsigned int i = 0; i < list.size()-1; i++) {
// use id for direct indexing if valid
int id = static_cast<const mjCBase*>(child)->id;
if (id >= 0 && id < (int)list.size() && list[id]->spec.element == child) {
if (id + 1 < (int)list.size()) {
return list[id + 1]->spec.element;
}
return nullptr;
}

// fallback to linear search if id is stale or invalid
for (int i = 0; i < (int)list.size() - 1; i++) {
if (list[i]->spec.element == child) {
return list[i+1]->spec.element;
return list[i + 1]->spec.element;
}
}
return nullptr;
Expand Down
Loading