Skip to content

Commit

Permalink
Fix version number to 2023b (#6342)
Browse files Browse the repository at this point in the history
* Fix version number to 2023b

---------

Co-authored-by: Yann LEROY <yann.leroy@manurob.com>
Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 26, 2023
1 parent c3e94a8 commit 2a3f8c3
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion projects/samples/howto/url/controllers/url/url.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ int main() {
printf("The texture URL of the robot body was changed from the supervisor to a non-existing file.\n");
} else if (counter == 160) {
wb_supervisor_field_set_mf_string(url, 0,
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/appearances/"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/"
"protos/textures/brushed_steel/brushed_steel_base_color.jpg");
printf("The texture URL of the robot body was changed from the supervisor to an existing URL.\n");
}
Expand Down
46 changes: 23 additions & 23 deletions projects/samples/howto/url/worlds/url.wbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ WorldInfo {
title "Assets Download"
contactProperties [
ContactProperties {
bumpSound "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/sounds/bump.wav"
rollSound "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/sounds/roll.wav"
slideSound "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/sounds/slide.wav"
bumpSound "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/sounds/bump.wav"
rollSound "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/sounds/roll.wav"
slideSound "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/sounds/slide.wav"
}
]
}
Expand All @@ -23,40 +23,40 @@ Viewpoint {
}
Background {
backUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_back.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_back.jpg"
]
bottomUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2022b/projects/default/worlds/textures/cubic/mountains_bottom.jpg"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_bottom.jpg"
]
frontUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_front.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_front.jpg"
]
leftUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_left.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_left.jpg"
]
rightUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_right.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_right.jpg"
]
topUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_top.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_top.jpg"
]
backIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_back.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_back.hdr"
]
bottomIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_bottom.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_bottom.hdr"
]
frontIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_front.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_front.hdr"
]
leftIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_left.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_left.hdr"
]
rightIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_right.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_right.hdr"
]
topIrradianceUrl [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/textures/cubic/mountains_top.hdr"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/cubic/mountains_top.hdr"
]
}
TexturedBackgroundLight {
Expand Down Expand Up @@ -172,7 +172,7 @@ DEF MESH Transform {
}
geometry Mesh {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/meshes/suzanne.obj"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/meshes/suzanne.obj"
]
}
}
Expand All @@ -190,27 +190,27 @@ Robot {
baseColor 0.8039 0.6745 0.5764
baseColorMap DEF IMAGE_TEXTURE ImageTexture {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/appearances/protos/textures/varnished_pine/varnished_pine_base_color.jpg"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/textures/varnished_pine/varnished_pine_base_color.jpg"
]
filtering 5
}
roughnessMap ImageTexture {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/appearances/protos/textures/varnished_pine/varnished_pine_roughness.jpg"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/textures/varnished_pine/varnished_pine_roughness.jpg"
]
filtering 5
}
metalness 0
normalMap ImageTexture {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/appearances/protos/textures/varnished_pine/varnished_pine_normal.jpg"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/textures/varnished_pine/varnished_pine_normal.jpg"
]
filtering 5
}
normalMapFactor 0.5
occlusionMap ImageTexture {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/appearances/protos/textures/varnished_pine/varnished_pine_occlusion.jpg"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/protos/textures/varnished_pine/varnished_pine_occlusion.jpg"
]
filtering 5
}
Expand All @@ -231,7 +231,7 @@ Robot {
RotationalMotor {
name "left wheel motor"
consumptionFactor 70
sound "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/sounds/rotational_motor.wav"
sound "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/sounds/rotational_motor.wav"
}
PositionSensor {
name "left wheel sensor"
Expand Down Expand Up @@ -275,7 +275,7 @@ Robot {
RotationalMotor {
name "right wheel motor"
consumptionFactor 70
sound "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/default/worlds/sounds/rotational_motor.wav"
sound "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/sounds/rotational_motor.wav"
}
PositionSensor {
name "right wheel sensor"
Expand Down Expand Up @@ -380,7 +380,7 @@ Robot {
width 400
height 300
antiAliasing TRUE
noiseMaskUrl "https://raw.githubusercontent.com/cyberbotics/webots/R2021a/projects/samples/devices/worlds/textures/noise_mask.png"
noiseMaskUrl "https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/samples/devices/worlds/textures/noise_mask.png"
}
]
name "MyBot"
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5653,7 +5653,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5650,7 +5650,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5655,7 +5655,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_generic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5650,7 +5650,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5670,7 +5670,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_ja_JP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5650,7 +5650,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/translations/wb_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5650,7 +5650,7 @@ screenshot of the world in .jpg format when the it is saved, shared or exported.
<translation type="unfinished"></translation>
</message>
<message>
<source>Please adapt your project to R2023a following these instructions: https://cyberbotics.com/doc/guide/from-2022a-to-2022b</source>
<source>Please adapt your project to R2023b following these instructions: https://cyberbotics.com/doc/guide/from-2023a-to-2023b</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/ProtoManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default class ProtoManager {
appearance.setAttribute('baseColor', '0.8 0.8 0.8');
const imageTexture = xml.createElement('ImageTexture');
imageTexture.setAttribute('id', getAnId());
imageTexture.setAttribute('url', 'https://raw.githubusercontent.com/cyberbotics/webots/R2022b/projects/default/worlds/textures/grid.png');
imageTexture.setAttribute('url', 'https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/default/worlds/textures/grid.png');
imageTexture.setAttribute('role', 'baseColorMap');
appearance.appendChild(imageTexture);
const textureTransform = xml.createElement('TextureTransform');
Expand Down
2 changes: 1 addition & 1 deletion tests/api/worlds/camera_color.wbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Transform {
appearance PBRAppearance {
baseColorMap ImageTexture {
url [
"https://raw.githubusercontent.com/cyberbotics/webots/R2021a/tests/api/worlds/textures/color_checker_chart.png"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/tests/api/worlds/textures/color_checker_chart.png"
]
}
roughness 1
Expand Down

0 comments on commit 2a3f8c3

Please sign in to comment.