Merge pull request #3455 from tsauerwein/webgl-loaded-icon

Fix pre-loaded icons images for WebGL
This commit is contained in:
Tobias Sauerwein
2015-04-02 20:29:29 +02:00
4 changed files with 66 additions and 9 deletions
+11 -3
View File
@@ -6076,6 +6076,7 @@ olx.style.FillOptions.prototype.color;
* rotateWithView: (boolean|undefined),
* rotation: (number|undefined),
* size: (ol.Size|undefined),
* imgSize: (ol.Size|undefined),
* src: (string|undefined)}}
* @api
*/
@@ -6134,7 +6135,7 @@ olx.style.IconOptions.prototype.crossOrigin;
/**
* Image object for the icon. If the `src` option is not provided then the
* provided image must already be loaded. And in that case, it is required
* to provide the size of the image, with the `size` option.
* to provide the size of the image, with the `imgSize` option.
* @type {Image|undefined}
* @api
*/
@@ -6208,14 +6209,21 @@ olx.style.IconOptions.prototype.rotation;
/**
* Icon size in pixel. Can be used together with `offset` to define the
* sub-rectangle to use from the origin (sprite) icon image. Also, setting
* the `size` is required if `img` is set and `src` is not.
* sub-rectangle to use from the origin (sprite) icon image.
* @type {ol.Size|undefined}
* @api
*/
olx.style.IconOptions.prototype.size;
/**
* Image size in pixel. Only required if `img` is set and `src` is not.
* @type {ol.Size|undefined}
* @api
*/
olx.style.IconOptions.prototype.imgSize;
/**
* Image source URI.
* @type {string}