From 6e0304d1c6128072d9c7eeb91e9b3f11b6c686eb Mon Sep 17 00:00:00 2001 From: Olivier Michel Date: Mon, 5 Dec 2022 10:01:01 +0100 Subject: [PATCH 1/3] Removed useless Python installations on macOS (#5616) * Removed useless Python installations on macOS * More simplifications * Use Python 3.11 * Use python 3.11 Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> --- .github/workflows/test_suite_mac.yml | 25 ++++---------------- .github/workflows/test_suite_mac_develop.yml | 25 ++++---------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/.github/workflows/test_suite_mac.yml b/.github/workflows/test_suite_mac.yml index 8fb54a8811b..a59d2161c07 100644 --- a/.github/workflows/test_suite_mac.yml +++ b/.github/workflows/test_suite_mac.yml @@ -42,32 +42,15 @@ jobs: fetch-depth: 15 - name: Install Webots Compilation Dependencies run: | - # swig wget cmake python@3.8 python@3.9 and python@3.10 are already installed - if HOMEBREW_NO_INSTALL_CLEANUP=1 brew install python@3.7; then - echo "Installation of Python3.7 successful" - else - echo "Installation of Python3.7 failed" - fi + # swig wget and cmake are already installed npm install -g appdmg - # install regular Python 3.7 - wget -qq https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg - sudo installer -pkg python-3.7.9-macosx10.9.pkg -target / - # install regular Python 3.8 - wget -qq https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg - sudo installer -pkg python-3.8.10-macos11.pkg -target / - # install regular Python 3.9 - wget -qq https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg - sudo installer -pkg python-3.9.13-macos11.pkg -target / - # install regular Python 3.10 - wget -qq https://www.python.org/ftp/python/3.10.5/python-3.10.5-macos11.pkg - sudo installer -pkg python-3.10.5-macos11.pkg -target / - name: Set Commit SHA in Version if: ${{ github.event_name == 'schedule' }} run: python scripts/packaging/set_commit_and_date_in_version.py $(git log -1 --format='%H') - name: Webots Package Creation run: | export JAVA_HOME="$(/usr/libexec/java_home -v 16)" - export PATH=/Library/Frameworks/Python.framework/Versions/3.10/bin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Library/Frameworks/Python.framework/Versions/3.8/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/usr/local/bin/:$PATH + export PATH=/Library/Frameworks/Python.framework/Versions/3.11/bin:/usr/local/bin/:$PATH make distrib -j4 - name: Prepare Webots Controller Deployment if: ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'deploy libcontroller') }} @@ -107,10 +90,10 @@ jobs: hdiutil mount artifact/webots-*.dmg sudo cp -R /Volumes/Webots/Webots.app /Applications hdiutil unmount /Volumes/Webots - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.11 - name: Test run: export WEBOTS_DISABLE_SAVE_SCREEN_PERSPECTIVE_ON_CLOSE=true diff --git a/.github/workflows/test_suite_mac_develop.yml b/.github/workflows/test_suite_mac_develop.yml index e583c9e5f14..63898bab043 100644 --- a/.github/workflows/test_suite_mac_develop.yml +++ b/.github/workflows/test_suite_mac_develop.yml @@ -38,32 +38,15 @@ jobs: ref: develop - name: Install Webots Compilation Dependencies run: | - # swig wget cmake python@3.8 python@3.9 and python@3.10 are already installed - if HOMEBREW_NO_INSTALL_CLEANUP=1 brew install python@3.7; then - echo "Installation of Python3.7 successful" - else - echo "Installation of Python3.7 failed" - fi + # swig wget and cmake are already installed npm install -g appdmg - # install regular Python 3.7 - wget -qq https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg - sudo installer -pkg python-3.7.9-macosx10.9.pkg -target / - # install regular Python 3.8 - wget -qq https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg - sudo installer -pkg python-3.8.10-macos11.pkg -target / - # install regular Python 3.9 - wget -qq https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg - sudo installer -pkg python-3.9.13-macos11.pkg -target / - # install regular Python 3.10 - wget -qq https://www.python.org/ftp/python/3.10.5/python-3.10.5-macos11.pkg - sudo installer -pkg python-3.10.5-macos11.pkg -target / - name: Set Commit SHA in Version if: ${{ github.event_name == 'schedule' }} run: python scripts/packaging/set_commit_and_date_in_version.py $(git log -1 --format='%H') - name: Webots Package Creation run: | export JAVA_HOME="$(/usr/libexec/java_home -v 16)" - export PATH=/Library/Frameworks/Python.framework/Versions/3.10/bin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Library/Frameworks/Python.framework/Versions/3.8/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/usr/local/bin/:$PATH + export PATH=/Library/Frameworks/Python.framework/Versions/3.11/bin:/usr/local/bin/:$PATH make distrib -j4 - name: Prepare Webots Controller Deployment if: ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'deploy libcontroller') }} @@ -105,10 +88,10 @@ jobs: hdiutil mount artifact/webots-*.dmg sudo cp -R /Volumes/Webots/Webots.app /Applications hdiutil unmount /Volumes/Webots - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.11 - name: Test run: export WEBOTS_DISABLE_SAVE_SCREEN_PERSPECTIVE_ON_CLOSE=true From 7094276d0784e312a743b9b3def359d3076a6166 Mon Sep 17 00:00:00 2001 From: Jean-Eudes-le-retour <62928319+Jean-Eudes-le-retour@users.noreply.github.com> Date: Mon, 5 Dec 2022 15:19:52 +0100 Subject: [PATCH 2/3] Improved the bounding boxes of the nao to make them not collide (#5622) * Improved the bounding boxes of the nao to make them not collide * Forgot to change version * Improved TIBIA, forward now works * Forward walking working * Fixed 21 DOF wrists * Added pull request to changelog * Update changelog-r2023.md Co-authored-by: Olivier Michel --- docs/reference/changelog-r2023.md | 1 + projects/robots/softbank/nao/protos/Nao.proto | 172 ++++++++++++++---- .../softbank/nao/protos/NaoLeftWristH21.proto | 6 +- .../nao/protos/NaoLeftWristH25Realistic.proto | 6 +- .../nao/protos/NaoRightWristH21.proto | 6 +- .../protos/NaoRightWristH25Realistic.proto | 6 +- 6 files changed, 151 insertions(+), 46 deletions(-) diff --git a/docs/reference/changelog-r2023.md b/docs/reference/changelog-r2023.md index a2145ae0429..4a642d616b6 100644 --- a/docs/reference/changelog-r2023.md +++ b/docs/reference/changelog-r2023.md @@ -6,6 +6,7 @@ Released on ?? - Greatly improved the performance of the Python API `Camera.getImage` method ([#5610](https://github.com/cyberbotics/webots/pull/5610)). - Added default [Solid](solid.md).`recognitionColors` value for [animals](../guide/object-animals.md) and [Barn](../guide/object-buildings.md#barn) PROTO models ([#5606](https://github.com/cyberbotics/webots/pull/5606)). - Added `recognitionColors` field to [SolidBox](../guide/object-solids.md#solidbox) and Tractor PROTO models ([#5606](https://github.com/cyberbotics/webots/pull/5606)). + - Improved the bounding objects of the Nao robot PROTO so that `selfCollision` can be activated without any issue ([#5622](https://github.com/cyberbotics/webots/pull/5622)). - Bug Fixes - Fixed Python API `Supervisor.setSimulationMode` which was failing ([#5603](https://github.com/cyberbotics/webots/pull/5603)). - Fixed crash resulting from requesting pose tracking of unsuitable nodes ([5620](https://github.com/cyberbotics/webots/pull/5620)). diff --git a/projects/robots/softbank/nao/protos/Nao.proto b/projects/robots/softbank/nao/protos/Nao.proto index 623d2d6f145..a6a030ba33b 100644 --- a/projects/robots/softbank/nao/protos/Nao.proto +++ b/projects/robots/softbank/nao/protos/Nao.proto @@ -44,7 +44,7 @@ PROTO Nao [ field MFNode leftFootSlot [] # Extends the robot with new nodes in the left foot slot. field MFNode rightFootSlot [] # Extends the robot with new nodes in the right foot slot. field MFNode leftHandSlot [] # Extends the robot with new nodes in the left hand slot. - field MFNode rightHandSlot [] # Extends the robot with new nodes in the righthand slot. + field MFNode rightHandSlot [] # Extends the robot with new nodes in the right hand slot. ] { %< @@ -2108,12 +2108,12 @@ PROTO Nao [ name "RShoulder" contactMaterial IS contactMaterial boundingObject Transform { - translation 0.029 -0.005 0 + translation 0.027 -0.005 0 rotation 0.623805 0.552662 -0.552660 -2.026117 children [ DEF SHOULDER_BO Capsule { - height 0.1 - radius 0.026 + height 0.09 + radius 0.024 } ] } @@ -2648,7 +2648,7 @@ PROTO Nao [ name "LShoulder" contactMaterial IS contactMaterial boundingObject Transform { - translation 0.029 0.005 0 + translation 0.027 0.005 0 rotation 0.623805 -0.552662 0.552660 -2.026117 children [ USE SHOULDER_BO @@ -4148,11 +4148,35 @@ PROTO Nao [ } ] contactMaterial IS footContactMaterial - boundingObject Transform { - translation 0.02 -0.007 -0.025 + boundingObject Group { children [ - DEF FOOT_BO Box { - size 0.148 0.09 0.02 + Transform { + translation 0.015 -0.007 -0.033 + children [ + DEF SOLE Box { + size 0.11 0.085 0.004 + } + ] + } + DEF HEEL Transform { + translation -0.048 0 -0.0245 + rotation 1 0 0 -1.57 + children [ + Capsule { + height 0.03 + radius 0.008 + subdivision 16 + } + ] + } + Transform { + translation 0.065 -0.005 -0.027 + rotation 0 1 0 0 + children [ + DEF TOES Box { + size 0.04 0.085 0.016 + } + ] } ] } @@ -4188,8 +4212,8 @@ PROTO Nao [ } ] contactMaterial IS contactMaterial - boundingObject DEF ANKLE_PITCH_BO Box { - size 0.078 0.027 0.05 + boundingObject DEF ANKLE_PITCH_BO Sphere { + radius 0.005 } physics Physics { density -1 @@ -4223,12 +4247,27 @@ PROTO Nao [ } ] contactMaterial IS contactMaterial - boundingObject DEF TIBIA_BO Transform { - translation 0.01 0 -0.055 - rotation 0 1 0 0.2 + boundingObject Group { children [ - Box { - size 0.06 0.08 0.11 + DEF TIBIA_HIGH Transform { + translation 0.01 0 -0.033 + rotation 0 1 0 0.462 + children [ + Box { + size 0.04 0.08 0.07 + } + ] + } + Transform { + translation 0 -0.003 -0.09 + rotation -1 0 0 -1.57 + children [ + DEF TIBIA_LOW Capsule { + height 0.018 + radius 0.035 + subdivision 16 + } + ] } ] } @@ -4264,12 +4303,29 @@ PROTO Nao [ } ] contactMaterial IS contactMaterial - boundingObject DEF FEMUR_BO Transform { - translation 0 0 -0.055 - rotation 0 1 0 5.9 + boundingObject DEF FEMUR_BO Group { children [ - Box { - size 0.06 0.08 0.13 + Transform { + translation -0.009 0 -0.015 + rotation 0.7745972141192264 -0.44721312362157567 0.44721312362157567 1.82348 + children [ + Capsule { + height 0.01 + radius 0.03 + subdivision 16 + } + ] + } + Transform { + translation 0.008 0 -0.0662612 + rotation 0 1 0 5.9 + children [ + Cylinder { + height 0.1 + radius 0.035 + subdivision 16 + } + ] } ] } @@ -4305,11 +4361,23 @@ PROTO Nao [ } ] contactMaterial IS contactMaterial - boundingObject DEF HIP_ROLL_BO Transform { - translation -0.022 0 0 + boundingObject DEF HIP_ROLL_BO Group { children [ - Box { - size 0.08 0.05 0.05 + Transform { + translation -0.017 0 0.004 + children [ + Box { + size 0.025 0.025 0.074 + } + ] + } + Transform { + translation -0.018 0 0 + children [ + Box { + size 0.08 0.025 0.025 + } + ] } ] } @@ -5599,10 +5667,22 @@ PROTO Nao [ } ] contactMaterial IS footContactMaterial - boundingObject Transform { - translation 0.02 0.007 -0.025 + boundingObject Group { children [ - USE FOOT_BO + Transform { + translation 0.015 0.007 -0.033 + children [ + USE SOLE + ] + } + USE HEEL + Transform { + translation 0.065 0.005 -0.027 + rotation 0 1 0 0 + children [ + USE TOES + ] + } ] } physics Physics { @@ -5670,7 +5750,18 @@ PROTO Nao [ } ] contactMaterial IS contactMaterial - boundingObject USE TIBIA_BO + boundingObject Group { + children [ + USE TIBIA_HIGH + Transform { + translation 0 0.003 -0.09 + rotation -1 0 0 -1.57 + children [ + USE TIBIA_LOW + ] + } + ] + } physics Physics { density -1 %< if (version === 3.3) { >% @@ -5820,12 +5911,25 @@ PROTO Nao [ ] } ] - boundingObject Transform { - translation 0 0 0.02 + boundingObject Group { children [ - Capsule { - height 0.11 - radius 0.055 + Transform { + translation 0 0 -0.02 + children [ + Sphere { + radius 0.037 + } + ] + } + Transform { + translation 0 0 0.055 + children [ + Capsule { + height 0.03 + radius 0.055 + subdivision 16 + } + ] } ] } diff --git a/projects/robots/softbank/nao/protos/NaoLeftWristH21.proto b/projects/robots/softbank/nao/protos/NaoLeftWristH21.proto index 88ff3603644..114234ec014 100644 --- a/projects/robots/softbank/nao/protos/NaoLeftWristH21.proto +++ b/projects/robots/softbank/nao/protos/NaoLeftWristH21.proto @@ -592,12 +592,12 @@ Solid { boundingObject Group { children [ Transform { - translation 0.03 0.003 0.005 + translation 0.05 -0.001 0 rotation -0.527663 0.600656 -0.600654 2.170531 children [ - DEF WHIRST_BO Capsule { + DEF WRIST_BO Capsule { height 0.025 - radius 0.022 + radius 0.021 } ] } diff --git a/projects/robots/softbank/nao/protos/NaoLeftWristH25Realistic.proto b/projects/robots/softbank/nao/protos/NaoLeftWristH25Realistic.proto index 5370b83f793..9cab4187452 100644 --- a/projects/robots/softbank/nao/protos/NaoLeftWristH25Realistic.proto +++ b/projects/robots/softbank/nao/protos/NaoLeftWristH25Realistic.proto @@ -828,11 +828,11 @@ Solid { model "Nao left wrist H25" contactMaterial IS contactMaterial boundingObject Transform { - translation 0.03 0.003 0.005 + translation 0.045 0.001 0 rotation -0.527663 0.600656 -0.600654 2.170531 children [ - DEF WHIRST_BO Capsule { - height 0.025 + DEF WRIST_BO Capsule { + height 0.02 radius 0.022 } ] diff --git a/projects/robots/softbank/nao/protos/NaoRightWristH21.proto b/projects/robots/softbank/nao/protos/NaoRightWristH21.proto index 5e499090d3f..17d9ca8310c 100644 --- a/projects/robots/softbank/nao/protos/NaoRightWristH21.proto +++ b/projects/robots/softbank/nao/protos/NaoRightWristH21.proto @@ -602,12 +602,12 @@ Solid { boundingObject Group { children [ Transform { - translation 0.03 -0.003 0.005 + translation 0.05 0.001 0 rotation -0.527663 -0.600656 0.600654 2.170531 children [ - DEF WHIRST_BO Capsule { + DEF WRIST_BO Capsule { height 0.025 - radius 0.022 + radius 0.021 } ] } diff --git a/projects/robots/softbank/nao/protos/NaoRightWristH25Realistic.proto b/projects/robots/softbank/nao/protos/NaoRightWristH25Realistic.proto index 9bbf736fd9d..c223eb66075 100644 --- a/projects/robots/softbank/nao/protos/NaoRightWristH25Realistic.proto +++ b/projects/robots/softbank/nao/protos/NaoRightWristH25Realistic.proto @@ -838,11 +838,11 @@ Solid { model "Nao right wrist H25" contactMaterial IS contactMaterial boundingObject Transform { - translation 0.03 -0.003 0.005 + translation 0.045 -0.001 0 rotation -0.527663 -0.600656 0.600654 2.170531 children [ - DEF WHIRST_BO Capsule { - height 0.025 + DEF WRIST_BO Capsule { + height 0.02 radius 0.022 } ] From d02be09b76f545d0bda919b471349af03a04159e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20D=C3=A9l=C3=A8ze?= Date: Tue, 6 Dec 2022 12:01:12 +0100 Subject: [PATCH 3/3] Cleanup webotsJs import (#5632) --- resources/web/wwi/nodes/WbAppearance.js | 2 +- resources/web/wwi/nodes/WbBackground.js | 2 +- resources/web/wwi/nodes/WbGeometry.js | 8 ++++---- resources/web/wwi/nodes/WbPbrAppearance.js | 2 +- resources/web/wwi/nodes/WbPointSet.js | 2 +- resources/web/wwi/nodes/WbScene.js | 4 ++-- resources/web/wwi/nodes/WbShape.js | 2 +- resources/web/wwi/nodes/WbTriangleMeshGeometry.js | 4 ++-- resources/web/wwi/nodes/WbViewpoint.js | 8 ++++---- resources/web/wwi/wren/WbWrenBloom.js | 2 +- resources/web/wwi/wren/WbWrenGtao.js | 2 +- resources/web/wwi/wren/WbWrenHdr.js | 2 +- resources/web/wwi/wren/WbWrenPicker.js | 4 ++-- resources/web/wwi/wren/WbWrenPostProcessingEffects.js | 2 +- resources/web/wwi/wren/WbWrenShaders.js | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/resources/web/wwi/nodes/WbAppearance.js b/resources/web/wwi/nodes/WbAppearance.js index 6002e50e354..f5ad2e0b6bf 100644 --- a/resources/web/wwi/nodes/WbAppearance.js +++ b/resources/web/wwi/nodes/WbAppearance.js @@ -1,6 +1,6 @@ import WbAbstractAppearance from './WbAbstractAppearance.js'; import WbWorld from './WbWorld.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; import {getAnId} from './utils/utils.js'; export default class WbAppearance extends WbAbstractAppearance { diff --git a/resources/web/wwi/nodes/WbBackground.js b/resources/web/wwi/nodes/WbBackground.js index cfa84c22887..14dce5a73fe 100644 --- a/resources/web/wwi/nodes/WbBackground.js +++ b/resources/web/wwi/nodes/WbBackground.js @@ -3,7 +3,7 @@ import WbBaseNode from './WbBaseNode.js'; import WbPbrAppearance from './WbPbrAppearance.js'; import WbVector3 from './utils/WbVector3.js'; import WbWorld from './WbWorld.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; export default class WbBackground extends WbBaseNode { #cubeArray; diff --git a/resources/web/wwi/nodes/WbGeometry.js b/resources/web/wwi/nodes/WbGeometry.js index 8350a28cf66..a765b8096c9 100644 --- a/resources/web/wwi/nodes/WbGeometry.js +++ b/resources/web/wwi/nodes/WbGeometry.js @@ -2,10 +2,10 @@ import WbBaseNode from './WbBaseNode.js'; import WbWorld from './WbWorld.js'; import {isDescendantOfBillboard} from './utils/utils.js'; import WbWrenMeshBuffers from './utils/WbWrenMeshBuffers.js'; -import WbWrenPicker from './../wren/WbWrenPicker.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; -import WbWrenRenderingContext from './../wren/WbWrenRenderingContext.js'; -import Selector from './../Selector.js'; +import WbWrenPicker from '../wren/WbWrenPicker.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; +import WbWrenRenderingContext from '../wren/WbWrenRenderingContext.js'; +import Selector from '../Selector.js'; export default class WbGeometry extends WbBaseNode { #wrenScaleTransform; diff --git a/resources/web/wwi/nodes/WbPbrAppearance.js b/resources/web/wwi/nodes/WbPbrAppearance.js index c69cb3f7486..affe9be7381 100644 --- a/resources/web/wwi/nodes/WbPbrAppearance.js +++ b/resources/web/wwi/nodes/WbPbrAppearance.js @@ -4,7 +4,7 @@ import WbAbstractAppearance from './WbAbstractAppearance.js'; import WbBackground from './WbBackground.js'; import WbVector3 from './utils/WbVector3.js'; import WbWorld from './WbWorld.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; import {getAnId} from './utils/utils.js'; export default class WbPbrAppearance extends WbAbstractAppearance { diff --git a/resources/web/wwi/nodes/WbPointSet.js b/resources/web/wwi/nodes/WbPointSet.js index 7afa849704f..1d0098ae1d5 100644 --- a/resources/web/wwi/nodes/WbPointSet.js +++ b/resources/web/wwi/nodes/WbPointSet.js @@ -1,6 +1,6 @@ import {arrayXPointerFloat} from './utils/utils.js'; import WbGeometry from './WbGeometry.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; export default class WbPointSet extends WbGeometry { constructor(id, coord, color) { diff --git a/resources/web/wwi/nodes/WbScene.js b/resources/web/wwi/nodes/WbScene.js index 4fdd5e121e3..f575cf2647e 100644 --- a/resources/web/wwi/nodes/WbScene.js +++ b/resources/web/wwi/nodes/WbScene.js @@ -1,7 +1,7 @@ import {GtaoLevel} from './wb_preferences.js'; import WbWorld from './WbWorld.js'; -import WbWrenPostProcessingEffects from './../wren/WbWrenPostProcessingEffects.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenPostProcessingEffects from '../wren/WbWrenPostProcessingEffects.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; export default class WbScene { #wrenDepthFrameBufferTexture; diff --git a/resources/web/wwi/nodes/WbShape.js b/resources/web/wwi/nodes/WbShape.js index e4e4f83f179..952c256c809 100644 --- a/resources/web/wwi/nodes/WbShape.js +++ b/resources/web/wwi/nodes/WbShape.js @@ -3,7 +3,7 @@ import WbBaseNode from './WbBaseNode.js'; import WbPbrAppearance from './WbPbrAppearance.js'; import WbPointSet from './WbPointSet.js'; import WbWorld from './WbWorld.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; import {getAnId} from './utils/utils.js'; export default class WbShape extends WbBaseNode { diff --git a/resources/web/wwi/nodes/WbTriangleMeshGeometry.js b/resources/web/wwi/nodes/WbTriangleMeshGeometry.js index fe4a736897c..8dece07039f 100644 --- a/resources/web/wwi/nodes/WbTriangleMeshGeometry.js +++ b/resources/web/wwi/nodes/WbTriangleMeshGeometry.js @@ -3,8 +3,8 @@ import WbGeometry from './WbGeometry.js'; import WbMatrix4 from './utils/WbMatrix4.js'; import WbTriangleMesh from './utils/WbTriangleMesh.js'; import WbWrenMeshBuffers from './utils/WbWrenMeshBuffers.js'; -import WbWrenRenderingContext from './../wren/WbWrenRenderingContext.js'; -import WbWrenShaders from './../wren/WbWrenShaders.js'; +import WbWrenRenderingContext from '../wren/WbWrenRenderingContext.js'; +import WbWrenShaders from '../wren/WbWrenShaders.js'; export default class WbTriangleMeshGeometry extends WbGeometry { #normalsMaterial; diff --git a/resources/web/wwi/nodes/WbViewpoint.js b/resources/web/wwi/nodes/WbViewpoint.js index 0054eb095e9..d01f8978859 100644 --- a/resources/web/wwi/nodes/WbViewpoint.js +++ b/resources/web/wwi/nodes/WbViewpoint.js @@ -7,10 +7,10 @@ import WbMatrix4 from './utils/WbMatrix4.js'; import WbVector3 from './utils/WbVector3.js'; import WbVector4 from './utils/WbVector4.js'; import WbWorld from './WbWorld.js'; -import WbWrenHdr from './../wren/WbWrenHdr.js'; -import WbWrenGtao from './../wren/WbWrenGtao.js'; -import WbWrenBloom from './../wren/WbWrenBloom.js'; -import WbWrenSmaa from './../wren/WbWrenSmaa.js'; +import WbWrenHdr from '../wren/WbWrenHdr.js'; +import WbWrenGtao from '../wren/WbWrenGtao.js'; +import WbWrenBloom from '../wren/WbWrenBloom.js'; +import WbWrenSmaa from '../wren/WbWrenSmaa.js'; import {webots} from '../webots.js'; export default class WbViewpoint extends WbBaseNode { diff --git a/resources/web/wwi/wren/WbWrenBloom.js b/resources/web/wwi/wren/WbWrenBloom.js index d054eb81135..e57e0c5ad58 100644 --- a/resources/web/wwi/wren/WbWrenBloom.js +++ b/resources/web/wwi/wren/WbWrenBloom.js @@ -1,4 +1,4 @@ -import {pointerOnFloat} from './../nodes/utils/utils.js'; +import {pointerOnFloat} from '../nodes/utils/utils.js'; import WbWrenAbstractPostProcessingEffect from './WbWrenAbstractPostProcessingEffect.js'; import WbWrenPostProcessingEffects from './WbWrenPostProcessingEffects.js'; diff --git a/resources/web/wwi/wren/WbWrenGtao.js b/resources/web/wwi/wren/WbWrenGtao.js index c30ca039a42..cb7f2bd49e7 100644 --- a/resources/web/wwi/wren/WbWrenGtao.js +++ b/resources/web/wwi/wren/WbWrenGtao.js @@ -1,4 +1,4 @@ -import {arrayXPointerFloat, pointerOnFloat} from './../nodes/utils/utils.js'; +import {arrayXPointerFloat, pointerOnFloat} from '../nodes/utils/utils.js'; import WbWrenAbstractPostProcessingEffect from './WbWrenAbstractPostProcessingEffect.js'; import WbWrenPostProcessingEffects from './WbWrenPostProcessingEffects.js'; diff --git a/resources/web/wwi/wren/WbWrenHdr.js b/resources/web/wwi/wren/WbWrenHdr.js index 54e6864fbb3..a7ed3314f2c 100644 --- a/resources/web/wwi/wren/WbWrenHdr.js +++ b/resources/web/wwi/wren/WbWrenHdr.js @@ -1,4 +1,4 @@ -import {pointerOnFloat} from './../nodes/utils/utils.js'; +import {pointerOnFloat} from '../nodes/utils/utils.js'; import WbWrenAbstractPostProcessingEffect from './WbWrenAbstractPostProcessingEffect.js'; import WbWrenRenderingContext from './WbWrenRenderingContext.js'; import WbWrenShaders from './WbWrenShaders.js'; diff --git a/resources/web/wwi/wren/WbWrenPicker.js b/resources/web/wwi/wren/WbWrenPicker.js index 58c332de352..97b07c56db3 100644 --- a/resources/web/wwi/wren/WbWrenPicker.js +++ b/resources/web/wwi/wren/WbWrenPicker.js @@ -1,5 +1,5 @@ -import {arrayXPointerInt, arrayXPointerFloat} from './../nodes/utils/utils.js'; -import WbVector3 from './../nodes/utils/WbVector3.js'; +import {arrayXPointerInt, arrayXPointerFloat} from '../nodes/utils/utils.js'; +import WbVector3 from '../nodes/utils/WbVector3.js'; import WbWrenShaders from './WbWrenShaders.js'; export default class WbWrenPicker { diff --git a/resources/web/wwi/wren/WbWrenPostProcessingEffects.js b/resources/web/wwi/wren/WbWrenPostProcessingEffects.js index 163cb60fe7b..17eb5f39482 100644 --- a/resources/web/wwi/wren/WbWrenPostProcessingEffects.js +++ b/resources/web/wwi/wren/WbWrenPostProcessingEffects.js @@ -1,4 +1,4 @@ -import {arrayXPointer} from './../nodes/utils/utils.js'; +import {arrayXPointer} from '../nodes/utils/utils.js'; import WbWrenShaders from './WbWrenShaders.js'; import WbWrenRenderingContext from './WbWrenRenderingContext.js'; diff --git a/resources/web/wwi/wren/WbWrenShaders.js b/resources/web/wwi/wren/WbWrenShaders.js index 21dab7abbef..20aac853e3b 100644 --- a/resources/web/wwi/wren/WbWrenShaders.js +++ b/resources/web/wwi/wren/WbWrenShaders.js @@ -1,4 +1,4 @@ -import {arrayXPointer} from './../nodes/utils/utils.js'; +import {arrayXPointer} from '../nodes/utils/utils.js'; export default class WbWrenShaders { static buildShader(shader, vertexShaderPath, fragmentShaderpath) {