Provide ol.RendererType structure through ol.renderer.Map

It was previously in ol.Map, but it could not be provided because
of circular dependencies.
This commit is contained in:
Hadrien Tulipe
2014-05-22 20:15:01 +02:00
parent 2e587c1be8
commit 7aab28afcc
5 changed files with 20 additions and 15 deletions

View File

@@ -42,6 +42,7 @@ goog.require('ol.ObjectEventType');
goog.require('ol.Pixel');
goog.require('ol.PostRenderFunction');
goog.require('ol.PreRenderFunction');
goog.require('ol.RendererType');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.TileQueue');
@@ -98,18 +99,6 @@ ol.OL3_LOGO_URL = 'data:image/png;base64,' +
'q82CM2MwKeibqAvSO7MCABq0wXEPiqWEAAAAAElFTkSuQmCC';
/**
* Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
* @enum {string}
* @todo api
*/
ol.RendererType = {
CANVAS: 'canvas',
DOM: 'dom',
WEBGL: 'webgl'
};
/**
* @type {Array.<ol.RendererType>}
*/

View File

@@ -7,6 +7,7 @@ goog.require('goog.dom');
goog.require('goog.style');
goog.require('goog.vec.Mat4');
goog.require('ol');
goog.require('ol.RendererType');
goog.require('ol.css');
goog.require('ol.dom');
goog.require('ol.layer.Image');
@@ -130,7 +131,7 @@ ol.renderer.canvas.Map.prototype.getCanvasLayerRenderer = function(layer) {
* @inheritDoc
*/
ol.renderer.canvas.Map.prototype.getType = function() {
return 'canvas';
return ol.RendererType.CANVAS;
};

View File

@@ -6,6 +6,7 @@ goog.require('goog.dom.TagName');
goog.require('goog.functions');
goog.require('goog.style');
goog.require('ol');
goog.require('ol.RendererType');
goog.require('ol.css');
goog.require('ol.layer.Image');
goog.require('ol.layer.Tile');
@@ -79,7 +80,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
* @inheritDoc
*/
ol.renderer.dom.Map.prototype.getType = function() {
return 'dom';
return ol.RendererType.DOM;
};

View File

@@ -1,3 +1,4 @@
goog.provide('ol.RendererType');
goog.provide('ol.renderer.Map');
goog.require('goog.Disposable');
@@ -11,6 +12,18 @@ goog.require('ol.style.IconImageCache');
goog.require('ol.vec.Mat4');
/**
* Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
* @enum {string}
* @todo api
*/
ol.RendererType = {
CANVAS: 'canvas',
DOM: 'dom',
WEBGL: 'webgl'
};
/**
* @constructor

View File

@@ -13,6 +13,7 @@ goog.require('goog.object');
goog.require('goog.style');
goog.require('goog.webgl');
goog.require('ol');
goog.require('ol.RendererType');
goog.require('ol.Tile');
goog.require('ol.css');
goog.require('ol.dom');
@@ -350,7 +351,7 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.getType = function() {
return 'webgl';
return ol.RendererType.WEBGL;
};