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

Support image scale

Browse Source
This commit is contained in:
Éric Lemoine
2014-11-06 09:47:24 +01:00
parent 64a7cdf372
commit 43756a2d59
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/icon-sprite-webgl.js
View File

@@ -9,9 +9,9 @@ goog.require('ol.style.Style');
var iconInfo = [
{size: [55, 55], offset: [0, 0], opacity: 1.0},
{size: [55, 55], offset: [110, 86], opacity: 0.75},
{size: [55, 86], offset: [55, 0], opacity: 0.5}
{size: [55, 55], offset: [0, 0], opacity: 1.0, scale: 1.0},
{size: [55, 55], offset: [110, 86], opacity: 0.75, scale: 1.25},
{size: [55, 86], offset: [55, 0], opacity: 0.5, scale: 1.5}
];
var i;
@@ -19,11 +19,13 @@ var i;
var iconCount = iconInfo.length;
var icons = new Array(iconCount);
for (i = 0; i < iconCount; ++i) {
var info = iconInfo[i];
icons[i] = new ol.style.Icon({
src: 'data/Butterfly.png',
size: iconInfo[i].size,
offset: iconInfo[i].offset,
opacity: iconInfo[i].opacity
size: info.size,
offset: info.offset,
opacity: info.opacity,
scale: info.scale
});
}

28
src/ol/render/webgl/webglreplay.js
View File

@@ -128,6 +128,12 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
*/
this.projectionMatrix_ = goog.vec.Mat4.createNumberIdentity();
/**
* @private
* @type {number|undefined}
*/
this.scale_ = undefined;
/**
* @type {Array.<WebGLTexture>}
* @private
@@ -210,6 +216,7 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ =
goog.asserts.assert(goog.isDef(this.opacity_));
goog.asserts.assert(goog.isDef(this.originX_));
goog.asserts.assert(goog.isDef(this.originY_));
goog.asserts.assert(goog.isDef(this.scale_));
goog.asserts.assert(goog.isDef(this.width_));
var anchorX = this.anchorX_;
var anchorY = this.anchorY_;
@@ -219,6 +226,7 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ =
var opacity = this.opacity_;
var originX = this.originX_;
var originY = this.originY_;
var scale = this.scale_;
var width = this.width_;
var numIndices = this.indices_.length;
var numVertices = this.vertices_.length;
@@ -233,32 +241,32 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ =
this.vertices_[numVertices++] = x;
this.vertices_[numVertices++] = y;
this.vertices_[numVertices++] = -2 * anchorX;
this.vertices_[numVertices++] = -2 * (height - anchorY);
this.vertices_[numVertices++] = -2 * scale * anchorX;
this.vertices_[numVertices++] = -2 * scale * (height - anchorY);
this.vertices_[numVertices++] = (originX + width) / imageWidth;
this.vertices_[numVertices++] = (originY + height) / imageHeight;
this.vertices_[numVertices++] = opacity;
this.vertices_[numVertices++] = x;
this.vertices_[numVertices++] = y;
this.vertices_[numVertices++] = 2 * (width - anchorX);
this.vertices_[numVertices++] = -2 * (height - anchorY);
this.vertices_[numVertices++] = 2 * scale * (width - anchorX);
this.vertices_[numVertices++] = -2 * scale * (height - anchorY);
this.vertices_[numVertices++] = originX / imageWidth;
this.vertices_[numVertices++] = (originY + height) / imageHeight;
this.vertices_[numVertices++] = opacity;
this.vertices_[numVertices++] = x;
this.vertices_[numVertices++] = y;
this.vertices_[numVertices++] = 2 * (width - anchorX);
this.vertices_[numVertices++] = 2 * anchorY;
this.vertices_[numVertices++] = 2 * scale * (width - anchorX);
this.vertices_[numVertices++] = 2 * scale * anchorY;
this.vertices_[numVertices++] = originX / imageWidth;
this.vertices_[numVertices++] = originY / imageHeight;
this.vertices_[numVertices++] = opacity;
this.vertices_[numVertices++] = x;
this.vertices_[numVertices++] = y;
this.vertices_[numVertices++] = -2 * anchorX;
this.vertices_[numVertices++] = 2 * anchorY;
this.vertices_[numVertices++] = -2 * scale * anchorX;
this.vertices_[numVertices++] = 2 * scale * anchorY;
this.vertices_[numVertices++] = (originX + width) / imageWidth;
this.vertices_[numVertices++] = originY / imageHeight;
this.vertices_[numVertices++] = opacity;
@@ -405,6 +413,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
this.opacity_ = undefined;
this.originX_ = undefined;
this.originY_ = undefined;
this.scale_ = undefined;
this.vertices_ = null;
this.width_ = undefined;
};
@@ -514,6 +523,8 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
goog.asserts.assert(!goog.isNull(origin));
var size = imageStyle.getSize();
goog.asserts.assert(!goog.isNull(size));
var scale = imageStyle.getScale();
goog.asserts.assert(goog.isDef(scale));
if (this.images_.length === 0) {
this.images_.push(image);
@@ -534,6 +545,7 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
this.opacity_ = opacity;
this.originX_ = origin[0];
this.originY_ = origin[1];
this.scale_ = scale;
this.width_ = size[0];
};