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

Fixed internal var name on WebGLPoints renderer.

Browse Source
This commit is contained in:
Olivier Guyot
2018-11-19 11:40:58 +01:00
parent 6b82cf0b84
commit 0b23e94a2a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ol/renderer/webgl/PointsLayer.js
View File

@@ -134,7 +134,7 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
const options = opt_options || {}; const options = opt_options || {};
this.context_ = new WebGLHelper({ this.helper_ = new WebGLHelper({
postProcesses: options.postProcesses, postProcesses: options.postProcesses,
uniforms: options.uniforms uniforms: options.uniforms
}); });
@@ -144,12 +144,12 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
this.verticesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW); this.verticesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
this.indicesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW); this.indicesBuffer_ = new WebGLArrayBuffer([], DYNAMIC_DRAW);
this.program_ = this.context_.getProgram( this.program_ = this.helper_.getProgram(
options.fragmentShader || FRAGMENT_SHADER, options.fragmentShader || FRAGMENT_SHADER,
options.vertexShader || VERTEX_SHADER options.vertexShader || VERTEX_SHADER
); );
this.context_.useProgram(this.program_); this.helper_.useProgram(this.program_);
this.sizeCallback_ = options.sizeCallback || function(feature) { this.sizeCallback_ = options.sizeCallback || function(feature) {
return 1; return 1;
@@ -171,10 +171,10 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
* @inheritDoc * @inheritDoc
*/ */
renderFrame(frameState, layerState) { renderFrame(frameState, layerState) {
this.context_.setUniformFloatValue(DefaultUniform.OPACITY, layerState.opacity); this.helper_.setUniformFloatValue(DefaultUniform.OPACITY, layerState.opacity);
this.context_.drawElements(0, this.indicesBuffer_.getArray().length); this.helper_.drawElements(0, this.indicesBuffer_.getArray().length);
this.context_.finalizeDraw(frameState); this.helper_.finalizeDraw(frameState);
return this.context_.getCanvas(); return this.helper_.getCanvas();
} }
/** /**
@@ -184,7 +184,7 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
const vectorLayer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer()); const vectorLayer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
const vectorSource = /** @type {import("../../source/Vector.js").default} */ (vectorLayer.getSource()); const vectorSource = /** @type {import("../../source/Vector.js").default} */ (vectorLayer.getSource());
this.context_.prepareDraw(frameState); this.helper_.prepareDraw(frameState);
if (this.sourceRevision_ < vectorSource.getRevision()) { if (this.sourceRevision_ < vectorSource.getRevision()) {
this.sourceRevision_ = vectorSource.getRevision(); this.sourceRevision_ = vectorSource.getRevision();
@@ -219,13 +219,13 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
} }
// write new data // write new data
this.context_.bindBuffer(ARRAY_BUFFER, this.verticesBuffer_); this.helper_.bindBuffer(ARRAY_BUFFER, this.verticesBuffer_);
this.context_.bindBuffer(ELEMENT_ARRAY_BUFFER, this.indicesBuffer_); this.helper_.bindBuffer(ELEMENT_ARRAY_BUFFER, this.indicesBuffer_);
const bytesPerFloat = Float32Array.BYTES_PER_ELEMENT; const bytesPerFloat = Float32Array.BYTES_PER_ELEMENT;
this.context_.enableAttributeArray(DefaultAttrib.POSITION, 2, FLOAT, bytesPerFloat * 6, 0); this.helper_.enableAttributeArray(DefaultAttrib.POSITION, 2, FLOAT, bytesPerFloat * 6, 0);
this.context_.enableAttributeArray(DefaultAttrib.OFFSETS, 2, FLOAT, bytesPerFloat * 6, bytesPerFloat * 2); this.helper_.enableAttributeArray(DefaultAttrib.OFFSETS, 2, FLOAT, bytesPerFloat * 6, bytesPerFloat * 2);
this.context_.enableAttributeArray(DefaultAttrib.TEX_COORD, 2, FLOAT, bytesPerFloat * 6, bytesPerFloat * 4); this.helper_.enableAttributeArray(DefaultAttrib.TEX_COORD, 2, FLOAT, bytesPerFloat * 6, bytesPerFloat * 4);
return true; return true;
} }
@@ -236,7 +236,7 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
* @api * @api
*/ */
getShaderCompileErrors() { getShaderCompileErrors() {
return this.context_.getShaderCompileErrors(); return this.helper_.getShaderCompileErrors();
} }
} }