|
@@ -214,9 +214,9 @@ var enter = ({
|
|
bus.emit("update");
|
|
bus.emit("update");
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- measure.addEventListener("highlight", (e) => {
|
|
|
|
|
|
+ /* measure.addEventListener("highlight", (e) => {
|
|
bus.emit("highlight", e.state);
|
|
bus.emit("highlight", e.state);
|
|
- });
|
|
|
|
|
|
+ }); */
|
|
|
|
|
|
measure.addEventListener("selected", (e) => {
|
|
measure.addEventListener("selected", (e) => {
|
|
bus.emit("selected", e.state);
|
|
bus.emit("selected", e.state);
|
|
@@ -688,7 +688,8 @@ var enter = ({
|
|
|
|
|
|
screenshot: (width, height) => {
|
|
screenshot: (width, height) => {
|
|
//截图
|
|
//截图
|
|
- isScreenshoting = true;
|
|
|
|
|
|
+ let meterPerPixel,
|
|
|
|
+ isScreenshoting = true;
|
|
var {
|
|
var {
|
|
getImagePromise,
|
|
getImagePromise,
|
|
finishPromise
|
|
finishPromise
|
|
@@ -700,7 +701,10 @@ var enter = ({
|
|
finishPromise.done(() => {
|
|
finishPromise.done(() => {
|
|
isScreenshoting = false;
|
|
isScreenshoting = false;
|
|
});
|
|
});
|
|
- return finishPromise;
|
|
|
|
|
|
+ if(viewer.mainViewport.camera.type == 'OrthographicCamera'){
|
|
|
|
+ meterPerPixel = 1 / viewer.mainViewport.camera.zoom
|
|
|
|
+ }
|
|
|
|
+ return {finishPromise, meterPerPixel};
|
|
},
|
|
},
|
|
|
|
|
|
canTurnToPanoMode(pos) {
|
|
canTurnToPanoMode(pos) {
|
|
@@ -737,7 +741,7 @@ var enter = ({
|
|
}
|
|
}
|
|
|
|
|
|
let gotIntersect = (e)=>{
|
|
let gotIntersect = (e)=>{
|
|
- if(e.intersect){
|
|
|
|
|
|
+ if(e.intersect && e.intersect.location){
|
|
console.log('quit', e.intersect.location)
|
|
console.log('quit', e.intersect.location)
|
|
quit()
|
|
quit()
|
|
deferred.resolve(e.intersect.location)
|
|
deferred.resolve(e.intersect.location)
|