Add ol.BrowserFeature.HAS_WEBGL

This commit is contained in:
Éric Lemoine
2013-12-18 08:18:23 +01:00
parent 73f24cf7b0
commit 79718151b7
9 changed files with 41 additions and 39 deletions

View File

@@ -1,3 +1,4 @@
@exportSymbol ol.BrowserFeature
@exportProperty ol.BrowserFeature.DEVICE_PIXEL_RATIO
@exportProperty ol.BrowserFeature.HAS_TOUCH
@exportProperty ol.BrowserFeature.HAS_WEBGL

View File

@@ -1,5 +1,9 @@
goog.provide('ol.BrowserFeature');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('ol.webgl');
/**
* @define {boolean} Assume touch.
@@ -27,3 +31,29 @@ ol.BrowserFeature.HAS_TOUCH = ol.ASSUME_TOUCH ||
(goog.global.document &&
'ontouchstart' in goog.global.document.documentElement) ||
!!(goog.global.navigator.msPointerEnabled);
/**
* True if browser supports WebGL.
* @const
* @type {boolean}
* @todo stability experimental
*/
ol.BrowserFeature.HAS_WEBGL = (
/**
* @return {boolean} WebGL supported.
*/
function() {
if (!('WebGLRenderingContext' in goog.global)) {
return false;
}
try {
var canvas = /** @type {HTMLCanvasElement} */
(goog.dom.createElement(goog.dom.TagName.CANVAS));
return !goog.isNull(ol.webgl.getContext(canvas, {
failIfMajorPerformanceCaveat: true
}));
} catch (e) {
return false;
}
})();

View File

@@ -1,6 +1,6 @@
goog.provide('ol.renderer.webgl');
goog.require('ol.webgl');
goog.require('ol.BrowserFeature');
/**
@@ -8,4 +8,4 @@ goog.require('ol.webgl');
* @const
* @type {boolean}
*/
ol.renderer.webgl.SUPPORTED = ol.webgl.SUPPORTED;
ol.renderer.webgl.SUPPORTED = ol.BrowserFeature.HAS_WEBGL;

View File

@@ -1 +0,0 @@
@exportSymbol ol.webgl.SUPPORTED ol.webgl.SUPPORTED

View File

@@ -1,9 +1,6 @@
goog.provide('ol.webgl');
goog.provide('ol.webgl.WebGLContextEventType');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
/**
* @const
@@ -45,28 +42,3 @@ ol.webgl.getContext = function(canvas, opt_attributes) {
}
return null;
};
/**
* Is supported.
* @const
* @type {boolean}
*/
ol.webgl.SUPPORTED = (
/**
* @return {boolean} WebGL supported.
*/
function() {
if (!('WebGLRenderingContext' in goog.global)) {
return false;
}
try {
var canvas = /** @type {HTMLCanvasElement} */
(goog.dom.createElement(goog.dom.TagName.CANVAS));
return !goog.isNull(ol.webgl.getContext(canvas, {
failIfMajorPerformanceCaveat: true
}));
} catch (e) {
return false;
}
})();