Merge pull request #6712 from cyberbotics/sync-master-7c87f0e29

Merge master into develop
cyberbotics · Nov 30, 2024 · 3d91d06 · 3d91d06
2 parents 02784bb + 40894f3
commit 3d91d06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/docs/reference/changelog-r2024.md b/docs/reference/changelog-r2024.md
@@ -43,6 +43,7 @@ Released on December **th, 2023.
     - Fixed error on macos when when putting displays and cameras in separate windows ([#6635](https://github.com/cyberbotics/webots/pull/6635)).
     - Fixed crash when `wb_supervisor_field_get_name` was called with NULL ([#6647](https://github.com/cyberbotics/webots/pull/6647)).
     - Fixed bug where the wrong y coordinate was used for one corner of the box drawn to represent a box-plane collision ([#6677](https://github.com/cyberbotics/webots/pull/6677)).
+    - Fixed bug where the rotation axis of the omni wheel rollers were incorrect ([6710](https://github.com/cyberbotics/webots/pull/6710)).
     - Fixed a bug where Webots would crash if a geometry was inserted into a `Shape` node used a bounding box ([#6691](https://github.com/cyberbotics/webots/pull/6691)).
     - Removed the old `wb_supervisor_field_import_sf_node` and `wb_supervisor_field_import_mf_node` functions from the list of editor autocomplete suggestions ([#6701](https://github.com/cyberbotics/webots/pull/6701)).
     - Fixed handling of remote assets from unofficial sources ([#6585](https://github.com/cyberbotics/webots/pull/6585)).

diff --git a/projects/samples/howto/omni_wheels/worlds/omni_wheels.wbt b/projects/samples/howto/omni_wheels/worlds/omni_wheels.wbt
@@ -43,6 +43,7 @@ DEF OMNI_WHEELS Robot {
             children [
               DEF sr1 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 0.05
                 }
                 endPoint Solid {
@@ -100,6 +101,7 @@ DEF OMNI_WHEELS Robot {
               }
               DEF sr3 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 -0.05
                 }
                 endPoint Solid {
@@ -306,6 +308,7 @@ DEF OMNI_WHEELS Robot {
             children [
               DEF sr1 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 0.05
                 }
                 endPoint Solid {
@@ -343,6 +346,7 @@ DEF OMNI_WHEELS Robot {
               }
               DEF sr3 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 -0.05
                 }
                 endPoint Solid {
@@ -502,6 +506,7 @@ DEF OMNI_WHEELS Robot {
             children [
               DEF sr1 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 0.05
                 }
                 endPoint Solid {
@@ -539,6 +544,7 @@ DEF OMNI_WHEELS Robot {
               }
               DEF sr3 HingeJoint {
                 jointParameters HingeJointParameters {
+                  axis 0 1 0
                   anchor -0.02 0 -0.05
                 }
                 endPoint Solid {