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] 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) {