|
@@ -54329,7 +54329,7 @@
|
|
|
viewport.tranAimCamera = info.endCamera;
|
|
|
|
|
|
//viewport.camera.matrixWorld = info.endCamera.matrixWorld
|
|
|
- console.log('tranCamera');
|
|
|
+ //console.log('tranCamera')
|
|
|
|
|
|
//viewer.setCameraMode(CameraMode.ORTHOGRAPHIC)
|
|
|
info.midCamera.projectionMatrix.copy(info.startCamera.projectionMatrix);
|
|
@@ -54355,7 +54355,7 @@
|
|
|
this.applyToCamera(viewport.camera);
|
|
|
viewer.dispatchEvent({type:'camera_changed', viewport:viewer.mainViewport, changeInfo:{}});//update sprite
|
|
|
|
|
|
- console.log('tranCamera end');
|
|
|
+ //console.log('tranCamera end')
|
|
|
callback && callback();
|
|
|
};
|
|
|
info.forbitCancel = true;
|
|
@@ -91739,7 +91739,7 @@ void main()
|
|
|
|
|
|
|
|
|
}
|
|
|
- console.log('变成正交');
|
|
|
+ //console.log('变成正交')
|
|
|
viewer.focusOnObject(viewer.bound, 'boundingBox', 1000, {
|
|
|
endPitch: pitch, endYaw: yaw , dir, startCamera, endCamera
|
|
|
}).promise.done(()=>{
|
|
@@ -139181,12 +139181,17 @@ ENDSEC
|
|
|
|
|
|
startScreenshot(info={}, width=800, height=400, compressRatio ){//add
|
|
|
//let deferred = info.deferred || $.Deferred();
|
|
|
+
|
|
|
+ console.log('截图4');
|
|
|
+
|
|
|
let getImageDeferred = info.getImageDeferred || $.Deferred();
|
|
|
+
|
|
|
+
|
|
|
let finishDeferred = info.finishDeferred || $.Deferred();
|
|
|
-
|
|
|
+ console.log('截图5');
|
|
|
let viewerMaster = info.map ? this.mapViewer : this; //截图主体
|
|
|
let useMap = info.type == 'measure' || info.map;
|
|
|
-
|
|
|
+ console.log('截图6');
|
|
|
|
|
|
if(Potree.settings.displayMode == 'showPanos' && viewer.scene.view.isFlying('pos')){//如果在飞,飞完再截图
|
|
|
info.getImageDeferred = getImageDeferred , info.finishDeferred = finishDeferred;
|
|
@@ -139197,7 +139202,7 @@ ENDSEC
|
|
|
|
|
|
return {getImagePromise:getImageDeferred.promise(), finishPromise:finishDeferred.promise()}
|
|
|
}
|
|
|
-
|
|
|
+ console.log('截图7');
|
|
|
var sid = Date.now();
|
|
|
//抗锯齿待加 1 post处理 2截图大张再抗锯齿缩小
|
|
|
|