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

Move AtlasManager to ol.style.AtlasManager

Browse Source
This commit is contained in:
tsauerwein
2014-11-06 17:51:15 +01:00
parent 64da2647a6
commit ebe0c6a88c
2 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ol/renderer/webgl/webglatlasmanager.js → src/ol/style/atlasmanager.js
View File

@@ -1,5 +1,5 @@
goog.provide('ol.renderer.webgl.Atlas');
goog.provide('ol.renderer.webgl.AtlasManager');
goog.provide('ol.style.Atlas');
goog.provide('ol.style.AtlasManager');
goog.require('goog.asserts');
goog.require('goog.dom');
@@ -10,7 +10,7 @@ goog.require('goog.object');
/**
* @typedef {{offsetX: number, offsetY: number, image: HTMLCanvasElement}}
*/
ol.renderer.webgl.AtlasInfo;
ol.style.AtlasInfo;
@@ -35,7 +35,7 @@ ol.renderer.webgl.AtlasInfo;
* @param {number=} opt_space The space in pixels between images
* (default: 1).
*/
ol.renderer.webgl.AtlasManager = function(opt_size, opt_maxSize, opt_space) {
ol.style.AtlasManager = function(opt_size, opt_maxSize, opt_space) {
/**
* The size in pixels of the latest atlas image.
@@ -60,17 +60,17 @@ ol.renderer.webgl.AtlasManager = function(opt_size, opt_maxSize, opt_space) {
/**
* @private
* @type {Array.<ol.renderer.webgl.Atlas>}
* @type {Array.<ol.style.Atlas>}
*/
this.atlases_ = [new ol.renderer.webgl.Atlas(this.currentSize_, this.space_)];
this.atlases_ = [new ol.style.Atlas(this.currentSize_, this.space_)];
};
/**
* @param {string} id The identifier of the entry to check.
* @return {ol.renderer.webgl.AtlasInfo}
* @return {ol.style.AtlasInfo}
*/
ol.renderer.webgl.AtlasManager.prototype.getInfo = function(id) {
ol.style.AtlasManager.prototype.getInfo = function(id) {
var atlas, info;
for (var i = 0, ii = this.atlases_.length; i < ii; i++) {
atlas = this.atlases_[i];
@@ -96,9 +96,9 @@ ol.renderer.webgl.AtlasManager.prototype.getInfo = function(id) {
* onto the sprite image.
* @param {object=} opt_this Value to use as `this` when executing
* `renderCallback`.
* @return {ol.renderer.webgl.AtlasInfo}
* @return {ol.style.AtlasInfo}
*/
ol.renderer.webgl.AtlasManager.prototype.add =
ol.style.AtlasManager.prototype.add =
function(id, width, height, renderCallback, opt_this) {
if (width + this.space_ > this.maxSize_ ||
height + this.space_ > this.maxSize_) {
@@ -115,7 +115,7 @@ ol.renderer.webgl.AtlasManager.prototype.add =
// the entry could not be added to one of the existing atlases,
// create a new atlas that is twice as big and try to add to this one.
this.currentSize_ = Math.min(this.currentSize_ * 2, this.maxSize_);
atlas = new ol.renderer.webgl.Atlas(this.currentSize_, this.space_);
atlas = new ol.style.Atlas(this.currentSize_, this.space_);
this.atlases_.push(atlas);
ii++;
}
@@ -137,7 +137,7 @@ ol.renderer.webgl.AtlasManager.prototype.add =
* @param {number} size The size in pixels of the sprite images.
* @param {number} space The space in pixels between images.
*/
ol.renderer.webgl.Atlas = function(size, space) {
ol.style.Atlas = function(size, space) {
/**
* @private
@@ -151,13 +151,13 @@ ol.renderer.webgl.Atlas = function(size, space) {
/**
* @private
* @type {Array.<ol.renderer.webgl.Atlas.Block>}
* @type {Array.<ol.style.Atlas.Block>}
*/
this.emptyBlocks_ = [{x: 0, y: 0, width: size, height: size}];
/**
* @private
* @type {Object.<number, ol.renderer.webgl.AtlasInfo>}
* @type {Object.<number, ol.style.AtlasInfo>}
*/
this.entries_ = {};
@@ -181,9 +181,9 @@ ol.renderer.webgl.Atlas = function(size, space) {
/**
* @param {string} id The identifier of the entry to check.
* @return {ol.renderer.webgl.AtlasInfo}
* @return {ol.style.AtlasInfo}
*/
ol.renderer.webgl.Atlas.prototype.get = function(id) {
ol.style.Atlas.prototype.get = function(id) {
return goog.object.get(this.entries_, id, null);
};
@@ -196,9 +196,9 @@ ol.renderer.webgl.Atlas.prototype.get = function(id) {
* onto the sprite image.
* @param {object=} opt_this Value to use as `this` when executing
* `renderCallback`.
* @return {ol.renderer.webgl.AtlasInfo}
* @return {ol.style.AtlasInfo}
*/
ol.renderer.webgl.Atlas.prototype.add =
ol.style.Atlas.prototype.add =
function(id, width, height, renderCallback, opt_this) {
var block;
for (var i = 0, ii = this.emptyBlocks_.length; i < ii; i++) {
@@ -232,16 +232,16 @@ ol.renderer.webgl.Atlas.prototype.add =
/**
* @private
* @param {number} index The index of the block.
* @param {ol.renderer.webgl.Atlas.Block} block The block to split.
* @param {ol.style.Atlas.Block} block The block to split.
* @param {number} width The width of the entry to insert.
* @param {number} height The height of the entry to insert.
*/
ol.renderer.webgl.Atlas.prototype.split_ =
ol.style.Atlas.prototype.split_ =
function(index, block, width, height) {
var deltaWidth = block.width - width;
var deltaHeight = block.height - height;
/** @type {ol.renderer.webgl.AtlasInfo} */
/** @type {ol.style.AtlasInfo} */
var newBlock1, newBlock2;
if (deltaWidth > deltaHeight) {
@@ -290,10 +290,10 @@ ol.renderer.webgl.Atlas.prototype.split_ =
* blocks (that are potentially smaller) are filled first.
* @private
* @param {number} index The index of the block to remove.
* @param {ol.renderer.webgl.Atlas.Block} newBlock1 The 1st block to add.
* @param {ol.renderer.webgl.Atlas.Block} newBlock2 The 2nd block to add.
* @param {ol.style.Atlas.Block} newBlock1 The 1st block to add.
* @param {ol.style.Atlas.Block} newBlock2 The 2nd block to add.
*/
ol.renderer.webgl.Atlas.prototype.updateBlocks_ =
ol.style.Atlas.prototype.updateBlocks_ =
function(index, newBlock1, newBlock2) {
var args = [index, 1];
if (newBlock1.width > 0 && newBlock1.height > 0) {
@@ -309,4 +309,4 @@ ol.renderer.webgl.Atlas.prototype.updateBlocks_ =
/**
* @typedef {{x: number, y: number, width: number, height: number}}
*/
ol.renderer.webgl.Atlas.Block;
ol.style.Atlas.Block;

48
test/spec/ol/renderer/webgl/webglatlasmanager.test.js → test/spec/ol/style/atlasmanager.test.js
View File

@@ -1,7 +1,7 @@
goog.provide('ol.test.renderer.webgl.AtlasManager');
goog.provide('ol.test.style.AtlasManager');
describe('ol.renderer.webgl.Atlas', function() {
describe('ol.style.Atlas', function() {
var defaultRender = function(context, x, y) {
};
@@ -9,7 +9,7 @@ describe('ol.renderer.webgl.Atlas', function() {
describe('#constructor', function() {
it('inits the atlas', function() {
var atlas = new ol.renderer.webgl.Atlas(256, 1);
var atlas = new ol.style.Atlas(256, 1);
expect(atlas.emptyBlocks_).to.eql(
[{x: 0, y: 0, width: 256, height: 256}]);
});
@@ -18,7 +18,7 @@ describe('ol.renderer.webgl.Atlas', function() {
describe('#add (squares with same size)', function() {
it('adds one entry', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
var info = atlas.add('1', 32, 32, defaultRender);
expect(info).to.eql(
@@ -28,7 +28,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('adds two entries', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
atlas.add('1', 32, 32, defaultRender);
var info = atlas.add('2', 32, 32, defaultRender);
@@ -40,7 +40,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('adds three entries', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
atlas.add('1', 32, 32, defaultRender);
atlas.add('2', 32, 32, defaultRender);
@@ -53,7 +53,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('adds four entries (new row)', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
atlas.add('1', 32, 32, defaultRender);
atlas.add('2', 32, 32, defaultRender);
@@ -67,7 +67,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('returns null when an entry is too big', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
atlas.add('1', 32, 32, defaultRender);
atlas.add('2', 32, 32, defaultRender);
@@ -78,7 +78,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('fills up the whole atlas', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
for (var i = 1; i <= 16; i++) {
expect(atlas.add(i.toString(), 28, 28, defaultRender)).to.be.ok();
@@ -92,7 +92,7 @@ describe('ol.renderer.webgl.Atlas', function() {
describe('#add (rectangles with different sizes)', function() {
it('adds a bunch of rectangles', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
expect(atlas.add('1', 64, 32, defaultRender)).to.eql(
{offsetX: 1, offsetY: 1, image: atlas.canvas_});
@@ -115,7 +115,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('fills up the whole atlas (rectangles in portrait format)', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
for (var i = 1; i <= 32; i++) {
expect(atlas.add(i.toString(), 28, 14, defaultRender)).to.be.ok();
@@ -126,7 +126,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('fills up the whole atlas (rectangles in landscape format)', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
for (var i = 1; i <= 32; i++) {
expect(atlas.add(i.toString(), 14, 28, defaultRender)).to.be.ok();
@@ -140,7 +140,7 @@ describe('ol.renderer.webgl.Atlas', function() {
describe('#add (rendering)', function() {
it('calls the render callback with the right values', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
var rendererCallback = sinon.spy();
atlas.add('1', 32, 32, rendererCallback);
@@ -155,7 +155,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
it('is possible to actually draw on the canvas', function() {
var atlas = new ol.renderer.webgl.Atlas(128, 1);
var atlas = new ol.style.Atlas(128, 1);
var rendererCallback = function(context, x, y) {
context.fillStyle = '#FFA500';
@@ -170,7 +170,7 @@ describe('ol.renderer.webgl.Atlas', function() {
});
describe('ol.renderer.webgl.AtlasManager', function() {
describe('ol.style.AtlasManager', function() {
var defaultRender = function(context, x, y) {
};
@@ -178,7 +178,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
describe('#constructor', function() {
it('inits the atlas manager', function() {
var manager = new ol.renderer.webgl.AtlasManager();
var manager = new ol.style.AtlasManager();
expect(manager.atlases_).to.not.be.empty();
});
});
@@ -186,7 +186,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
describe('#add', function() {
it('adds one entry', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
var info = manager.add('1', 32, 32, defaultRender);
expect(info).to.eql(
@@ -196,7 +196,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
});
it('creates a new atlas if needed', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
expect(manager.add('1', 100, 100, defaultRender)).to.be.ok();
var info = manager.add('2', 100, 100, defaultRender);
expect(info).to.be.ok();
@@ -205,7 +205,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
});
it('creates new atlases until one is large enough', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
expect(manager.add('1', 100, 100, defaultRender)).to.be.ok();
expect(manager.atlases_).to.have.length(1);
var info = manager.add('2', 500, 500, defaultRender);
@@ -215,7 +215,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
});
it('checks all existing atlases and create a new if needed', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
expect(manager.add('1', 100, 100, defaultRender)).to.be.ok();
expect(manager.add('2', 100, 100, defaultRender)).to.be.ok();
expect(manager.atlases_).to.have.length(2);
@@ -226,7 +226,7 @@ describe('ol.renderer.webgl.AtlasManager', function() {
});
it('returns null if the size exceeds the maximum size', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
expect(manager.add('1', 100, 100, defaultRender)).to.be.ok();
expect(manager.add('2', 2048, 2048, defaultRender)).to.eql(null);
});
@@ -235,11 +235,11 @@ describe('ol.renderer.webgl.AtlasManager', function() {
describe('#getInfo', function() {
it('returns null if no entry for the given id', function() {
var manager = new ol.renderer.webgl.AtlasManager(128);
var manager = new ol.style.AtlasManager(128);
expect(manager.getInfo('123456')).to.eql(null);
});
});
});
goog.require('ol.renderer.webgl.Atlas');
goog.require('ol.renderer.webgl.AtlasManager');
goog.require('ol.style.Atlas');
goog.require('ol.style.AtlasManager');