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

Rename _ol_render_webgl_ImageReplay_ to WebGLImageReplay

Browse Source
This commit is contained in:
Frederic Junod
2018-01-15 09:56:04 +01:00
parent 8de7555af6
commit 074d09fceb
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/render/webgl/ImageReplay.js
View File

@@ -12,7 +12,7 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
* @param {ol.Extent} maxExtent Max extent. * @param {ol.Extent} maxExtent Max extent.
* @struct * @struct
*/ */
const _ol_render_webgl_ImageReplay_ = function(tolerance, maxExtent) { const WebGLImageReplay = function(tolerance, maxExtent) {
_ol_render_webgl_TextureReplay_.call(this, tolerance, maxExtent); _ol_render_webgl_TextureReplay_.call(this, tolerance, maxExtent);
/** /**
@@ -41,13 +41,13 @@ const _ol_render_webgl_ImageReplay_ = function(tolerance, maxExtent) {
}; };
inherits(_ol_render_webgl_ImageReplay_, _ol_render_webgl_TextureReplay_); inherits(WebGLImageReplay, _ol_render_webgl_TextureReplay_);
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeometry, feature) { WebGLImageReplay.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
this.startIndices.push(this.indices.length); this.startIndices.push(this.indices.length);
this.startIndicesFeature.push(feature); this.startIndicesFeature.push(feature);
const flatCoordinates = multiPointGeometry.getFlatCoordinates(); const flatCoordinates = multiPointGeometry.getFlatCoordinates();
@@ -60,7 +60,7 @@ _ol_render_webgl_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeom
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.drawPoint = function(pointGeometry, feature) { WebGLImageReplay.prototype.drawPoint = function(pointGeometry, feature) {
this.startIndices.push(this.indices.length); this.startIndices.push(this.indices.length);
this.startIndicesFeature.push(feature); this.startIndicesFeature.push(feature);
const flatCoordinates = pointGeometry.getFlatCoordinates(); const flatCoordinates = pointGeometry.getFlatCoordinates();
@@ -73,7 +73,7 @@ _ol_render_webgl_ImageReplay_.prototype.drawPoint = function(pointGeometry, feat
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.finish = function(context) { WebGLImageReplay.prototype.finish = function(context) {
const gl = context.getGL(); const gl = context.getGL();
this.groupIndices.push(this.indices.length); this.groupIndices.push(this.indices.length);
@@ -105,7 +105,7 @@ _ol_render_webgl_ImageReplay_.prototype.finish = function(context) {
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.setImageStyle = function(imageStyle) { WebGLImageReplay.prototype.setImageStyle = function(imageStyle) {
const anchor = imageStyle.getAnchor(); const anchor = imageStyle.getAnchor();
const image = imageStyle.getImage(1); const image = imageStyle.getImage(1);
const imageSize = imageStyle.getImageSize(); const imageSize = imageStyle.getImageSize();
@@ -157,7 +157,7 @@ _ol_render_webgl_ImageReplay_.prototype.setImageStyle = function(imageStyle) {
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.getTextures = function(opt_all) { WebGLImageReplay.prototype.getTextures = function(opt_all) {
return opt_all ? this.textures_.concat(this.hitDetectionTextures_) : this.textures_; return opt_all ? this.textures_.concat(this.hitDetectionTextures_) : this.textures_;
}; };
@@ -165,7 +165,7 @@ _ol_render_webgl_ImageReplay_.prototype.getTextures = function(opt_all) {
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_render_webgl_ImageReplay_.prototype.getHitDetectionTextures = function() { WebGLImageReplay.prototype.getHitDetectionTextures = function() {
return this.hitDetectionTextures_; return this.hitDetectionTextures_;
}; };
export default _ol_render_webgl_ImageReplay_; export default WebGLImageReplay;

4
src/ol/render/webgl/ReplayGroup.js
View File

@@ -8,7 +8,7 @@ import _ol_obj_ from '../../obj.js';
import _ol_render_replay_ from '../replay.js'; import _ol_render_replay_ from '../replay.js';
import ReplayGroup from '../ReplayGroup.js'; import ReplayGroup from '../ReplayGroup.js';
import WebGLCircleReplay from '../webgl/CircleReplay.js'; import WebGLCircleReplay from '../webgl/CircleReplay.js';
import _ol_render_webgl_ImageReplay_ from '../webgl/ImageReplay.js'; import WebGLImageReplay from '../webgl/ImageReplay.js';
import _ol_render_webgl_LineStringReplay_ from '../webgl/LineStringReplay.js'; import _ol_render_webgl_LineStringReplay_ from '../webgl/LineStringReplay.js';
import _ol_render_webgl_PolygonReplay_ from '../webgl/PolygonReplay.js'; import _ol_render_webgl_PolygonReplay_ from '../webgl/PolygonReplay.js';
import _ol_render_webgl_TextReplay_ from '../webgl/TextReplay.js'; import _ol_render_webgl_TextReplay_ from '../webgl/TextReplay.js';
@@ -318,7 +318,7 @@ WebGLReplayGroup.HIT_DETECTION_SIZE_ = [1, 1];
*/ */
WebGLReplayGroup.BATCH_CONSTRUCTORS_ = { WebGLReplayGroup.BATCH_CONSTRUCTORS_ = {
'Circle': WebGLCircleReplay, 'Circle': WebGLCircleReplay,
'Image': _ol_render_webgl_ImageReplay_, 'Image': WebGLImageReplay,
'LineString': _ol_render_webgl_LineStringReplay_, 'LineString': _ol_render_webgl_LineStringReplay_,
'Polygon': _ol_render_webgl_PolygonReplay_, 'Polygon': _ol_render_webgl_PolygonReplay_,
'Text': _ol_render_webgl_TextReplay_ 'Text': _ol_render_webgl_TextReplay_

4
test/spec/ol/render/webgl/imagereplay.test.js
View File

@@ -1,6 +1,6 @@
import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js'; import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
import Point from '../../../../../src/ol/geom/Point.js'; import Point from '../../../../../src/ol/geom/Point.js';
import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js'; import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
import ImageStyle from '../../../../../src/ol/style/Image.js'; import ImageStyle from '../../../../../src/ol/style/Image.js';
describe('ol.render.webgl.ImageReplay', function() { describe('ol.render.webgl.ImageReplay', function() {
@@ -40,7 +40,7 @@ describe('ol.render.webgl.ImageReplay', function() {
beforeEach(function() { beforeEach(function() {
const tolerance = 0.1; const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000]; const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_ImageReplay_(tolerance, maxExtent); replay = new WebGLImageReplay(tolerance, maxExtent);
}); });
describe('#setImageStyle', function() { describe('#setImageStyle', function() {

32
test/spec/ol/render/webgl/immediate.test.js
View File

@@ -8,7 +8,7 @@ import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Point from '../../../../../src/ol/geom/Point.js'; import Point from '../../../../../src/ol/geom/Point.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js'; import Polygon from '../../../../../src/ol/geom/Polygon.js';
import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js'; import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js';
import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js'; import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Immediate.js'; import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Immediate.js';
import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js'; import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js'; import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
@@ -111,7 +111,7 @@ describe('ol.render.webgl.Immediate', function() {
return function() {}; return function() {};
}); });
sinon.spy(ctor.prototype.getDeleteResourcesFunction); sinon.spy(ctor.prototype.getDeleteResourcesFunction);
if (ctor === _ol_render_webgl_ImageReplay_) { if (ctor === WebGLImageReplay) {
tmpObj.setImageStyle = ctor.prototype.setImageStyle; tmpObj.setImageStyle = ctor.prototype.setImageStyle;
ctor.prototype.setImageStyle = sinon.spy(); ctor.prototype.setImageStyle = sinon.spy();
} else { } else {
@@ -132,40 +132,40 @@ describe('ol.render.webgl.Immediate', function() {
describe('#drawPoint', function() { describe('#drawPoint', function() {
let tmpObj; let tmpObj;
beforeEach(function() { beforeEach(function() {
tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawPoint'); tmpObj = mock(WebGLImageReplay, 'drawPoint');
}); });
it('draws a point', function() { it('draws a point', function() {
context.drawGeometry(point); context.drawGeometry(point);
expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.drawPoint.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.drawPoint.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
}); });
after(function() { after(function() {
restore(_ol_render_webgl_ImageReplay_, tmpObj); restore(WebGLImageReplay, tmpObj);
}); });
}); });
describe('#drawMultiPoint', function() { describe('#drawMultiPoint', function() {
let tmpObj; let tmpObj;
beforeEach(function() { beforeEach(function() {
tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawMultiPoint'); tmpObj = mock(WebGLImageReplay, 'drawMultiPoint');
}); });
it('draws a multi point', function() { it('draws a multi point', function() {
context.drawGeometry(multiPoint); context.drawGeometry(multiPoint);
expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.drawMultiPoint.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.drawMultiPoint.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true); expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
}); });
after(function() { after(function() {
restore(_ol_render_webgl_ImageReplay_, tmpObj); restore(WebGLImageReplay, tmpObj);
}); });
}); });