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

Add ol.renderer.webgl.Layer.getWebGLMapRenderer

Browse Source 
This improves the type checking.
This commit is contained in:
Tom Payne
2013-03-21 00:02:15 +01:00
parent f770be297d
commit ecd5158012
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -56,7 +56,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
// http://learningwebgl.com/blog/?p=2101
var imageElement = image.getImageElement(this);
var gl = this.getMapRenderer().getGL();
var gl = this.getWebGLMapRenderer().getGL();
var texture = gl.createTexture();
@@ -109,7 +109,7 @@ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
ol.renderer.webgl.ImageLayer.prototype.renderFrame =
function(frameState, layerState) {
var gl = this.getMapRenderer().getGL();
var gl = this.getWebGLMapRenderer().getGL();
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
@@ -150,7 +150,7 @@ ol.renderer.webgl.ImageLayer.prototype.renderFrame =
if (!goog.isNull(image)) {
goog.asserts.assert(!goog.isNull(texture));
var canvas = this.getMapRenderer().getCanvas();
var canvas = this.getWebGLMapRenderer().getCanvas();
this.updateProjectionMatrix_(canvas.width, canvas.height,
viewCenter, viewResolution, viewRotation, image.getExtent());

12
src/ol/renderer/webgl/webgllayerrenderer.js
View File

@@ -91,7 +91,7 @@ goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
ol.renderer.webgl.Layer.prototype.bindFramebuffer =
function(frameState, framebufferDimension) {
var mapRenderer = this.getMapRenderer();
var mapRenderer = this.getWebGLMapRenderer();
var gl = mapRenderer.getGL();
if (!goog.isDef(this.framebufferDimension) ||
@@ -136,7 +136,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer =
* @inheritDoc
*/
ol.renderer.webgl.Layer.prototype.disposeInternal = function() {
var mapRenderer = this.getMapRenderer();
var mapRenderer = this.getWebGLMapRenderer();
var gl = mapRenderer.getGL();
if (!gl.isContextLost()) {
gl.deleteBuffer(this.arrayBuffer_);
@@ -157,12 +157,10 @@ ol.renderer.webgl.Layer.prototype.getColorMatrix = function() {
/**
* @inheritDoc
* @return {ol.renderer.Map} MapRenderer.
* @return {ol.renderer.webgl.Map} MapRenderer.
*/
ol.renderer.webgl.Layer.prototype.getMapRenderer = function() {
return /** @type {ol.renderer.webgl.Map} */ (goog.base(
this, 'getMapRenderer'));
ol.renderer.webgl.Layer.prototype.getWebGLMapRenderer = function() {
return /** @type {ol.renderer.webgl.Map} */ (this.getMapRenderer());
};

4
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -149,7 +149,7 @@ goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
var mapRenderer = this.getMapRenderer();
var mapRenderer = this.getWebGLMapRenderer();
var gl = mapRenderer.getGL();
if (!gl.isContextLost()) {
gl.deleteBuffer(this.arrayBuffer_);
@@ -198,7 +198,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
ol.renderer.webgl.TileLayer.prototype.renderFrame =
function(frameState, layerState) {
var mapRenderer = this.getMapRenderer();
var mapRenderer = this.getWebGLMapRenderer();
var gl = mapRenderer.getGL();
var view2DState = frameState.view2DState;