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

Named exports from ol/vec/Mat4

Browse Source
This commit is contained in:
Frederic Junod
2017-12-15 08:43:04 +01:00
parent 10d7884643
commit a32aebfb3a
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/Layer.js
+4 -4
View File
@@ -9,7 +9,7 @@ import _ol_renderer_Layer_ from '../Layer.js';
import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js';
import _ol_transform_ from '../../transform.js';
import _ol_vec_Mat4_ from '../../vec/Mat4.js';
import {create, fromTransform} from '../../vec/Mat4.js';
import _ol_webgl_ from '../../webgl.js';
import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
import _ol_webgl_Context_ from '../../webgl/Context.js';
@@ -76,7 +76,7 @@ var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) {
* @type {Array.<number>}
* @private
*/
this.tmpMat4_ = _ol_vec_Mat4_.create();
this.tmpMat4_ = create();
/**
* @private
@@ -173,9 +173,9 @@ _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerSta
}
gl.uniformMatrix4fv(locations.u_texCoordMatrix, false,
_ol_vec_Mat4_.fromTransform(this.tmpMat4_, this.getTexCoordMatrix()));
fromTransform(this.tmpMat4_, this.getTexCoordMatrix()));
gl.uniformMatrix4fv(locations.u_projectionMatrix, false,
_ol_vec_Mat4_.fromTransform(this.tmpMat4_, this.getProjectionMatrix()));
fromTransform(this.tmpMat4_, this.getProjectionMatrix()));
gl.uniform1f(locations.u_opacity, layerState.opacity);
gl.bindTexture(_ol_webgl_.TEXTURE_2D, this.getTexture());
gl.drawArrays(_ol_webgl_.TRIANGLE_STRIP, 0, 4);