ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistent use of Array and Object types

Browse Source
This commit is contained in:
Tim Schaub
2021-02-02 13:53:10 -07:00
parent 11d92763ec
commit 19bb3f8c88
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/webgl/Helper.js
View File

@@ -92,12 +92,12 @@ export const AttributeType = {
* the main canvas which will then be sampled up (useful for saving resource on blur steps).
* @property {string} [vertexShader] Vertex shader source
* @property {string} [fragmentShader] Fragment shader source
* @property {Object.<string,UniformValue>} [uniforms] Uniform definitions for the post process step
* @property {Object<string,UniformValue>} [uniforms] Uniform definitions for the post process step
*/
/**
* @typedef {Object} Options
* @property {Object.<string,UniformValue>} [uniforms] Uniform definitions; property names must match the uniform
* @property {Object<string,UniformValue>} [uniforms] Uniform definitions; property names must match the uniform
* names in the provided or default shaders.
* @property {Array<PostProcessesOptions>} [postProcesses] Post-processes definitions
*/
@@ -311,13 +311,13 @@ class WebGLHelper extends Disposable {
/**
* @private
* @type {Object.<string, WebGLUniformLocation>}
* @type {Object<string, WebGLUniformLocation>}
*/
this.uniformLocations_ = {};
/**
* @private
* @type {Object.<string, number>}
* @type {Object<string, number>}
*/
this.attribLocations_ = {};

2
src/ol/webgl/PostProcessingPass.js
View File

@@ -37,7 +37,7 @@ const DEFAULT_FRAGMENT_SHADER = `
* the main canvas that will then be sampled up (useful for saving resource on blur steps).
* @property {string} [vertexShader] Vertex shader source
* @property {string} [fragmentShader] Fragment shader source
* @property {Object.<string,import("./Helper").UniformValue>} [uniforms] Uniform definitions for the post process step
* @property {Object<string,import("./Helper").UniformValue>} [uniforms] Uniform definitions for the post process step
*/
/**

4
src/ol/webgl/ShaderBuilder.js
View File

@@ -408,7 +408,7 @@ ${hitDetectionBypass}
/**
* @typedef {Object} StyleParseResult
* @property {ShaderBuilder} builder Shader builder pre-configured according to a given style
* @property {Object.<string,import("./Helper").UniformValue>} uniforms Uniform definitions.
* @property {Object<string,import("./Helper").UniformValue>} uniforms Uniform definitions.
* @property {Array<import("../renderer/webgl/PointsLayer").CustomAttribute>} attributes Attribute descriptions.
*/
@@ -522,7 +522,7 @@ export function parseLiteralStyle(style) {
builder.setFragmentDiscardExpression(`!${parsedFilter}`);
}
/** @type {Object.<string,import("../webgl/Helper").UniformValue>} */
/** @type {Object<string,import("../webgl/Helper").UniformValue>} */
const uniforms = {};
// define one uniform per variable