|
@@ -40359,9 +40359,9 @@ and limitations under the License.
|
|
|
load: function(t, e, n, i) {
|
|
|
void 0 !== this.path && (t = this.path + t),
|
|
|
t = this.manager.resolveURL(t);
|
|
|
- if(t.indexOf('/data/bundle_e67bb877-9674-4549-b6c6-5edf049a8ef5/')>-1){
|
|
|
- //return;
|
|
|
- }
|
|
|
+ // if(t.indexOf('/data/bundle_e67bb877-9674-4549-b6c6-5edf049a8ef5/')>-1){
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
var r = this
|
|
|
, o = _u.get(t);
|
|
|
if (void 0 !== o)
|
|
@@ -99060,6 +99060,8 @@ and limitations under the License.
|
|
|
});
|
|
|
var i = n(108)
|
|
|
, r = n(4)
|
|
|
+ , rot90 = (new r.Quaternion).setFromAxisAngle(new r.Vector3(0,0,1), r.Math.degToRad(-90)) //add 转入时旋转90度
|
|
|
+ , rot90Invert = rot90.clone().inverse()//add 转出时旋回90度
|
|
|
, o = function() {
|
|
|
function t() {}
|
|
|
// return t.fromArray = function(t) {
|
|
@@ -99081,7 +99083,7 @@ and limitations under the License.
|
|
|
/* let a = new r.Quaternion(t[1],t[3],-t[2],t[0]).multiply((new r.Quaternion).setFromAxisAngle(new r.Vector3(0,1,0), r.Math.degToRad(90)));
|
|
|
a.multiply((new r.Quaternion).setFromAxisAngle(new r.Vector3(1,0,0), r.Math.degToRad(-90)));
|
|
|
return a */
|
|
|
- return new r.Quaternion(t[1],t[2],t[3],t[0]).multiply((new r.Quaternion).setFromAxisAngle(new r.Vector3(0,0,1), r.Math.degToRad(-90)));
|
|
|
+ return new r.Quaternion(t[1],t[2],t[3],t[0]).multiply(rot90);
|
|
|
|
|
|
|
|
|
}
|
|
@@ -99089,8 +99091,11 @@ and limitations under the License.
|
|
|
,
|
|
|
t.toArray = function(t) {
|
|
|
if (t) {
|
|
|
- var e = t.toArray();
|
|
|
- return [e[3], e[0], e[1], e[2]]
|
|
|
+ var t1 = t.clone().multiply(rot90Invert);
|
|
|
+ var e = t1.toArray();
|
|
|
+ return [e[3], e[0], e[1], e[2]]
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
,
|
|
@@ -123096,8 +123101,8 @@ and limitations under the License.
|
|
|
t
|
|
|
/*
|
|
|
var e = this.proj4Transformer.forward(t);
|
|
|
- //console.log('t-x:'+t.x+',t-y'+t.y);
|
|
|
- if(t.x == 113.59500383333348 || t.y == 22.367328805555548 ){
|
|
|
+ console.log('t-x:'+t.x+',t-y'+t.y);
|
|
|
+ if(t.x == 113.59571152939596 || t.y == 22.366594630499026 ){
|
|
|
console.log('okokokokokokokok1');
|
|
|
//t.x = -0.3665;
|
|
|
//t.y = -3.3755;
|
|
@@ -123105,7 +123110,7 @@ and limitations under the License.
|
|
|
t.y = 0;
|
|
|
t.z = 0; //0.43665
|
|
|
}
|
|
|
- else if(t.x == 113.59499965011267 || t.y == 22.367350833518422){
|
|
|
+ else if(t.x == 113.595707287329 || t.y == 22.366616648951815){
|
|
|
console.log('okokokokokokokok2:'+t.z);
|
|
|
//t.x = -0.4656740128993988;
|
|
|
//t.y = 2.6516430377960205;
|
|
@@ -219394,4 +219399,20 @@ and limitations under the License.
|
|
|
Pe.Proj.projections.add(Ie);
|
|
|
e.default = at
|
|
|
}
|
|
|
-]);
|
|
|
+]);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+/*
|
|
|
+
|
|
|
+note:
|
|
|
+
|
|
|
+var view = window.IV.getMainView()
|
|
|
+//view.ImageService.images[1].datasetLocation 不会变 x: -4.330203 y: -0.906762 z: 0.09671
|
|
|
+//view.ImageService.images[1].location//变 数值类同datasetLocation
|
|
|
+
|
|
|
+//view.ImageService.images[1].globalLocation//不会变 113.59462372930076, y: 22.3671899047433, z: 0.09671
|
|
|
+//view.ImageService.images[1].orientation//变 转动后改变 且数值为0,0,....像是根据datasetOrientation变的
|
|
|
+view.ImageService.images[1].datasetOrientation// 不会变 从一开始就是 _w: 0.7071067811865475 _x: 0 _y: 0 _z: 0.7071067811865476 因为从0,0,0,1旋转了90度
|
|
|
+ _x: -0.0019120180091206306, _y: -0.00004242640687119291, _z: 0.7012926982087244, _w: 0.7128708717149407
|
|
|
+ */
|