Avoid variable name shadowing in all engine source files.

PiperOrigin-RevId: 519179975
Change-Id: I2f9269cd88857b9e758c63978b20f9c9dd17207e
This commit is contained in:
Yuval Tassa
2023-03-24 10:32:54 -07:00
committed by Copybara-Service
parent 3f14d97f6b
commit d6f2dd143d
9 changed files with 85 additions and 82 deletions
+2 -2
View File
@@ -81,7 +81,7 @@ static mjtNum wrap_circle(mjtNum* pnt, const mjtNum* d, const mjtNum* sd, mjtNum
mjtNum dif[2] = {d[2]-d[0], d[3]-d[1]};
mjtNum a, tmp[2], dd, sqrt0, sqrt1;
mjtNum sol[2][2][2], good[2], wlen;
int i, sgn;
int sgn;
// either point inside circle or circle too small: no wrap
if (sqlen0<sqrad || sqlen1<sqrad || rad<mjMINVAL) {
@@ -138,7 +138,7 @@ static mjtNum wrap_circle(mjtNum* pnt, const mjtNum* d, const mjtNum* sd, mjtNum
}
// select the better solution
i = (good[0]>good[1] ? 0 : 1);
int i = (good[0]>good[1] ? 0 : 1);
pnt[0] = sol[i][0][0];
pnt[1] = sol[i][0][1];
pnt[2] = sol[i][1][0];