ol 10.5.1-dev.1746739261118 → 10.5.1-dev.1746775086365
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/dist/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/util.js +1 -1
- package/webgl/Helper.d.ts +10 -0
- package/webgl/Helper.d.ts.map +1 -1
- package/webgl/Helper.js +19 -0
package/package.json
CHANGED
package/util.js
CHANGED
package/webgl/Helper.d.ts
CHANGED
|
@@ -358,6 +358,11 @@ declare class WebGLHelper extends Disposable {
|
|
|
358
358
|
* @private
|
|
359
359
|
*/
|
|
360
360
|
private startTime_;
|
|
361
|
+
/**
|
|
362
|
+
* @type {number}
|
|
363
|
+
* @private
|
|
364
|
+
*/
|
|
365
|
+
private maxAttributeCount_;
|
|
361
366
|
/**
|
|
362
367
|
* @param {Object<string, UniformValue>} uniforms Uniform definitions.
|
|
363
368
|
*/
|
|
@@ -546,6 +551,11 @@ declare class WebGLHelper extends Disposable {
|
|
|
546
551
|
* @param {Array<number>} value Matrix value
|
|
547
552
|
*/
|
|
548
553
|
setUniformMatrixValue(uniform: string, value: Array<number>): void;
|
|
554
|
+
/**
|
|
555
|
+
* Disable all vertex attributes.
|
|
556
|
+
* @private
|
|
557
|
+
*/
|
|
558
|
+
private disableAllAttributes_;
|
|
549
559
|
/**
|
|
550
560
|
* Will set the currently bound buffer to an attribute of the shader program. Used by `#enableAttributes`
|
|
551
561
|
* internally.
|
package/webgl/Helper.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"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"}
|
package/webgl/Helper.js
CHANGED
|
@@ -446,6 +446,14 @@ class WebGLHelper extends Disposable {
|
|
|
446
446
|
* @private
|
|
447
447
|
*/
|
|
448
448
|
this.startTime_ = Date.now();
|
|
449
|
+
|
|
450
|
+
/**
|
|
451
|
+
* @type {number}
|
|
452
|
+
* @private
|
|
453
|
+
*/
|
|
454
|
+
this.maxAttributeCount_ = this.gl_.getParameter(
|
|
455
|
+
this.gl_.MAX_VERTEX_ATTRIBS,
|
|
456
|
+
);
|
|
449
457
|
}
|
|
450
458
|
|
|
451
459
|
/**
|
|
@@ -894,6 +902,7 @@ class WebGLHelper extends Disposable {
|
|
|
894
902
|
* @param {import("../Map.js").FrameState} [frameState] Frame state.
|
|
895
903
|
*/
|
|
896
904
|
useProgram(program, frameState) {
|
|
905
|
+
this.disableAllAttributes_();
|
|
897
906
|
const gl = this.gl_;
|
|
898
907
|
gl.useProgram(program);
|
|
899
908
|
this.currentProgram_ = program;
|
|
@@ -1065,6 +1074,16 @@ class WebGLHelper extends Disposable {
|
|
|
1065
1074
|
this.gl_.uniformMatrix4fv(this.getUniformLocation(uniform), false, value);
|
|
1066
1075
|
}
|
|
1067
1076
|
|
|
1077
|
+
/**
|
|
1078
|
+
* Disable all vertex attributes.
|
|
1079
|
+
* @private
|
|
1080
|
+
*/
|
|
1081
|
+
disableAllAttributes_() {
|
|
1082
|
+
for (let i = 0; i < this.maxAttributeCount_; i++) {
|
|
1083
|
+
this.gl_.disableVertexAttribArray(i);
|
|
1084
|
+
}
|
|
1085
|
+
}
|
|
1086
|
+
|
|
1068
1087
|
/**
|
|
1069
1088
|
* Will set the currently bound buffer to an attribute of the shader program. Used by `#enableAttributes`
|
|
1070
1089
|
* internally.
|