Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix references in the URL sample #6764

Merged
merged 4 commits into from
Jan 31, 2025
Merged

Fix references in the URL sample #6764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7adce6
Fix reference s in the URL sample
lukicdarkoo Jan 30, 2025
ecf3004
revert
lukicdarkoo Jan 30, 2025
55539e8
fix
lukicdarkoo Jan 30, 2025
ce1d49b
date
lukicdarkoo Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/samples/howto/url/controllers/url/url.c
View file
Open in desktop
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/R2025a/projects/appearances/"
"https://raw.githubusercontent.com/cyberbotics/webots/R2023b/projects/appearances/"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@omichel I don't how else to fix this. We have a circular dependency here (it requires tag, but the tag requires this to pass)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably merge this PR even if the tests fail. I can do this as admin.

"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
View file
Open in desktop
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/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"
}
]
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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"
]
}
}
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/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
}
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading