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

Use ol.vec.Mat4.multVec2

Browse Source
This commit is contained in:
Tom Payne
2013-04-04 19:53:39 +02:00
parent c7ed933c9d
commit a8295ba113
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ol/map.js
View File

@@ -56,6 +56,7 @@ goog.require('ol.renderer.dom.SUPPORTED');
goog.require('ol.renderer.webgl.Map'); goog.require('ol.renderer.webgl.Map');
goog.require('ol.renderer.webgl.SUPPORTED'); goog.require('ol.renderer.webgl.SUPPORTED');
goog.require('ol.structs.PriorityQueue'); goog.require('ol.structs.PriorityQueue');
goog.require('ol.vec.Mat4');
/** /**
@@ -397,10 +398,8 @@ ol.Map.prototype.getCoordinateFromPixel = function(pixel) {
if (goog.isNull(frameState)) { if (goog.isNull(frameState)) {
return null; return null;
} else { } else {
var vec3 = [pixel.x, pixel.y, 0]; var vec2 = [pixel.x, pixel.y];
goog.vec.Mat4.multVec3(frameState.pixelToCoordinateMatrix, vec3, vec3); return ol.vec.Mat4.multVec2(frameState.pixelToCoordinateMatrix, vec2, vec2);
vec3.length = 2;
return vec3;
} }
}; };
@@ -434,9 +433,9 @@ ol.Map.prototype.getPixelFromCoordinate = function(coordinate) {
if (goog.isNull(frameState)) { if (goog.isNull(frameState)) {
return null; return null;
} else { } else {
var vec3 = [coordinate[0], coordinate[1], 0]; var vec2 = coordinate.slice(0, 2);
goog.vec.Mat4.multVec3(frameState.coordinateToPixelMatrix, vec3, vec3); ol.vec.Mat4.multVec2(frameState.coordinateToPixelMatrix, vec2, vec2);
return new ol.Pixel(vec3[0], vec3[1]); return new ol.Pixel(vec2[0], vec2[1]);
} }
}; };