From 569811c52ff2e27cab3e4be0ca2a16daf7364d9c Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 13 Nov 2013 01:10:50 +0100 Subject: [PATCH] Remove old replay code --- old/src/ol/replay/canvas.js | 279 -------------------------------- old/src/ol/replay/replaybase.js | 104 ------------ 2 files changed, 383 deletions(-) delete mode 100644 old/src/ol/replay/canvas.js delete mode 100644 old/src/ol/replay/replaybase.js diff --git a/old/src/ol/replay/canvas.js b/old/src/ol/replay/canvas.js deleted file mode 100644 index 2ba254126b..0000000000 --- a/old/src/ol/replay/canvas.js +++ /dev/null @@ -1,279 +0,0 @@ -goog.provide('ol.replay.Canvas'); - -goog.require('goog.array'); -goog.require('goog.asserts'); -goog.require('goog.vec.Mat4'); -goog.require('ol.extent'); -goog.require('ol.replay'); -goog.require('ol.replay.Base'); -goog.require('ol.replay.Batch'); -goog.require('ol.replay.FillStyle'); -goog.require('ol.replay.StrokeStyle'); - - -/** - * @enum {number} - */ -ol.replay.CanvasInstructionId = { - ADD_PATH: 0, - BEGIN_PATH: 1, - DRAW: 2, - SET_FILL_STYLE: 3, - SET_STROKE_STYLE: 4 -}; - - -/** - * @typedef {{close: (boolean|undefined), - * command: ol.replay.CanvasInstructionId, - * fillStyle: (ol.replay.FillStyle|undefined), - * end: (number|undefined), - * start: (number|undefined), - * strokeStyle: (ol.replay.StrokeStyle|undefined)}} - * } - */ -ol.replay.CanvasInstruction; - - - -/** - * @constructor - * @extends {ol.replay.Batch} - * @param {ol.replay.BatchType} type Type. - * FIXME make this private? - * FIXME accumulate all coordinates between style sets in a single array. - * FIXME merge adjacent setStyles. - */ -ol.replay.CanvasBatch = function(type) { - - goog.base(this); - - /** - * @private - * @type {ol.replay.BatchType} - */ - this.type_ = type; - - /** - * @private - * @type {Array.} - */ - this.instructions_ = []; - - /** - * @private - * @type {Array.} - */ - this.path_ = []; - - /** - * @private - * @type {ol.Extent} - */ - this.extent_ = ol.extent.createEmpty(); - -}; -goog.inherits(ol.replay.CanvasBatch, ol.replay.Batch); - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.addPath = function(path, stride, close) { - goog.asserts.assert(this.type_ == ol.replay.BatchType.FILL || - this.type_ == ol.replay.BatchType.FILL_AND_STROKE || - this.type_ == ol.replay.BatchType.STROKE); - var start = this.path_.length; - if (stride == 2) { - goog.array.extend(this.path_, path); - } else { - var m = path.length; - var j = this.path_.length; - var i; - for (i = 0; i < m; i += stride) { - this.path_[j++] = path[i]; - this.path_[j++] = path[i + 1]; - ol.extent.extendXY(this.extent_, path[i], path[i + 1]); - } - } - this.instructions_.push(/** @type {ol.replay.CanvasInstruction} */ ({ - command: ol.replay.CanvasInstructionId.ADD_PATH, - close: close, - end: this.path_.length, - start: start - })); -}; - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.beginPath = function() { - this.instructions_.push(/** @type {ol.replay.CanvasInstruction} */ ({ - command: ol.replay.CanvasInstructionId.BEGIN_PATH - })); -}; - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.draw = function() { - this.instructions_.push(/** @type {ol.replay.CanvasInstruction} */ ({ - command: ol.replay.CanvasInstructionId.DRAW - })); -}; - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.getExtent = function() { - return this.extent_; -}; - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.setFillStyle = function(fillStyle) { - goog.asserts.assert(this.type_ == ol.replay.BatchType.FILL || - this.type_ == ol.replay.BatchType.FILL_AND_STROKE); - this.instructions_.push(/** @type {ol.replay.CanvasInstruction} */ ({ - command: ol.replay.CanvasInstructionId.SET_FILL_STYLE, - fillStyle: fillStyle - })); -}; - - -/** - * @inheritDoc - */ -ol.replay.CanvasBatch.prototype.setStrokeStyle = function(strokeStyle) { - goog.asserts.assert(this.type_ == ol.replay.BatchType.FILL_AND_STROKE || - this.type_ == ol.replay.BatchType.STROKE); - this.instructions_.push(/** @type {ol.replay.CanvasInstruction} */ ({ - command: ol.replay.CanvasInstructionId.SET_STROKE_STYLE, - strokeStyle: strokeStyle - })); -}; - - -/** - * @param {CanvasRenderingContext2D} context Context. - * @param {goog.vec.Mat4.AnyType} transform Transform. - */ -ol.replay.CanvasBatch.prototype.drawInternal = function(context, transform) { - var fillStyle = null; - var strokeStyle = null; - var n = this.instructions_.length; - var close, end, i, j, path, start; - // FIXME re-use destination array - // FIXME only re-transform if transform changed - var pixelPath = ol.replay.transformPath(this.path_, transform); - for (i = 0; i < n; ++i) { - var instruction = this.instructions_[i]; - switch (instruction.command) { - case ol.replay.CanvasInstructionId.ADD_PATH: - end = instruction.end; - goog.asserts.assert(goog.isDef(end)); - close = instruction.close; - goog.asserts.assert(goog.isDef(close)); - start = instruction.start; - goog.asserts.assert(goog.isDef(start)); - context.moveTo(pixelPath[start], pixelPath[start + 1]); - for (j = start + 2; j < end; j += 2) { - context.lineTo(pixelPath[j], pixelPath[j + 1]); - } - if (close) { - context.closePath(); - } - break; - case ol.replay.CanvasInstructionId.BEGIN_PATH: - context.beginPath(); - break; - case ol.replay.CanvasInstructionId.DRAW: - // FIXME handle alpha - if (!goog.isNull(fillStyle)) { - context.fillStyle = ol.replay.color(fillStyle.color); - context.fill(); - } - if (!goog.isNull(strokeStyle)) { - context.lineWidth = strokeStyle.width; - context.strokeStyle = ol.replay.color(strokeStyle.color); - context.stroke(); - } - break; - case ol.replay.CanvasInstructionId.SET_FILL_STYLE: - goog.asserts.assert(goog.isDef(instruction.fillStyle)); - fillStyle = instruction.fillStyle; - break; - case ol.replay.CanvasInstructionId.SET_STROKE_STYLE: - goog.asserts.assert(goog.isDef(instruction.strokeStyle)); - strokeStyle = instruction.strokeStyle; - break; - } - } -}; - - - -/** - * @constructor - * @extends {ol.replay.Base} - * @param {CanvasRenderingContext2D} context Context. - */ -ol.replay.Canvas = function(context) { - - goog.base(this); - - /** - * @private - * @type {CanvasRenderingContext2D} - */ - this.context_ = context; - - /** - * @private - * @type {goog.vec.Mat4.Number} - */ - this.transform_ = goog.vec.Mat4.createNumberIdentity(); - -}; -goog.inherits(ol.replay.Canvas, ol.replay.Base); - - -/** - * @inheritDoc - */ -ol.replay.Canvas.prototype.createBatch = function(batchType) { - return new ol.replay.CanvasBatch(batchType); -}; - - -/** - * @inheritDoc - */ -ol.replay.Canvas.prototype.drawBatch = function(batch) { - goog.asserts.assert(batch instanceof ol.replay.CanvasBatch); - var canvasBatch = /** @type {ol.replay.CanvasBatch} */ (batch); - canvasBatch.drawInternal(this.context_, this.transform_); -}; - - -/** - * @inheritDoc - */ -ol.replay.Canvas.prototype.setTransform = function(transform) { - goog.vec.Mat4.setFromArray(this.transform_, transform); -}; - - -/** - * @param {ol.Color} color Color. - * @return {string} Color. - */ -ol.replay.color = function(color) { - // FIXME handle alpha - return 'rgb(' + color.r + ',' + color.g + ',' + color.b + ')'; -}; diff --git a/old/src/ol/replay/replaybase.js b/old/src/ol/replay/replaybase.js deleted file mode 100644 index 419690a18e..0000000000 --- a/old/src/ol/replay/replaybase.js +++ /dev/null @@ -1,104 +0,0 @@ -goog.provide('ol.replay.Base'); -goog.provide('ol.replay.Batch'); -goog.provide('ol.replay.FillStyle'); -goog.provide('ol.replay.StrokeStyle'); - -goog.require('goog.vec.Mat4'); -goog.require('ol.Color'); -goog.require('ol.replay'); - - -/** - * @enum {number} - */ -ol.replay.BatchType = { - FILL: 0, - STROKE: 1, - FILL_AND_STROKE: 2 -}; - - -/** - * @typedef {{color: ol.Color}} - */ -ol.replay.FillStyle; - - -/** - * @typedef {{color: ol.Color, width: number}} - */ -ol.replay.StrokeStyle; - - - -/** - * @constructor - */ -ol.replay.Batch = function() { -}; - - -/** - * Draw a path. Outer rings are clockwise. Inner rings are anti-clockwise. - * @param {Array.} path Path. - * @param {number} stride Stride. - * @param {boolean} close Close. - */ -ol.replay.Batch.prototype.addPath = goog.abstractMethod; - - -/** - * FIXME empty description for jsdoc - */ -ol.replay.Batch.prototype.beginPath = goog.abstractMethod; - - -/** - * FIXME empty description for jsdoc - */ -ol.replay.Batch.prototype.draw = goog.abstractMethod; - - -/** - * @return {ol.Extent} Extent. - */ -ol.replay.Batch.prototype.getExtent = goog.abstractMethod; - - -/** - * @param {ol.replay.FillStyle} fillStyle Fill style. - */ -ol.replay.Batch.prototype.setFillStyle = goog.abstractMethod; - - -/** - * @param {ol.replay.StrokeStyle} strokeStyle Stroke style. - */ -ol.replay.Batch.prototype.setStrokeStyle = goog.abstractMethod; - - - -/** - * @constructor - */ -ol.replay.Base = function() { -}; - - -/** - * @param {ol.replay.BatchType} batchType Batch type. - * @return {ol.replay.Batch} Batch. - */ -ol.replay.Base.prototype.createBatch = goog.abstractMethod; - - -/** - * @param {ol.replay.Batch} batch Batch. - */ -ol.replay.Base.prototype.drawBatch = goog.abstractMethod; - - -/** - * @param {goog.vec.Mat4.AnyType} transform Transform. - */ -ol.replay.Base.prototype.setTransform = goog.abstractMethod;