diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js index 28eb715195..807ea149c4 100644 --- a/src/ol/render/canvas/ImageReplay.js +++ b/src/ol/render/canvas/ImageReplay.js @@ -1,8 +1,8 @@ /** * @module ol/render/canvas/ImageReplay */ -import CanvasInstruction from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasImageReplay extends CanvasReplay { /** diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js index 9470b17c50..57822418ae 100644 --- a/src/ol/render/canvas/LineStringReplay.js +++ b/src/ol/render/canvas/LineStringReplay.js @@ -1,8 +1,8 @@ /** * @module ol/render/canvas/LineStringReplay */ -import CanvasInstruction, {strokeInstruction, beginPathInstruction} from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasLineStringReplay extends CanvasReplay { /** diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js index 1d75374de5..1175a58fde 100644 --- a/src/ol/render/canvas/PolygonReplay.js +++ b/src/ol/render/canvas/PolygonReplay.js @@ -6,8 +6,8 @@ import {snap} from '../../geom/flat/simplify.js'; import {defaultFillStyle} from '../canvas.js'; import CanvasInstruction, { fillInstruction, strokeInstruction, beginPathInstruction, closePathInstruction -} from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +} from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasPolygonReplay extends CanvasReplay { diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index 23fedc1cb8..079f60575a 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -18,7 +18,7 @@ import VectorContext from '../VectorContext.js'; import {drawImage, resetTransform, defaultPadding, defaultFillStyle, defaultStrokeStyle, defaultMiterLimit, defaultLineWidth, defaultLineJoin, defaultLineDashOffset, defaultLineDash, defaultLineCap} from '../canvas.js'; -import CanvasInstruction from '../canvas/Instruction.js'; +import CanvasInstruction from './Instruction.js'; import {TEXT_ALIGN} from '../replay.js'; import { create as createTransform, diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index ed1dda0060..5d055a7cdf 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -9,11 +9,11 @@ import {transform2D} from '../../geom/flat/transform.js'; import {isEmpty} from '../../obj.js'; import ReplayGroup from '../ReplayGroup.js'; import ReplayType from '../ReplayType.js'; -import CanvasReplay from '../canvas/Replay.js'; -import CanvasImageReplay from '../canvas/ImageReplay.js'; -import CanvasLineStringReplay from '../canvas/LineStringReplay.js'; -import CanvasPolygonReplay from '../canvas/PolygonReplay.js'; -import CanvasTextReplay from '../canvas/TextReplay.js'; +import CanvasReplay from './Replay.js'; +import CanvasImageReplay from './ImageReplay.js'; +import CanvasLineStringReplay from './LineStringReplay.js'; +import CanvasPolygonReplay from './PolygonReplay.js'; +import CanvasTextReplay from './TextReplay.js'; import {ORDER} from '../replay.js'; import {create as createTransform, compose as composeTransform} from '../../transform.js'; diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index e9cf45e306..e740f4a122 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -9,8 +9,8 @@ import {matchingChunk} from '../../geom/flat/straightchunk.js'; import GeometryType from '../../geom/GeometryType.js'; import {CANVAS_LINE_DASH} from '../../has.js'; import {labelCache, measureTextWidth, defaultTextAlign, measureTextHeight, defaultPadding, defaultLineCap, defaultLineDashOffset, defaultLineDash, defaultLineJoin, defaultFillStyle, checkFont, defaultFont, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline} from '../canvas.js'; -import CanvasInstruction from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction from './Instruction.js'; +import CanvasReplay from './Replay.js'; import {TEXT_ALIGN} from '../replay.js'; import TextPlacement from '../../style/TextPlacement.js'; diff --git a/src/ol/render/replay.js b/src/ol/render/replay.js index b761c58293..fbb15a69fb 100644 --- a/src/ol/render/replay.js +++ b/src/ol/render/replay.js @@ -1,7 +1,7 @@ /** * @module ol/render/replay */ -import ReplayType from '../render/ReplayType.js'; +import ReplayType from './ReplayType.js'; /** diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js index 65af1041dd..e5251464f2 100644 --- a/src/ol/render/webgl/CircleReplay.js +++ b/src/ol/render/webgl/CircleReplay.js @@ -7,9 +7,9 @@ import {asArray} from '../../color.js'; import {intersects} from '../../extent.js'; import {isEmpty} from '../../obj.js'; import {translate} from '../../geom/flat/transform.js'; -import {fragment, vertex} from '../webgl/circlereplay/defaultshader.js'; -import Locations from '../webgl/circlereplay/defaultshader/Locations.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './circlereplay/defaultshader.js'; +import Locations from './circlereplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; import {DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_STROKESTYLE, DEFAULT_FILLSTYLE, DEFAULT_LINEWIDTH} from '../webgl.js'; import {FLOAT} from '../../webgl.js'; diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js index ad763dea23..23e966d480 100644 --- a/src/ol/render/webgl/ImageReplay.js +++ b/src/ol/render/webgl/ImageReplay.js @@ -2,7 +2,7 @@ * @module ol/render/webgl/ImageReplay */ import {getUid} from '../../util.js'; -import WebGLTextureReplay from '../webgl/TextureReplay.js'; +import WebGLTextureReplay from './TextureReplay.js'; import WebGLBuffer from '../../webgl/Buffer.js'; class WebGLImageReplay extends WebGLTextureReplay { diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index 05ddd8c26a..407cb843a7 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -6,7 +6,7 @@ import {intersects} from '../../extent.js'; import GeometryType from '../../geom/GeometryType.js'; import ReplayType from '../ReplayType.js'; import VectorContext from '../VectorContext.js'; -import WebGLReplayGroup from '../webgl/ReplayGroup.js'; +import WebGLReplayGroup from './ReplayGroup.js'; class WebGLImmediateRenderer extends VectorContext { /** diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js index 15aa0a34ac..90c679f9e7 100644 --- a/src/ol/render/webgl/LineStringReplay.js +++ b/src/ol/render/webgl/LineStringReplay.js @@ -12,9 +12,9 @@ import {isEmpty} from '../../obj.js'; import {DEFAULT_LINECAP, DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_LINEJOIN, DEFAULT_LINEWIDTH, DEFAULT_MITERLIMIT, DEFAULT_STROKESTYLE, triangleIsCounterClockwise} from '../webgl.js'; -import WebGLReplay from '../webgl/Replay.js'; -import {fragment, vertex} from '../webgl/linestringreplay/defaultshader.js'; -import Locations from '../webgl/linestringreplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; +import {fragment, vertex} from './linestringreplay/defaultshader.js'; +import Locations from './linestringreplay/defaultshader/Locations.js'; import {FLOAT} from '../../webgl.js'; import WebGLBuffer from '../../webgl/Buffer.js'; diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js index 5418b66edd..d72cfbe5ce 100644 --- a/src/ol/render/webgl/PolygonReplay.js +++ b/src/ol/render/webgl/PolygonReplay.js @@ -9,10 +9,10 @@ import {isEmpty} from '../../obj.js'; import {linearRingContainsXY} from '../../geom/flat/contains.js'; import {linearRingIsClockwise} from '../../geom/flat/orient.js'; import {translate} from '../../geom/flat/transform.js'; -import {fragment, vertex} from '../webgl/polygonreplay/defaultshader.js'; -import Locations from '../webgl/polygonreplay/defaultshader/Locations.js'; -import WebGLLineStringReplay from '../webgl/LineStringReplay.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './polygonreplay/defaultshader.js'; +import Locations from './polygonreplay/defaultshader/Locations.js'; +import WebGLLineStringReplay from './LineStringReplay.js'; +import WebGLReplay from './Replay.js'; import {triangleIsCounterClockwise, EPSILON, DEFAULT_FILLSTYLE} from '../webgl.js'; import Stroke from '../../style/Stroke.js'; import LinkedList from '../../structs/LinkedList.js'; diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index 07528d59f9..16fa92713e 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -7,11 +7,11 @@ import {buffer, createOrUpdateFromCoordinate} from '../../extent.js'; import {isEmpty} from '../../obj.js'; import {ORDER} from '../replay.js'; import ReplayGroup from '../ReplayGroup.js'; -import WebGLCircleReplay from '../webgl/CircleReplay.js'; -import WebGLImageReplay from '../webgl/ImageReplay.js'; -import WebGLLineStringReplay from '../webgl/LineStringReplay.js'; -import WebGLPolygonReplay from '../webgl/PolygonReplay.js'; -import WebGLTextReplay from '../webgl/TextReplay.js'; +import WebGLCircleReplay from './CircleReplay.js'; +import WebGLImageReplay from './ImageReplay.js'; +import WebGLLineStringReplay from './LineStringReplay.js'; +import WebGLPolygonReplay from './PolygonReplay.js'; +import WebGLTextReplay from './TextReplay.js'; /** * @type {Array} diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index 9917cfefd0..8b2e195118 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -10,7 +10,7 @@ import {TEXT_ALIGN} from '../replay.js'; import {DEFAULT_FILLSTYLE, DEFAULT_FONT, DEFAULT_LINECAP, DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_LINEJOIN, DEFAULT_LINEWIDTH, DEFAULT_MITERLIMIT, DEFAULT_STROKESTYLE, DEFAULT_TEXTALIGN, DEFAULT_TEXTBASELINE} from '../webgl.js'; -import WebGLTextureReplay from '../webgl/TextureReplay.js'; +import WebGLTextureReplay from './TextureReplay.js'; import AtlasManager from '../../style/AtlasManager.js'; import WebGLBuffer from '../../webgl/Buffer.js'; diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index 0e1f023716..3056c93ff3 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -4,9 +4,9 @@ import {abstract, getUid} from '../../util.js'; import {intersects} from '../../extent.js'; import {isEmpty} from '../../obj.js'; -import {fragment, vertex} from '../webgl/texturereplay/defaultshader.js'; -import Locations from '../webgl/texturereplay/defaultshader/Locations.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './texturereplay/defaultshader.js'; +import Locations from './texturereplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; import {CLAMP_TO_EDGE, FLOAT, TEXTURE_2D} from '../../webgl.js'; import {createTexture} from '../../webgl/Context.js';