Skip to content

Commit a9f35e6

Browse files
authored
Fixed CeilingSpotLight SolidPipe translation (#6040)
* Fixed CeilingSpotLight SolidPipe translation * Fixed world files * Fixed other default translations
1 parent e1d6879 commit a9f35e6

File tree

8 files changed

+25
-0
lines changed

8 files changed

+25
-0
lines changed

projects/objects/lights/protos/CeilingSpotLight.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ PROTO CeilingSpotLight [
3838
castShadows IS spotLightCastShadows
3939
}
4040
SolidPipe {
41+
translation 0 0 0
4142
height 0.08
4243
radius 0.05
4344
thickness 0.01

projects/robots/mir/mir100/protos/Mir100.proto

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ PROTO Mir100 [
308308
}
309309
}
310310
SolidTorus {
311+
translation 0 0 0
311312
majorRadius 0.0465
312313
minorRadius 0.016
313314
enableBoundingObject FALSE
@@ -362,6 +363,7 @@ PROTO Mir100 [
362363
children [
363364
USE RIM
364365
SolidTorus {
366+
translation 0 0 0
365367
majorRadius 0.0465
366368
minorRadius 0.016
367369
enableBoundingObject FALSE
@@ -431,6 +433,7 @@ PROTO Mir100 [
431433
children [
432434
USE RIM
433435
SolidTorus {
436+
translation 0 0 0
434437
majorRadius 0.0465
435438
minorRadius 0.016
436439
enableBoundingObject FALSE
@@ -513,6 +516,7 @@ PROTO Mir100 [
513516
children [
514517
USE RIM
515518
SolidTorus {
519+
translation 0 0 0
516520
majorRadius 0.0465
517521
minorRadius 0.016
518522
enableBoundingObject FALSE
@@ -592,6 +596,7 @@ PROTO Mir100 [
592596
children [
593597
USE RIM
594598
SolidTorus {
599+
translation 0 0 0
595600
majorRadius 0.0465
596601
minorRadius 0.016
597602
enableBoundingObject FALSE
@@ -671,6 +676,7 @@ PROTO Mir100 [
671676
children [
672677
USE RIM
673678
SolidTorus {
679+
translation 0 0 0
674680
majorRadius 0.0465
675681
minorRadius 0.016
676682
enableBoundingObject FALSE

projects/samples/devices/worlds/hinge_2_joint_with_backlash.wbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ DEF WITHOUT_BACKLASH Robot {
3939
translation 0.1 0 0
4040
children [
4141
SolidRoundedBox {
42+
translation 0 0 0
4243
size 0.2 0.2 0.01
4344
borderRadius 0.005
4445
appearance GalvanizedMetal {
4546
}
4647
}
4748
SolidTorus {
49+
translation 0 0 0
4850
majorRadius 0.03
4951
minorRadius 0.02
5052
appearance BrushedAluminium {
@@ -247,12 +249,14 @@ DEF WITH_BACKLASH Robot {
247249
rotation 0 0 1 -1.570795
248250
children [
249251
SolidRoundedBox {
252+
translation 0 0 0
250253
size 0.2 0.2 0.01
251254
borderRadius 0.005
252255
appearance GalvanizedMetal {
253256
}
254257
}
255258
SolidTorus {
259+
translation 0 0 0
256260
majorRadius 0.03
257261
minorRadius 0.02
258262
appearance BrushedAluminium {

projects/samples/devices/worlds/motor2.wbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ RectangleArena {
3737
Robot {
3838
children [
3939
SolidRoundedBox {
40+
translation 0 0 0
4041
size 0.2 0.2 0.01
4142
borderRadius 0.005
4243
appearance GalvanizedMetal {
4344
}
4445
}
4546
SolidTorus {
47+
translation 0 0 0
4648
majorRadius 0.03
4749
minorRadius 0.02
4850
appearance BrushedAluminium {

projects/samples/devices/worlds/motor3.wbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ RectangleArena {
3636
Robot {
3737
children [
3838
SolidRoundedBox {
39+
translation 0 0 0
3940
size 0.2 0.2 0.01
4041
borderRadius 0.005
4142
appearance GalvanizedMetal {
4243
}
4344
}
4445
SolidTorus {
46+
translation 0 0 0
4547
majorRadius 0.03
4648
minorRadius 0.02
4749
appearance BrushedAluminium {

projects/samples/environments/factory/worlds/hall.wbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,6 +1160,7 @@ Robot {
11601160
}
11611161
}
11621162
SolidRoundedBox {
1163+
translation 0 0 0
11631164
name "rounded box(1)"
11641165
size 0.08 0.011 0.08
11651166
borderRadius 0.005
@@ -4755,6 +4756,7 @@ Robot {
47554756
}
47564757
}
47574758
SolidRoundedBox {
4759+
translation 0 0 0
47584760
name "rounded box(1)"
47594761
size 0.08 0.011 0.08
47604762
borderRadius 0.005

projects/samples/geometries/worlds/extended_solids.wbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SolidBox {
3232
}
3333
}
3434
SolidPipe {
35+
translation 0 0 0
3536
rotation 0.5773489358556708 0.5773509358554485 0.5773509358554485 -2.094395307179586
3637
subdivision 48
3738
physics Physics {

projects/vehicles/worlds/village_center.wbt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,6 +2406,7 @@ DEF TREE Transform {
24062406
rotation 0 0 1 1.8584073176408265
24072407
children [
24082408
SolidPipe {
2409+
translation 0 0 0
24092410
height 0.2
24102411
appearance PBRAppearance {
24112412
baseColorMap ImageTexture {
@@ -2439,6 +2440,7 @@ DEF TREE Transform {
24392440
rotation 0 0 1 2.6438054786408265
24402441
children [
24412442
SolidPipe {
2443+
translation 0 0 0
24422444
name "pipe(1)"
24432445
height 0.2
24442446
appearance PBRAppearance {
@@ -2474,6 +2476,7 @@ DEF TREE Transform {
24742476
rotation 0 0 1 5.785398122640827
24752477
children [
24762478
SolidPipe {
2479+
translation 0 0 0
24772480
name "pipe(2)"
24782481
height 0.2
24792482
appearance PBRAppearance {
@@ -2509,6 +2512,7 @@ DEF TREE Transform {
25092512
rotation 0 0 1 3.6910030266408267
25102513
children [
25112514
SolidPipe {
2515+
translation 0 0 0
25122516
name "pipe(3)"
25132517
height 0.2
25142518
appearance PBRAppearance {
@@ -2544,6 +2548,7 @@ DEF TREE Transform {
25442548
rotation 0 0 -1 6.257373717718359
25452549
children [
25462550
SolidPipe {
2551+
translation 0 0 0
25472552
name "pipe(4)"
25482553
height 0.2
25492554
appearance PBRAppearance {
@@ -2579,6 +2584,7 @@ DEF TREE Transform {
25792584
rotation 0 0 1 3.1674042526408264
25802585
children [
25812586
SolidPipe {
2587+
translation 0 0 0
25822588
name "pipe(5)"
25832589
height 0.2
25842590
appearance PBRAppearance {
@@ -2614,6 +2620,7 @@ DEF TREE Transform {
26142620
rotation 0 0 -1 5.9955743307183464
26152621
children [
26162622
SolidPipe {
2623+
translation 0 0 0
26172624
name "pipe(6)"
26182625
height 0.2
26192626
appearance PBRAppearance {

0 commit comments

Comments
 (0)