Remove use of goog.vec.*

This commit is contained in:
Andreas Hocevar
2016-06-22 09:14:53 +02:00
parent 55edf4003f
commit cf7ff841a7
36 changed files with 511 additions and 412 deletions

View File

@@ -1,7 +1,7 @@
goog.provide('ol.renderer.dom.ImageLayer');
goog.require('goog.asserts');
goog.require('goog.vec.Mat4');
goog.require('ol.matrix');
goog.require('ol.ImageBase');
goog.require('ol.ViewHint');
goog.require('ol.dom');
@@ -9,7 +9,6 @@ goog.require('ol.extent');
goog.require('ol.layer.Image');
goog.require('ol.proj');
goog.require('ol.renderer.dom.Layer');
goog.require('ol.vec.Mat4');
/**
@@ -32,9 +31,9 @@ ol.renderer.dom.ImageLayer = function(imageLayer) {
/**
* @private
* @type {goog.vec.Mat4.Number}
* @type {ol.Matrix}
*/
this.transform_ = goog.vec.Mat4.createNumberIdentity();
this.transform_ = ol.matrix.create();
};
ol.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
@@ -118,8 +117,8 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt
if (image) {
var imageExtent = image.getExtent();
var imageResolution = image.getResolution();
var transform = goog.vec.Mat4.createNumber();
ol.vec.Mat4.makeTransform2D(transform,
var transform = ol.matrix.create();
ol.matrix.makeTransform(transform,
frameState.size[0] / 2, frameState.size[1] / 2,
imageResolution / viewResolution, imageResolution / viewResolution,
viewRotation,
@@ -146,12 +145,12 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt
/**
* @param {goog.vec.Mat4.Number} transform Transform.
* @param {ol.Matrix} transform Transform.
* @private
*/
ol.renderer.dom.ImageLayer.prototype.setTransform_ = function(transform) {
if (!ol.vec.Mat4.equals2D(transform, this.transform_)) {
if (!ol.matrix.equals(transform, this.transform_)) {
ol.dom.transformElement2D(this.target, transform, 6);
goog.vec.Mat4.setFromArray(this.transform_, transform);
ol.matrix.setFromArray(this.transform_, transform);
}
};