Skip to content

Commit

Permalink
Cleanup webotsJs import (#5632)
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Délèze authored Dec 6, 2022
1 parent 6e0304d commit d02be09
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion resources/web/wwi/nodes/WbAppearance.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/nodes/WbBackground.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions resources/web/wwi/nodes/WbGeometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/nodes/WbPbrAppearance.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/nodes/WbPointSet.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions resources/web/wwi/nodes/WbScene.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/nodes/WbShape.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions resources/web/wwi/nodes/WbTriangleMeshGeometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions resources/web/wwi/nodes/WbViewpoint.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/wren/WbWrenBloom.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/wren/WbWrenGtao.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/wren/WbWrenHdr.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions resources/web/wwi/wren/WbWrenPicker.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/wren/WbWrenPostProcessingEffects.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion resources/web/wwi/wren/WbWrenShaders.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down

0 comments on commit d02be09

Please sign in to comment.