@@ -156,27 +156,27 @@ PROTO VehicleWheel [
156156 for (let i = 0; i <= edgeSubdivision; ++i)
157157 circles[i + 1] = wbgeometry.circle(tireRadius - (thickness * 0.5) * curvatureFactor * (1 - Math.sin(beta * i)), subdivision, {x: 0, y: 0}, 0);
158158 >%
159-
159+
160160 # top inner
161161 %< for (let i = 0; i < circles[0].length; ++i) { >%
162- %<= thickness * 0.5 >% %<= -circles[0][i].x >% %<= circles[0][i].y >%
162+ %<= circles[0][i].y >% %<= -thickness * 0.5 >% %<= circles[0][i].x >%
163163 %< } >%
164164
165165 %< for (let i = 0; i <= edgeSubdivision; ++i) { >%
166166 %< for (let j = 0; j < circles[i+1].length; ++j) { >%
167- %<= thickness * 0.5 * (1 - curvatureFactor * (1 - Math.cos(beta * i))) >% %<= - circles[i+1][j].x >% %<= circles[i+1][j].y >%
167+ %<= circles[i+1][j].y >% %<= - thickness * 0.5 * (1 - curvatureFactor * (1 - Math.cos(beta * i))) >% %<= circles[i+1][j].x >%
168168 %< } >%
169169 %< } >%
170170
171171 %< for (let i = 0; i <= edgeSubdivision; ++i) { >%
172172 %< for (let j = 0; j < circles[(edgeSubdivision - i) + 1].length; ++j) { >%
173- %<= - thickness * 0.5 * (1 - curvatureFactor * (1 - Math.sin(beta * i))) >% %<= - circles[(edgeSubdivision - i) + 1][j].x >% %<= circles[(edgeSubdivision - i) + 1][j].y >%
173+ %<= circles[(edgeSubdivision - i) + 1][j].y >% %<= thickness * 0.5 * (1 - curvatureFactor * (1 - Math.sin(beta * i))) >% %<= circles[(edgeSubdivision - i) + 1][j].x >%
174174 %< } >%
175175 %< } >%
176176
177177 # bottom inner
178178 %< for (let i = 0; i < circles[0].length; ++i) { >%
179- %<= - thickness * 0.5 >% %<= -circles[0][i].x >% %<= circles[0][i].y >%
179+ %<= circles[0][i].y >% %<= thickness * 0.5 >% %<= circles[0][i].x >%
180180 %< } >%
181181
182182 ]
@@ -247,22 +247,22 @@ PROTO VehicleWheel [
247247
248248 # top outer
249249 %< for (let i = 0; i < rimOuterCircle.length; ++i) { >%
250- %<= -thickness * 0.5 >% %<= rimOuterCircle[i].x >% %<= rimOuterCircle[i].y >%
250+ %<= rimOuterCircle[i].y >% %<= -thickness * 0.5 >% %<= rimOuterCircle[i].x >%
251251 %< } >%
252252
253253 # top inner
254254 %< for (let i = 0; i < rimInnerCircle.length; ++i) { >%
255- %<= -thickness * 0.5 >% %<= rimInnerCircle[i].x >% %<= rimInnerCircle[i].y >%
255+ %<= rimInnerCircle[i].y >% %<= -thickness * 0.5 >% %<= rimInnerCircle[i].x >%
256256 %< } >%
257257
258258 # bottom inner
259259 %< for (let i = 0; i < rimInnerCircle.length; ++i) { >%
260- %<= thickness * 0.5 >% %<= rimInnerCircle[i].x >% %<= rimInnerCircle[i].y >%
260+ %<= rimInnerCircle[i].y >% %<= thickness * 0.5 >% %<= rimInnerCircle[i].x >%
261261 %< } >%
262262
263263 # bottom outer
264264 %< for (let i = 0; i < rimOuterCircle.length; ++i) { >%
265- %<= thickness * 0.5 >% %<= rimOuterCircle[i].x >% %<= rimOuterCircle[i].y >%
265+ %<= rimOuterCircle[i].y >% %<= thickness * 0.5 >% %<= rimOuterCircle[i].x >%
266266 %< } >%
267267 ]
268268 }
@@ -304,46 +304,46 @@ PROTO VehicleWheel [
304304 >%
305305 # Top part
306306 ## Center
307- %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% 0 0
307+ 0 %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% 0
308308 %< for (let i = 0; i < centralCircles[0].length; ++i) { >%
309- %<= -rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[0][i].x >% %<= centralCircles[0][i].y >%
309+ %<= centralCircles[0][i].y >% %<= -rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[0][i].x >%
310310 %< } >%
311311 ## Between beams
312312 %< for (let i = 0; i < centralCircles[1].length; ++i) { >%
313- %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[1][i].x >% %<= centralCircles[1][i].y >%
313+ %<= centralCircles[1][i].y >% %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[1][i].x >%
314314 %< } >%
315315 %< for (let i = 0; i < centralCircles[2].length; ++i) { >%
316- %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[2][i].x >% %<= centralCircles[2][i].y >%
316+ %<= centralCircles[2][i].y >% %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[2][i].x >%
317317 %< } >%
318318 ## Beams
319319 %< for (let i = 0; i < centralCircles[3].length; ++i) { >%
320- %<= -rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[3][i].x >% %<= centralCircles[3][i].y >%
320+ %<= centralCircles[3][i].y >% %<= -rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[3][i].x >%
321321 %< } >%
322322 %< for (let i = 0; i < centralCircles[4].length; ++i) { >%
323- %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[4][i].x >% %<= centralCircles[4][i].y >%
323+ %<= centralCircles[4][i].y >% %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[4][i].x >%
324324 %< } >%
325325 %< for (let i = 0; i < centralCircles[5].length; ++i) { >%
326- %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[5][i].x >% %<= centralCircles[5][i].y >%
326+ %<= centralCircles[5][i].y >% %<= -rimBeamThickness / 2.5 - rimBeamOffset/2 >% %<= centralCircles[5][i].x >%
327327 %< } >%
328328
329329 # side
330330 ## Between beams
331331 %< for (let i = 0; i < centralCircles[1].length; ++i) { >%
332- %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[1][i].x >% %<= centralCircles[1][i].y >%
332+ %<= centralCircles[1][i].y >% %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[1][i].x >%
333333 %< } >%
334334 %< for (let i = 0; i < centralCircles[2].length; ++i) { >%
335- %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[2][i].x >% %<= centralCircles[2][i].y >%
335+ %<= centralCircles[2][i].y >% %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[2][i].x >%
336336 %< } >%
337337 ## Beams
338338 %< for (let i = 0; i < centralCircles[4].length; ++i) { >%
339- %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[4][i].x >% %<= centralCircles[4][i].y >%
339+ %<= centralCircles[4][i].y >% %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[4][i].x >%
340340 %< } >%
341341 %< for (let i = 0; i < centralCircles[5].length; ++i) { >%
342- %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[5][i].x >% %<= centralCircles[5][i].y >%
342+ %<= centralCircles[5][i].y >% %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% %<= centralCircles[5][i].x >%
343343 %< } >%
344344
345345 # bottom
346- %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% 0 0
346+ 0 %<= rimBeamThickness * 0.5 - rimBeamOffset/2 >% 0
347347 ]
348348 }
349349 coordIndex [
@@ -406,7 +406,7 @@ PROTO VehicleWheel [
406406 %< if (fields.boundingObject.value) { >%
407407 contactMaterial IS contactMaterial
408408 boundingObject Transform {
409- rotation 0 1 0 1.570796
409+ rotation 1 0 0 1.570796
410410 children [
411411 Cylinder {
412412 height %<= thickness >%
0 commit comments