From 54738e29eba1e5c71183e9ed3fd56b6abaf930f4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 15 Sep 2013 13:10:52 -0600 Subject: [PATCH] Export ol.webgl.SUPPORTED and provide ol.webgl --- examples/bind-input.js | 2 +- examples/brightness-contrast.js | 2 +- examples/hue-saturation.js | 2 +- examples/side-by-side.js | 2 +- examples/ten-thousand-points.js | 2 +- src/ol/map.js | 2 +- src/ol/renderer/webgl/webglrenderer.js | 4 ++-- src/ol/webgl/webgl.exports | 1 - src/ol/webgl/webgl.js | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 src/ol/webgl/webgl.exports diff --git a/examples/bind-input.js b/examples/bind-input.js index dcce625a99..1f0fd6bb1a 100644 --- a/examples/bind-input.js +++ b/examples/bind-input.js @@ -4,7 +4,7 @@ goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); if (!ol.webgl.SUPPORTED) { diff --git a/examples/brightness-contrast.js b/examples/brightness-contrast.js index 4a0129c952..d07824fcf6 100644 --- a/examples/brightness-contrast.js +++ b/examples/brightness-contrast.js @@ -3,7 +3,7 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.MapQuestOpenAerial'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); function setResetBrightnessButtonHTML() { diff --git a/examples/hue-saturation.js b/examples/hue-saturation.js index db601aa679..d0eb5f9ba1 100644 --- a/examples/hue-saturation.js +++ b/examples/hue-saturation.js @@ -4,7 +4,7 @@ goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); goog.require('ol.source.BingMaps'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); function setResetHueButtonHTML() { diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 7e513999e1..afa8425cc7 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -3,7 +3,7 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.MapQuestOpenAerial'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); var domMap = new ol.Map({ diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js index 301d34be56..58f59f1bcb 100644 --- a/examples/ten-thousand-points.js +++ b/examples/ten-thousand-points.js @@ -9,7 +9,7 @@ goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector2'); goog.require('ol.source.OSM'); goog.require('ol.source.Vector2'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); // WARNING diff --git a/src/ol/map.js b/src/ol/map.js index f5ac50a136..3eeca723d0 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -62,8 +62,8 @@ goog.require('ol.renderer.canvas.Map'); goog.require('ol.renderer.canvas.SUPPORTED'); goog.require('ol.renderer.dom.Map'); goog.require('ol.renderer.dom.SUPPORTED'); +goog.require('ol.renderer.webgl'); goog.require('ol.renderer.webgl.Map'); -goog.require('ol.renderer.webgl.SUPPORTED'); goog.require('ol.structs.PriorityQueue'); goog.require('ol.vec.Mat4'); diff --git a/src/ol/renderer/webgl/webglrenderer.js b/src/ol/renderer/webgl/webglrenderer.js index 3e95ff7e3f..eb1871d9a6 100644 --- a/src/ol/renderer/webgl/webglrenderer.js +++ b/src/ol/renderer/webgl/webglrenderer.js @@ -1,6 +1,6 @@ -goog.provide('ol.renderer.webgl.SUPPORTED'); +goog.provide('ol.renderer.webgl'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); /** diff --git a/src/ol/webgl/webgl.exports b/src/ol/webgl/webgl.exports deleted file mode 100644 index e0e5ef70f0..0000000000 --- a/src/ol/webgl/webgl.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.webgl.SUPPORTED diff --git a/src/ol/webgl/webgl.js b/src/ol/webgl/webgl.js index cd785cb5d2..88d7919a54 100644 --- a/src/ol/webgl/webgl.js +++ b/src/ol/webgl/webgl.js @@ -1,5 +1,4 @@ goog.provide('ol.webgl'); -goog.provide('ol.webgl.SUPPORTED'); goog.provide('ol.webgl.WebGLContextEventType'); goog.require('goog.dom'); @@ -64,3 +63,4 @@ ol.webgl.SUPPORTED = (function() { return false; } })(); +goog.exportSymbol('ol.webgl.SUPPORTED', ol.webgl.SUPPORTED);