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

Rename variables to avoid shadowing in user_objects.cc

Browse Source 
PiperOrigin-RevId: 780137314
Change-Id: Ife5abd0ecc3851837a7aef7048efe80dbdfcf60e
This commit is contained in:
Yuval Tassa
2025-07-07 09:13:51 -07:00
committed by Copybara-Service
parent e01c4b454a
commit 7a09145161
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/user_objects.cc
+11 -11
View File
@@ -5714,14 +5714,14 @@ void mjCTendon::SetModel(mjCModel* _model) {
// add site as wrap object // add site as wrap object
void mjCTendon::WrapSite(std::string name, std::string_view info) { void mjCTendon::WrapSite(std::string wrapname, std::string_view wrapinfo) {
// create wrap object // create wrap object
mjCWrap* wrap = new mjCWrap(model, this); mjCWrap* wrap = new mjCWrap(model, this);
wrap->info = info; wrap->info = wrapinfo;
// set parameters, add to path // set parameters, add to path
wrap->type = mjWRAP_SITE; wrap->type = mjWRAP_SITE;
wrap->name = name; wrap->name = wrapname;
wrap->id = (int)path.size(); wrap->id = (int)path.size();
path.push_back(wrap); path.push_back(wrap);
} }
@@ -5729,14 +5729,14 @@ void mjCTendon::WrapSite(std::string name, std::string_view info) {
// add geom (with side site) as wrap object // add geom (with side site) as wrap object
void mjCTendon::WrapGeom(std::string name, std::string sidesite, std::string_view info) { void mjCTendon::WrapGeom(std::string wrapname, std::string sidesite, std::string_view wrapinfo) {
// create wrap object // create wrap object
mjCWrap* wrap = new mjCWrap(model, this); mjCWrap* wrap = new mjCWrap(model, this);
wrap->info = info; wrap->info = wrapinfo;
// set parameters, add to path // set parameters, add to path
wrap->type = mjWRAP_SPHERE; // replace with cylinder later if needed wrap->type = mjWRAP_SPHERE; // replace with cylinder later if needed
wrap->name = name; wrap->name = wrapname;
wrap->sidesite = sidesite; wrap->sidesite = sidesite;
wrap->id = (int)path.size(); wrap->id = (int)path.size();
path.push_back(wrap); path.push_back(wrap);
@@ -5745,14 +5745,14 @@ void mjCTendon::WrapGeom(std::string name, std::string sidesite, std::string_vie
// add joint as wrap object // add joint as wrap object
void mjCTendon::WrapJoint(std::string name, double coef, std::string_view info) { void mjCTendon::WrapJoint(std::string wrapname, double coef, std::string_view wrapinfo) {
// create wrap object // create wrap object
mjCWrap* wrap = new mjCWrap(model, this); mjCWrap* wrap = new mjCWrap(model, this);
wrap->info = info; wrap->info = wrapinfo;
// set parameters, add to path // set parameters, add to path
wrap->type = mjWRAP_JOINT; wrap->type = mjWRAP_JOINT;
wrap->name = name; wrap->name = wrapname;
wrap->prm = coef; wrap->prm = coef;
wrap->id = (int)path.size(); wrap->id = (int)path.size();
path.push_back(wrap); path.push_back(wrap);
@@ -5761,10 +5761,10 @@ void mjCTendon::WrapJoint(std::string name, double coef, std::string_view info)
// add pulley // add pulley
void mjCTendon::WrapPulley(double divisor, std::string_view info) { void mjCTendon::WrapPulley(double divisor, std::string_view wrapinfo) {
// create wrap object // create wrap object
mjCWrap* wrap = new mjCWrap(model, this); mjCWrap* wrap = new mjCWrap(model, this);
wrap->info = info; wrap->info = wrapinfo;
// set parameters, add to path // set parameters, add to path
wrap->type = mjWRAP_PULLEY; wrap->type = mjWRAP_PULLEY;
src/user/user_objects.h
+4 -4
View File
@@ -1593,10 +1593,10 @@ class mjCTendon : public mjCTendon_, private mjsTendon {
void del_material() { material_.clear(); } void del_material() { material_.clear(); }
// API for adding wrapping objects // API for adding wrapping objects
void WrapSite(std::string name, std::string_view info = ""); // site void WrapSite(std::string wrapname, std::string_view wrapinfo = ""); // site
void WrapGeom(std::string name, std::string side, std::string_view info = ""); // geom void WrapGeom(std::string wrapname, std::string side, std::string_view wrapinfo = ""); // geom
void WrapJoint(std::string name, double coef, std::string_view info = ""); // joint void WrapJoint(std::string wrapname, double coef, std::string_view wrapinfo = ""); // joint
void WrapPulley(double divisor, std::string_view info = ""); // pulley void WrapPulley(double divisor, std::string_view wrapinfo = ""); // pulley
// API for access to wrapping objects // API for access to wrapping objects
int NumWraps() const; // number of wraps int NumWraps() const; // number of wraps