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

Webgl points / use the helper ton compute the projection transform

Browse Source 
The `WebGLHelper` class now provides a `makeProjectionTransform` method
that updates a transform to match the projection for a given frame state.

This also means that the WebGLHelper does not set the projection matrix
uniform anymore, this is the responsibility of the renderer as
the rendered coordinates will not be in world space from now on.
This commit is contained in:
Olivier Guyot
2019-05-14 18:59:24 +02:00
parent fb455891ce
commit 5d2b7fe4bb
3 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,7 @@ import ViewHint from '../../ViewHint';
import {createEmpty, equals} from '../../extent';
import {
create as createTransform,
reset as resetTransform, rotate as rotateTransform,
scale as scaleTransform,
translate as translateTransform,
reset as resetTransform,
makeInverse as makeInverseTransform,
multiply as multiplyTransform,
apply as applyTransform
@@ -269,6 +267,12 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
* @private
*/
this.renderTransform_ = createTransform();
/**
* @type {import("../../transform.js").Transform}
* @private
*/
this.invertRenderTransform_ = createTransform();
}
/**
@@ -321,20 +325,9 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
this.previousExtent_ = frameState.extent.slice();
}
// regenerate the transform matrix
const size = frameState.size;
const rotation = frameState.viewState.rotation;
const resolution = frameState.viewState.resolution;
const center = frameState.viewState.center;
resetTransform(this.currentTransform_);
scaleTransform(this.currentTransform_, 2 / (resolution * size[0]), 2 / (resolution * size[1]));
rotateTransform(this.currentTransform_, -rotation);
translateTransform(this.currentTransform_, -center[0], -center[1]);
// the current transform
const inverseCurrentTransform = makeInverseTransform(createTransform(), this.renderTransform_);
this.currentTransform_ = multiplyTransform(this.currentTransform_, inverseCurrentTransform);
// apply the current projection transform with the invert of the one used to fill buffers
this.helper_.makeProjectionTransform(frameState, this.currentTransform_);
multiplyTransform(this.currentTransform_, this.invertRenderTransform_);
this.helper_.prepareDraw(frameState);
@@ -365,16 +358,9 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
this.verticesBuffer_.getArray().length = 0;
this.indicesBuffer_.getArray().length = 0;
// regenerate the transform matrix
const size = frameState.size;
const rotation = frameState.viewState.rotation;
const resolution = frameState.viewState.resolution;
const center = frameState.viewState.center;
resetTransform(this.renderTransform_);
scaleTransform(this.renderTransform_, 2 / (resolution * size[0]), 2 / (resolution * size[1]));
rotateTransform(this.renderTransform_, -rotation);
translateTransform(this.renderTransform_, -center[0], -center[1]);
// saves the projection transform for the current frame state
this.helper_.makeProjectionTransform(frameState, this.renderTransform_);
makeInverseTransform(this.invertRenderTransform_, this.renderTransform_);
// loop on features to fill the buffer
const features = vectorSource.getFeatures();
@@ -382,7 +368,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
for (let i = 0; i < features.length; i++) {
feature = features[i];
if (!feature.getGeometry() || feature.getGeometry().getType() !== GeometryType.POINT) {
return;
continue;
}
let geojsonFeature = this.geojsonFeatureCache_[getUid(feature)];