|
|
@@ -1273,7 +1273,7 @@ export class Images360 extends THREE.EventDispatcher{
|
|
|
/* if(this.panos.length > 15 && !force){
|
|
|
return 'noCompute' //数量过多会卡
|
|
|
}else{ */
|
|
|
- /* ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({pos3d:pano1.position, margin, cameraPos:pano0.position})
|
|
|
+ /* ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({point:pano1.position, margin, cameraPos:pano0.position})
|
|
|
//console.log('使用点云判断')
|
|
|
if(ifNeighbour){//点云模式下未加载的点云会判断为true
|
|
|
let dir = new THREE.Vector3().subVectors(pano1.position,pano0.position).normalize()
|
|
|
@@ -1297,10 +1297,10 @@ export class Images360 extends THREE.EventDispatcher{
|
|
|
}
|
|
|
if(computeDirFirst){//先计算方向，防止重复计算ifBlockedByIntersect
|
|
|
if(inDirection()){
|
|
|
- ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({pos3d:pano1.position, margin, cameraPos:pano0.position})
|
|
|
+ ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({point:pano1.position, margin, cameraPos:pano0.position})
|
|
|
}
|
|
|
}else{
|
|
|
- ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({pos3d:pano1.position, margin, cameraPos:pano0.position})
|
|
|
+ ifNeighbour = !viewer.inputHandler.ifBlockedByIntersect({point:pano1.position, margin, cameraPos:pano0.position})
|
|
|
if(ifNeighbour && !inDirection()){
|
|
|
ifNeighbour = undefined //不确定
|
|
|
}
|
|
|
@@ -1820,7 +1820,7 @@ export class Images360 extends THREE.EventDispatcher{
|
|
|
(pano)=>{
|
|
|
let score = 0
|
|
|
if(pano.depthTex && checkIntersect){
|
|
|
- let intersect = !!viewer.ifPointBlockedByIntersect(target, pano.id, true) //viewer.inputHandler.ifBlockedByIntersect({pos3d:target, margin:0.1, cameraPos:pano})
|
|
|
+ let intersect = !!viewer.ifPointBlockedByIntersect(target, pano.id, true) //viewer.inputHandler.ifBlockedByIntersect({point:target, margin:0.1, cameraPos:pano})
|
|
|
if(intersect){
|
|
|
score = 0
|
|
|
}else {
|
xzw