|
|
@@ -782,7 +782,7 @@ export class InputHandler extends THREE.EventDispatcher {
|
|
|
}
|
|
|
|
|
|
|
|
|
- ifBlockedByIntersect({point, margin=0, cameraPos, pickWindowSize, pano, useDepthTex}={}){//某点是否被遮挡(不允许camera修改位置, 因为depthTex不好置换)
|
|
|
+ ifBlockedByIntersect({point, margin=0, cameraPos, pickWindowSize, pano, useDepthTex, viewport}={}){//某点是否被遮挡(不允许camera修改位置, 因为depthTex不好置换)
|
|
|
viewport = viewport || this.hoverViewport || viewer.mainViewport
|
|
|
let intersect = this.getIntersect({viewport, onlyGetIntersect:true, pickWindowSize, useDepthTex, point, cameraPos, pano })
|
|
|
let cameraPos_ = (!cameraPos && pano) ? pano.position : (cameraPos||viewport.view.position)
|