ol.render.Event take an ol.webgl.Context object

This commit is contained in:
Éric Lemoine
2013-11-18 16:03:09 +01:00
committed by Tom Payne
parent 325534aa46
commit 478f8c43ca
2 changed files with 9 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
@exportProperty ol.render.Event.prototype.getContext @exportProperty ol.render.Event.prototype.getContext
@exportProperty ol.render.Event.prototype.getFrameState @exportProperty ol.render.Event.prototype.getFrameState
@exportProperty ol.render.Event.prototype.getGL @exportProperty ol.render.Event.prototype.getGlContext
@exportProperty ol.render.Event.prototype.getRender @exportProperty ol.render.Event.prototype.getRender

View File

@@ -23,10 +23,11 @@ ol.render.EventType = {
* @param {ol.render.IRender=} opt_render Render. * @param {ol.render.IRender=} opt_render Render.
* @param {ol.FrameState=} opt_frameState Frame state. * @param {ol.FrameState=} opt_frameState Frame state.
* @param {?CanvasRenderingContext2D=} opt_context Context. * @param {?CanvasRenderingContext2D=} opt_context Context.
* @param {?WebGLRenderingContext=} opt_gl GL. * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
*/ */
ol.render.Event = function( ol.render.Event = function(
type, opt_target, opt_render, opt_frameState, opt_context, opt_gl) { type, opt_target, opt_render, opt_frameState, opt_context,
opt_glContext) {
goog.base(this, type, opt_target); goog.base(this, type, opt_target);
@@ -49,10 +50,10 @@ ol.render.Event = function(
this.context_ = opt_context; this.context_ = opt_context;
/** /**
* @type {WebGLRenderingContext|null|undefined} * @type {ol.webgl.Context|null|undefined}
* @private * @private
*/ */
this.gl_ = opt_gl; this.glContext_ = opt_glContext;
}; };
goog.inherits(ol.render.Event, goog.events.Event); goog.inherits(ol.render.Event, goog.events.Event);
@@ -75,10 +76,10 @@ ol.render.Event.prototype.getFrameState = function() {
/** /**
* @return {WebGLRenderingContext|null|undefined} GL. * @return {ol.webgl.Context|null|undefined} GL context.
*/ */
ol.render.Event.prototype.getGL = function() { ol.render.Event.prototype.getGlContext = function() {
return this.gl_; return this.glContext_;
}; };