From a7adce6e0005ab392b7f674900a961f39fac05bd Mon Sep 17 00:00:00 2001 From: Darko Lukic Date: Thu, 30 Jan 2025 14:15:53 +0100 Subject: [PATCH] Fix reference s in the URL sample --- .../samples/howto/url/controllers/url/url.c | 2 +- projects/samples/howto/url/worlds/url.wbt | 46 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/projects/samples/howto/url/controllers/url/url.c b/projects/samples/howto/url/controllers/url/url.c index c1c7ca4a01e..a7635f70b01 100644 --- a/projects/samples/howto/url/controllers/url/url.c +++ b/projects/samples/howto/url/controllers/url/url.c @@ -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/R2025a/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"); } diff --git a/projects/samples/howto/url/worlds/url.wbt b/projects/samples/howto/url/worlds/url.wbt index 6824703be7d..a32d3ae866c 100644 --- a/projects/samples/howto/url/worlds/url.wbt +++ b/projects/samples/howto/url/worlds/url.wbt @@ -11,9 +11,9 @@ WorldInfo { title "Assets Download" contactProperties [ ContactProperties { - bumpSound "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/sounds/bump.wav" - rollSound "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/sounds/roll.wav" - slideSound "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/sounds/slide.wav" + bumpSound "webots://projects/default/worlds/sounds/bump.wav" + rollSound "webots://projects/default/worlds/sounds/roll.wav" + slideSound "webots://projects/default/worlds/sounds/slide.wav" } ] } @@ -23,40 +23,40 @@ Viewpoint { } Background { backUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_back.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_back.jpg" ] bottomUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_bottom.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_bottom.jpg" ] frontUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_front.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_front.jpg" ] leftUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_left.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_left.jpg" ] rightUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_right.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_right.jpg" ] topUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_top.jpg" + "webots://projects/default/worlds/textures/cubic/mountains_top.jpg" ] backIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_back.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_back.hdr" ] bottomIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_bottom.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_bottom.hdr" ] frontIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_front.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_front.hdr" ] leftIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_left.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_left.hdr" ] rightIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_right.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_right.hdr" ] topIrradianceUrl [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/textures/cubic/mountains_top.hdr" + "webots://projects/default/worlds/textures/cubic/mountains_top.hdr" ] } TexturedBackgroundLight { @@ -172,7 +172,7 @@ DEF MESH Transform { } geometry Mesh { url [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/meshes/suzanne.obj" + "webots://projects/default/worlds/meshes/suzanne.obj" ] } } @@ -190,27 +190,27 @@ Robot { baseColor 0.8039 0.6745 0.5764 baseColorMap DEF IMAGE_TEXTURE ImageTexture { url [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/appearances/protos/textures/varnished_pine/varnished_pine_base_color.jpg" + "webots://projects/appearances/protos/textures/varnished_pine/varnished_pine_base_color.jpg" ] filtering 5 } roughnessMap ImageTexture { url [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/appearances/protos/textures/varnished_pine/varnished_pine_roughness.jpg" + "webots://projects/appearances/protos/textures/varnished_pine/varnished_pine_roughness.jpg" ] filtering 5 } metalness 0 normalMap ImageTexture { url [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/appearances/protos/textures/varnished_pine/varnished_pine_normal.jpg" + "webots://projects/appearances/protos/textures/varnished_pine/varnished_pine_normal.jpg" ] filtering 5 } normalMapFactor 0.5 occlusionMap ImageTexture { url [ - "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/appearances/protos/textures/varnished_pine/varnished_pine_occlusion.jpg" + "webots://projects/appearances/protos/textures/varnished_pine/varnished_pine_occlusion.jpg" ] filtering 5 } @@ -231,7 +231,7 @@ Robot { RotationalMotor { name "left wheel motor" consumptionFactor 70 - sound "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/sounds/rotational_motor.wav" + sound "webots://projects/default/worlds/sounds/rotational_motor.wav" } PositionSensor { name "left wheel sensor" @@ -275,7 +275,7 @@ Robot { RotationalMotor { name "right wheel motor" consumptionFactor 70 - sound "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/default/worlds/sounds/rotational_motor.wav" + sound "webots://projects/default/worlds/sounds/rotational_motor.wav" } PositionSensor { name "right wheel sensor" @@ -380,7 +380,7 @@ Robot { width 400 height 300 antiAliasing TRUE - noiseMaskUrl "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/samples/devices/worlds/textures/noise_mask.png" + noiseMaskUrl "webots://projects/samples/devices/worlds/textures/noise_mask.png" } ] name "MyBot"