ol 9.2.5-dev.1720344310382 → 9.2.5-dev.1720352555096
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Map.d.ts +2 -1
- package/Map.d.ts.map +1 -1
- package/Map.js +1 -0
- package/MapBrowserEvent.d.ts +4 -2
- package/MapBrowserEvent.d.ts.map +1 -1
- package/MapBrowserEvent.js +2 -0
- package/MapBrowserEventHandler.d.ts +4 -1
- package/MapBrowserEventHandler.d.ts.map +1 -1
- package/MapBrowserEventHandler.js +3 -0
- package/Tile.d.ts +4 -4
- package/Tile.d.ts.map +1 -1
- package/Tile.js +2 -0
- package/control/Rotate.d.ts +4 -1
- package/control/Rotate.d.ts.map +1 -1
- package/control/Rotate.js +3 -0
- package/dist/ol.d.ts.map +1 -1
- package/dist/ol.js +2 -2
- package/dist/ol.js.map +1 -1
- package/format/GML2.d.ts.map +1 -1
- package/format/GML2.js +7 -9
- package/format/GML3.d.ts.map +1 -1
- package/format/GML3.js +21 -31
- package/geom/GeometryCollection.d.ts +2 -1
- package/geom/GeometryCollection.d.ts.map +1 -1
- package/geom/GeometryCollection.js +1 -0
- package/interaction/DragPan.d.ts +4 -2
- package/interaction/DragPan.d.ts.map +1 -1
- package/interaction/DragPan.js +2 -0
- package/interaction/Link.d.ts.map +1 -1
- package/interaction/Link.js +3 -0
- package/interaction/Modify.d.ts +4 -2
- package/interaction/Modify.d.ts.map +1 -1
- package/interaction/Modify.js +2 -0
- package/layer/Graticule.d.ts +2 -1
- package/layer/Graticule.d.ts.map +1 -1
- package/layer/Graticule.js +1 -0
- package/layer/Heatmap.d.ts +4 -1
- package/layer/Heatmap.d.ts.map +1 -1
- package/layer/Heatmap.js +12 -7
- package/package.json +1 -1
- package/render/Feature.d.ts +4 -2
- package/render/Feature.d.ts.map +1 -1
- package/render/Feature.js +2 -0
- package/render/canvas/ExecutorGroup.d.ts +2 -3
- package/render/canvas/ExecutorGroup.d.ts.map +1 -1
- package/render/canvas/ExecutorGroup.js +1 -0
- package/render/canvas/TextBuilder.d.ts +2 -1
- package/render/canvas/TextBuilder.d.ts.map +1 -1
- package/render/canvas/TextBuilder.js +1 -0
- package/render/canvas/ZIndexContext.d.ts +2 -1
- package/render/canvas/ZIndexContext.d.ts.map +1 -1
- package/render/canvas/ZIndexContext.js +1 -0
- package/render/webgl/MixedGeometryBatch.d.ts +4 -1
- package/render/webgl/MixedGeometryBatch.d.ts.map +1 -1
- package/render/webgl/MixedGeometryBatch.js +4 -0
- package/render/webgl/VectorStyleRenderer.d.ts +52 -26
- package/render/webgl/VectorStyleRenderer.d.ts.map +1 -1
- package/render/webgl/VectorStyleRenderer.js +39 -0
- package/renderer/Composite.d.ts +2 -1
- package/renderer/Composite.d.ts.map +1 -1
- package/renderer/Composite.js +1 -0
- package/renderer/Layer.d.ts +2 -2
- package/renderer/Layer.d.ts.map +1 -1
- package/renderer/Layer.js +1 -1
- package/renderer/canvas/ImageLayer.d.ts +1 -1
- package/renderer/canvas/ImageLayer.d.ts.map +1 -1
- package/renderer/canvas/ImageLayer.js +9 -9
- package/renderer/canvas/VectorImageLayer.js +3 -3
- package/renderer/canvas/VectorLayer.d.ts +4 -2
- package/renderer/canvas/VectorLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorLayer.js +2 -0
- package/renderer/webgl/PointsLayer.d.ts +20 -6
- package/renderer/webgl/PointsLayer.d.ts.map +1 -1
- package/renderer/webgl/PointsLayer.js +15 -1
- package/renderer/webgl/VectorLayer.d.ts +20 -5
- package/renderer/webgl/VectorLayer.d.ts.map +1 -1
- package/renderer/webgl/VectorLayer.js +15 -0
- package/renderer/webgl/VectorTileLayer.d.ts +10 -3
- package/renderer/webgl/VectorTileLayer.d.ts.map +1 -1
- package/renderer/webgl/VectorTileLayer.js +7 -0
- package/source/DataTile.d.ts.map +1 -1
- package/source/DataTile.js +3 -0
- package/source/GeoTIFF.d.ts +2 -1
- package/source/GeoTIFF.d.ts.map +1 -1
- package/source/GeoTIFF.js +1 -0
- package/source/Google.d.ts +2 -1
- package/source/Google.d.ts.map +1 -1
- package/source/Google.js +1 -0
- package/source/Raster.d.ts +35 -22
- package/source/Raster.d.ts.map +1 -1
- package/source/Raster.js +68 -91
- package/source/WMTS.js +1 -1
- package/source/Zoomify.d.ts +2 -1
- package/source/Zoomify.d.ts.map +1 -1
- package/source/Zoomify.js +1 -0
- package/source/ogcTileUtil.js +7 -7
- package/source/wms.d.ts.map +1 -1
- package/source/wms.js +5 -7
- package/style/Circle.js +1 -1
- package/style/Icon.d.ts.map +1 -1
- package/style/Icon.js +5 -0
- package/style/RegularShape.d.ts +5 -2
- package/style/RegularShape.d.ts.map +1 -1
- package/style/RegularShape.js +8 -5
- package/tilegrid/WMTS.js +1 -1
- package/util.js +1 -1
- package/webgl/BaseTileRepresentation.d.ts +2 -2
- package/webgl/BaseTileRepresentation.d.ts.map +1 -1
- package/webgl/BaseTileRepresentation.js +6 -2
- package/webgl/PostProcessingPass.d.ts +48 -12
- package/webgl/PostProcessingPass.d.ts.map +1 -1
- package/webgl/PostProcessingPass.js +42 -6
- package/webgl/TileGeometry.js +1 -1
- package/webgl/TileTexture.js +8 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,
|
|
1
|
+
{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2FjB;IA7EC;;;OAGG;IACH,kBAAc;IAEd;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;OAIG;IACH,SAHY,YAAY,CAoBvB;IAoBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;OAEG;IACH,wBAFY,iBAAiB,CAS5B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,GACL,iBAAiB,CAiB5B;IAkCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAiBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAMC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAKF;uBAnmBsB,YAAY"}
|
package/style/RegularShape.js
CHANGED
|
@@ -104,7 +104,7 @@ class RegularShape extends ImageStyle {
|
|
|
104
104
|
* @protected
|
|
105
105
|
* @type {number}
|
|
106
106
|
*/
|
|
107
|
-
this.
|
|
107
|
+
this.radius = options.radius;
|
|
108
108
|
|
|
109
109
|
/**
|
|
110
110
|
* @private
|
|
@@ -136,6 +136,9 @@ class RegularShape extends ImageStyle {
|
|
|
136
136
|
*/
|
|
137
137
|
this.renderOptions_;
|
|
138
138
|
|
|
139
|
+
/**
|
|
140
|
+
* @private
|
|
141
|
+
*/
|
|
139
142
|
this.imageState_ =
|
|
140
143
|
this.fill_ && this.fill_.loading()
|
|
141
144
|
? ImageState.LOADING
|
|
@@ -297,7 +300,7 @@ class RegularShape extends ImageStyle {
|
|
|
297
300
|
* @api
|
|
298
301
|
*/
|
|
299
302
|
getRadius() {
|
|
300
|
-
return this.
|
|
303
|
+
return this.radius;
|
|
301
304
|
}
|
|
302
305
|
|
|
303
306
|
/**
|
|
@@ -390,7 +393,7 @@ class RegularShape extends ImageStyle {
|
|
|
390
393
|
// |α . .
|
|
391
394
|
// / . .
|
|
392
395
|
// ° center
|
|
393
|
-
let r1 = this.
|
|
396
|
+
let r1 = this.radius;
|
|
394
397
|
let r2 = this.radius2_ === undefined ? r1 : this.radius2_;
|
|
395
398
|
if (r1 < r2) {
|
|
396
399
|
const tmp = r1;
|
|
@@ -466,7 +469,7 @@ class RegularShape extends ImageStyle {
|
|
|
466
469
|
}
|
|
467
470
|
|
|
468
471
|
const add = this.calculateLineJoinSize_(lineJoin, strokeWidth, miterLimit);
|
|
469
|
-
const maxRadius = Math.max(this.
|
|
472
|
+
const maxRadius = Math.max(this.radius, this.radius2_ || 0);
|
|
470
473
|
const size = Math.ceil(2 * maxRadius + add);
|
|
471
474
|
|
|
472
475
|
return {
|
|
@@ -563,7 +566,7 @@ class RegularShape extends ImageStyle {
|
|
|
563
566
|
*/
|
|
564
567
|
createPath_(context) {
|
|
565
568
|
let points = this.points_;
|
|
566
|
-
const radius = this.
|
|
569
|
+
const radius = this.radius;
|
|
567
570
|
if (points === Infinity) {
|
|
568
571
|
context.arc(0, 0, radius, 0, 2 * Math.PI);
|
|
569
572
|
} else {
|
package/tilegrid/WMTS.js
CHANGED
|
@@ -126,7 +126,7 @@ export function createFromCapabilitiesMatrixSet(
|
|
|
126
126
|
const projection = getProjection(code);
|
|
127
127
|
const metersPerUnit = projection.getMetersPerUnit();
|
|
128
128
|
// swap origin x and y coordinates if axis orientation is lat/long
|
|
129
|
-
const switchOriginXY = projection.getAxisOrientation().
|
|
129
|
+
const switchOriginXY = projection.getAxisOrientation().startsWith('ne');
|
|
130
130
|
|
|
131
131
|
matrixSet[matrixIdsPropName].sort(function (a, b) {
|
|
132
132
|
return b[scaleDenominatorPropName] - a[scaleDenominatorPropName];
|
package/util.js
CHANGED
|
@@ -49,12 +49,12 @@ declare class BaseTileRepresentation<TileType extends import("../Tile.js").defau
|
|
|
49
49
|
* @type {number}
|
|
50
50
|
* @protected
|
|
51
51
|
*/
|
|
52
|
-
protected
|
|
52
|
+
protected gutter: number;
|
|
53
53
|
/**
|
|
54
54
|
* @type {import("../webgl/Helper.js").default}
|
|
55
55
|
* @protected
|
|
56
56
|
*/
|
|
57
|
-
protected
|
|
57
|
+
protected helper: import("../webgl/Helper.js").default;
|
|
58
58
|
loaded: boolean;
|
|
59
59
|
ready: boolean;
|
|
60
60
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTileRepresentation.d.ts","sourceRoot":"","sources":["BaseTileRepresentation.js"],"names":[],"mappings":";2BAWa,OAAO,YAAY,EAAE,OAAO;sCAIb,QAAQ,SAAtB,YAAa;;;;UAEb,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AATlD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,qCAH4C,QAAQ,SAAvC,OAAQ,YAAY,EAAE,OAAQ;IAIzC;;OAEG;IACH,qBAFW,yBAAyB,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"BaseTileRepresentation.d.ts","sourceRoot":"","sources":["BaseTileRepresentation.js"],"names":[],"mappings":";2BAWa,OAAO,YAAY,EAAE,OAAO;sCAIb,QAAQ,SAAtB,YAAa;;;;UAEb,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AATlD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,qCAH4C,QAAQ,SAAvC,OAAQ,YAAY,EAAE,OAAQ;IAIzC;;OAEG;IACH,qBAFW,yBAAyB,CAAC,QAAQ,CAAC,EA6B7C;IAxBC;;OAEG;IACH,MAFU,QAAQ,CAET;IA4DX,0BAKC;IA1DC;;;OAGG;IACH,kBAHU,MAAM,CAGiB;IAEjC;;;OAGG;IACH,kBAHU,OAAO,oBAAoB,EAAE,OAAO,CAGlB;IAE5B,gBAAmB;IACnB,eAAkB;IAGpB;;OAEG;IACH,cAFW,QAAQ,QAqBlB;IAED;;;OAGG;IACH,6BAEC;IAED,iBAGC;CAYF;wBAzGuB,qBAAqB"}
|
|
@@ -38,19 +38,23 @@ class BaseTileRepresentation extends EventTarget {
|
|
|
38
38
|
* @type {TileType}
|
|
39
39
|
*/
|
|
40
40
|
this.tile;
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* @private
|
|
44
|
+
*/
|
|
41
45
|
this.handleTileChange_ = this.handleTileChange_.bind(this);
|
|
42
46
|
|
|
43
47
|
/**
|
|
44
48
|
* @type {number}
|
|
45
49
|
* @protected
|
|
46
50
|
*/
|
|
47
|
-
this.
|
|
51
|
+
this.gutter = options.gutter || 0;
|
|
48
52
|
|
|
49
53
|
/**
|
|
50
54
|
* @type {import("../webgl/Helper.js").default}
|
|
51
55
|
* @protected
|
|
52
56
|
*/
|
|
53
|
-
this.
|
|
57
|
+
this.helper = options.helper;
|
|
54
58
|
|
|
55
59
|
this.loaded = false;
|
|
56
60
|
this.ready = false;
|
|
@@ -106,18 +106,54 @@ declare class WebGLPostProcessingPass {
|
|
|
106
106
|
* @param {Options} options Options.
|
|
107
107
|
*/
|
|
108
108
|
constructor(options: Options);
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
109
|
+
/**
|
|
110
|
+
* @private
|
|
111
|
+
*/
|
|
112
|
+
private gl_;
|
|
113
|
+
/**
|
|
114
|
+
* @private
|
|
115
|
+
*/
|
|
116
|
+
private scaleRatio_;
|
|
117
|
+
/**
|
|
118
|
+
* @private
|
|
119
|
+
*/
|
|
120
|
+
private renderTargetTexture_;
|
|
121
|
+
/**
|
|
122
|
+
* @private
|
|
123
|
+
*/
|
|
124
|
+
private renderTargetTextureSize_;
|
|
125
|
+
/**
|
|
126
|
+
* @private
|
|
127
|
+
*/
|
|
128
|
+
private frameBuffer_;
|
|
129
|
+
/**
|
|
130
|
+
* @private
|
|
131
|
+
*/
|
|
132
|
+
private depthBuffer_;
|
|
133
|
+
/**
|
|
134
|
+
* @private
|
|
135
|
+
*/
|
|
136
|
+
private renderTargetProgram_;
|
|
137
|
+
/**
|
|
138
|
+
* @private
|
|
139
|
+
*/
|
|
140
|
+
private renderTargetVerticesBuffer_;
|
|
141
|
+
/**
|
|
142
|
+
* @private
|
|
143
|
+
*/
|
|
144
|
+
private renderTargetAttribLocation_;
|
|
145
|
+
/**
|
|
146
|
+
* @private
|
|
147
|
+
*/
|
|
148
|
+
private renderTargetUniformLocation_;
|
|
149
|
+
/**
|
|
150
|
+
* @private
|
|
151
|
+
*/
|
|
152
|
+
private renderTargetOpacityLocation_;
|
|
153
|
+
/**
|
|
154
|
+
* @private
|
|
155
|
+
*/
|
|
156
|
+
private renderTargetTextureLocation_;
|
|
121
157
|
/**
|
|
122
158
|
* Holds info about custom uniforms used in the post processing pass
|
|
123
159
|
* @type {Array<UniformInternalDescription>}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,
|
|
1
|
+
{"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA6GjB;IA1GC;;OAEG;IACH,YAA+B;IAG/B;;OAEG;IACH,oBAA0C;IAE1C;;OAEG;IACH,6BAA8C;IAC9C;;OAEG;IACH,iCAAoC;IAEpC;;OAEG;IACH,qBAA0C;IAC1C;;OAEG;IACH,qBAA2C;IAgB3C;;OAEG;IACH,6BAA8C;IAM9C;;OAEG;IACH,oCAAoD;IASpD;;OAEG;IACH,oCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IAED;;;;OAIG;IACH,kBAAmB;IAUrB;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;;;OAKG;IACH,iBAFW,OAAO,WAAW,EAAE,UAAU,QAoExC;IAED;;;;;;OAMG;IACH,kBALW,OAAO,WAAW,EAAE,UAAU,uEAErB,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qCAC3D,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qBA6D9E;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;;;OAIG;IACH,sBAwEC;CACF"}
|
|
@@ -6,13 +6,13 @@ import {getUid} from '../util.js';
|
|
|
6
6
|
|
|
7
7
|
const DEFAULT_VERTEX_SHADER = `
|
|
8
8
|
precision mediump float;
|
|
9
|
-
|
|
9
|
+
|
|
10
10
|
attribute vec2 a_position;
|
|
11
11
|
varying vec2 v_texCoord;
|
|
12
12
|
varying vec2 v_screenCoord;
|
|
13
|
-
|
|
13
|
+
|
|
14
14
|
uniform vec2 u_screenSize;
|
|
15
|
-
|
|
15
|
+
|
|
16
16
|
void main() {
|
|
17
17
|
v_texCoord = a_position * 0.5 + 0.5;
|
|
18
18
|
v_screenCoord = v_texCoord * u_screenSize;
|
|
@@ -22,12 +22,12 @@ const DEFAULT_VERTEX_SHADER = `
|
|
|
22
22
|
|
|
23
23
|
const DEFAULT_FRAGMENT_SHADER = `
|
|
24
24
|
precision mediump float;
|
|
25
|
-
|
|
25
|
+
|
|
26
26
|
uniform sampler2D u_image;
|
|
27
27
|
uniform float u_opacity;
|
|
28
|
-
|
|
28
|
+
|
|
29
29
|
varying vec2 v_texCoord;
|
|
30
|
-
|
|
30
|
+
|
|
31
31
|
void main() {
|
|
32
32
|
gl_FragColor = texture2D(u_image, v_texCoord) * u_opacity;
|
|
33
33
|
}
|
|
@@ -103,15 +103,33 @@ class WebGLPostProcessingPass {
|
|
|
103
103
|
* @param {Options} options Options.
|
|
104
104
|
*/
|
|
105
105
|
constructor(options) {
|
|
106
|
+
/**
|
|
107
|
+
* @private
|
|
108
|
+
*/
|
|
106
109
|
this.gl_ = options.webGlContext;
|
|
107
110
|
const gl = this.gl_;
|
|
108
111
|
|
|
112
|
+
/**
|
|
113
|
+
* @private
|
|
114
|
+
*/
|
|
109
115
|
this.scaleRatio_ = options.scaleRatio || 1;
|
|
110
116
|
|
|
117
|
+
/**
|
|
118
|
+
* @private
|
|
119
|
+
*/
|
|
111
120
|
this.renderTargetTexture_ = gl.createTexture();
|
|
121
|
+
/**
|
|
122
|
+
* @private
|
|
123
|
+
*/
|
|
112
124
|
this.renderTargetTextureSize_ = null;
|
|
113
125
|
|
|
126
|
+
/**
|
|
127
|
+
* @private
|
|
128
|
+
*/
|
|
114
129
|
this.frameBuffer_ = gl.createFramebuffer();
|
|
130
|
+
/**
|
|
131
|
+
* @private
|
|
132
|
+
*/
|
|
115
133
|
this.depthBuffer_ = gl.createRenderbuffer();
|
|
116
134
|
|
|
117
135
|
// compile the program for the frame buffer
|
|
@@ -128,12 +146,18 @@ class WebGLPostProcessingPass {
|
|
|
128
146
|
options.fragmentShader || DEFAULT_FRAGMENT_SHADER,
|
|
129
147
|
);
|
|
130
148
|
gl.compileShader(fragmentShader);
|
|
149
|
+
/**
|
|
150
|
+
* @private
|
|
151
|
+
*/
|
|
131
152
|
this.renderTargetProgram_ = gl.createProgram();
|
|
132
153
|
gl.attachShader(this.renderTargetProgram_, vertexShader);
|
|
133
154
|
gl.attachShader(this.renderTargetProgram_, fragmentShader);
|
|
134
155
|
gl.linkProgram(this.renderTargetProgram_);
|
|
135
156
|
|
|
136
157
|
// bind the vertices buffer for the frame buffer
|
|
158
|
+
/**
|
|
159
|
+
* @private
|
|
160
|
+
*/
|
|
137
161
|
this.renderTargetVerticesBuffer_ = gl.createBuffer();
|
|
138
162
|
const verticesArray = [-1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, 1];
|
|
139
163
|
gl.bindBuffer(gl.ARRAY_BUFFER, this.renderTargetVerticesBuffer_);
|
|
@@ -143,18 +167,30 @@ class WebGLPostProcessingPass {
|
|
|
143
167
|
gl.STATIC_DRAW,
|
|
144
168
|
);
|
|
145
169
|
|
|
170
|
+
/**
|
|
171
|
+
* @private
|
|
172
|
+
*/
|
|
146
173
|
this.renderTargetAttribLocation_ = gl.getAttribLocation(
|
|
147
174
|
this.renderTargetProgram_,
|
|
148
175
|
'a_position',
|
|
149
176
|
);
|
|
177
|
+
/**
|
|
178
|
+
* @private
|
|
179
|
+
*/
|
|
150
180
|
this.renderTargetUniformLocation_ = gl.getUniformLocation(
|
|
151
181
|
this.renderTargetProgram_,
|
|
152
182
|
'u_screenSize',
|
|
153
183
|
);
|
|
184
|
+
/**
|
|
185
|
+
* @private
|
|
186
|
+
*/
|
|
154
187
|
this.renderTargetOpacityLocation_ = gl.getUniformLocation(
|
|
155
188
|
this.renderTargetProgram_,
|
|
156
189
|
'u_opacity',
|
|
157
190
|
);
|
|
191
|
+
/**
|
|
192
|
+
* @private
|
|
193
|
+
*/
|
|
158
194
|
this.renderTargetTextureLocation_ = gl.getUniformLocation(
|
|
159
195
|
this.renderTargetProgram_,
|
|
160
196
|
'u_image',
|
package/webgl/TileGeometry.js
CHANGED
package/webgl/TileTexture.js
CHANGED
|
@@ -171,7 +171,7 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
171
171
|
0, // P3
|
|
172
172
|
0,
|
|
173
173
|
]);
|
|
174
|
-
this.
|
|
174
|
+
this.helper.flushBufferData(coords);
|
|
175
175
|
|
|
176
176
|
/**
|
|
177
177
|
* @type {WebGLArrayBuffer}
|
|
@@ -182,7 +182,7 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
182
182
|
}
|
|
183
183
|
|
|
184
184
|
uploadTile() {
|
|
185
|
-
const helper = this.
|
|
185
|
+
const helper = this.helper;
|
|
186
186
|
const gl = helper.getGL();
|
|
187
187
|
const tile = this.tile;
|
|
188
188
|
|
|
@@ -213,8 +213,8 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
213
213
|
|
|
214
214
|
const sourceTileSize = /** @type {DataTile} */ (tile).getSize();
|
|
215
215
|
const pixelSize = [
|
|
216
|
-
sourceTileSize[0] + 2 * this.
|
|
217
|
-
sourceTileSize[1] + 2 * this.
|
|
216
|
+
sourceTileSize[0] + 2 * this.gutter,
|
|
217
|
+
sourceTileSize[1] + 2 * this.gutter,
|
|
218
218
|
];
|
|
219
219
|
const isFloat = data instanceof Float32Array;
|
|
220
220
|
const pixelCount = pixelSize[0] * pixelSize[1];
|
|
@@ -288,8 +288,8 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
288
288
|
}
|
|
289
289
|
|
|
290
290
|
disposeInternal() {
|
|
291
|
-
const gl = this.
|
|
292
|
-
this.
|
|
291
|
+
const gl = this.helper.getGL();
|
|
292
|
+
this.helper.deleteBuffer(this.coords);
|
|
293
293
|
for (let i = 0; i < this.textures.length; ++i) {
|
|
294
294
|
gl.deleteTexture(this.textures[i]);
|
|
295
295
|
}
|
|
@@ -304,7 +304,7 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
304
304
|
* @private
|
|
305
305
|
*/
|
|
306
306
|
getImagePixelData_(image, renderCol, renderRow) {
|
|
307
|
-
const gutter = this.
|
|
307
|
+
const gutter = this.gutter;
|
|
308
308
|
const renderWidth = this.renderSize_[0];
|
|
309
309
|
const renderHeight = this.renderSize_[1];
|
|
310
310
|
|
|
@@ -346,7 +346,7 @@ class TileTexture extends BaseTileRepresentation {
|
|
|
346
346
|
* @private
|
|
347
347
|
*/
|
|
348
348
|
getArrayPixelData_(data, sourceSize, renderCol, renderRow) {
|
|
349
|
-
const gutter = this.
|
|
349
|
+
const gutter = this.gutter;
|
|
350
350
|
const renderWidth = this.renderSize_[0];
|
|
351
351
|
const renderHeight = this.renderSize_[1];
|
|
352
352
|
|