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

More WebGL name corrections

Browse Source
This commit is contained in:
Tim Schaub
2016-08-06 14:51:57 -06:00
parent f5cbfdff04
commit b47dc998a3
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/upgrade-notes.md
View File

@@ -18,9 +18,9 @@ A number of internal types have been renamed. This will not affect those who us
* rename `ol.CollectionEventType` to `ol.Collection.EventType` * rename `ol.CollectionEventType` to `ol.Collection.EventType`
* rename `ol.CollectionEvent` to `ol.Collection.Event` * rename `ol.CollectionEvent` to `ol.Collection.Event`
* rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.renderer.webgl.imagereplay.defaultshader.Locations` * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.render.webgl.imagereplay.defaultshader.Locations`
* rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.renderer.webgl.imagereplay.defaultshader.Fragment` * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.render.webgl.imagereplay.defaultshader.Fragment`
* rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.renderer.webgl.imagereplay.defaultshader.Vertex` * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.render.webgl.imagereplay.defaultshader.Vertex`
* rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
* rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations`
* rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment` * rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment`

2
src/ol/render/canvas/replay.js
View File

@@ -1,10 +1,10 @@
// FIXME add option to apply snapToPixel to all coordinates? // FIXME add option to apply snapToPixel to all coordinates?
// FIXME can eliminate empty set styles and strokes (when all geoms skipped) // FIXME can eliminate empty set styles and strokes (when all geoms skipped)
goog.provide('ol.render.canvas.Replay');
goog.provide('ol.render.canvas.ImageReplay'); goog.provide('ol.render.canvas.ImageReplay');
goog.provide('ol.render.canvas.LineStringReplay'); goog.provide('ol.render.canvas.LineStringReplay');
goog.provide('ol.render.canvas.PolygonReplay'); goog.provide('ol.render.canvas.PolygonReplay');
goog.provide('ol.render.canvas.Replay');
goog.provide('ol.render.canvas.ReplayGroup'); goog.provide('ol.render.canvas.ReplayGroup');
goog.provide('ol.render.canvas.TextReplay'); goog.provide('ol.render.canvas.TextReplay');

4
src/ol/render/webgl/imagereplay/defaultshader.glsl
View File

@@ -1,5 +1,5 @@
//! NAMESPACE=ol.renderer.webgl.imagereplay.defaultshader //! NAMESPACE=ol.render.webgl.imagereplay.defaultshader
//! CLASS=ol.renderer.webgl.imagereplay.defaultshader //! CLASS=ol.render.webgl.imagereplay.defaultshader
//! COMMON //! COMMON

40
src/ol/render/webgl/imagereplay/defaultshader.js
View File

@@ -1,5 +1,5 @@
// This file is automatically generated, do not edit // This file is automatically generated, do not edit
goog.provide('ol.renderer.webgl.imagereplay.defaultshader'); goog.provide('ol.render.webgl.imagereplay.defaultshader');
goog.require('ol.webgl.Fragment'); goog.require('ol.webgl.Fragment');
goog.require('ol.webgl.Vertex'); goog.require('ol.webgl.Vertex');
@@ -10,34 +10,34 @@ goog.require('ol.webgl.Vertex');
* @extends {ol.webgl.Fragment} * @extends {ol.webgl.Fragment}
* @struct * @struct
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Fragment = function() { ol.render.webgl.imagereplay.defaultshader.Fragment = function() {
ol.webgl.Fragment.call(this, ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE); ol.webgl.Fragment.call(this, ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE);
}; };
ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Fragment, ol.webgl.Fragment); ol.inherits(ol.render.webgl.imagereplay.defaultshader.Fragment, ol.webgl.Fragment);
goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Fragment); goog.addSingletonGetter(ol.render.webgl.imagereplay.defaultshader.Fragment);
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n'; ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n';
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}'; ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}';
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ? ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ?
ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE : ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE :
ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
/** /**
@@ -45,34 +45,34 @@ ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ?
* @extends {ol.webgl.Vertex} * @extends {ol.webgl.Vertex}
* @struct * @struct
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Vertex = function() { ol.render.webgl.imagereplay.defaultshader.Vertex = function() {
ol.webgl.Vertex.call(this, ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE); ol.webgl.Vertex.call(this, ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE);
}; };
ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Vertex, ol.webgl.Vertex); ol.inherits(ol.render.webgl.imagereplay.defaultshader.Vertex, ol.webgl.Vertex);
goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Vertex); goog.addSingletonGetter(ol.render.webgl.imagereplay.defaultshader.Vertex);
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n'; ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n';
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}'; ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}';
/** /**
* @const * @const
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ? ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ?
ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE : ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE :
ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
/** /**
@@ -81,7 +81,7 @@ ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ?
* @param {WebGLProgram} program Program. * @param {WebGLProgram} program Program.
* @struct * @struct
*/ */
ol.renderer.webgl.imagereplay.defaultshader.Locations = function(gl, program) { ol.render.webgl.imagereplay.defaultshader.Locations = function(gl, program) {
/** /**
* @type {WebGLUniformLocation} * @type {WebGLUniformLocation}

10
src/ol/render/webgl/imagereplay/index.js
View File

@@ -6,7 +6,7 @@ goog.require('ol.extent');
goog.require('ol.obj'); goog.require('ol.obj');
goog.require('ol.render.IReplayGroup'); goog.require('ol.render.IReplayGroup');
goog.require('ol.render.VectorContext'); goog.require('ol.render.VectorContext');
goog.require('ol.renderer.webgl.imagereplay.defaultshader'); goog.require('ol.render.webgl.imagereplay.defaultshader');
goog.require('ol.vec.Mat4'); goog.require('ol.vec.Mat4');
goog.require('ol.webgl'); goog.require('ol.webgl');
goog.require('ol.webgl.Buffer'); goog.require('ol.webgl.Buffer');
@@ -102,7 +102,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
/** /**
* @private * @private
* @type {ol.renderer.webgl.imagereplay.defaultshader.Locations} * @type {ol.render.webgl.imagereplay.defaultshader.Locations}
*/ */
this.defaultLocations_ = null; this.defaultLocations_ = null;
@@ -515,16 +515,16 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context,
// get the program // get the program
var fragmentShader = var fragmentShader =
ol.renderer.webgl.imagereplay.defaultshader.Fragment.getInstance(); ol.render.webgl.imagereplay.defaultshader.Fragment.getInstance();
var vertexShader = var vertexShader =
ol.renderer.webgl.imagereplay.defaultshader.Vertex.getInstance(); ol.render.webgl.imagereplay.defaultshader.Vertex.getInstance();
var program = context.getProgram(fragmentShader, vertexShader); var program = context.getProgram(fragmentShader, vertexShader);
// get the locations // get the locations
var locations; var locations;
if (!this.defaultLocations_) { if (!this.defaultLocations_) {
locations = locations =
new ol.renderer.webgl.imagereplay.defaultshader.Locations(gl, program); new ol.render.webgl.imagereplay.defaultshader.Locations(gl, program);
this.defaultLocations_ = locations; this.defaultLocations_ = locations;
} else { } else {
locations = this.defaultLocations_; locations = this.defaultLocations_;