|
@@ -21406,11 +21406,13 @@ function o(a, s, l) {
|
|
|
this.intersectHot && CursorDeal.add('hoverHot' ) //$("#player").css("cursor", "pointer");
|
|
|
|
|
|
}
|
|
|
- }
|
|
|
+ }else{
|
|
|
+ this.intersect = this.getMouseIntersect()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
- this.intersect = this.getMouseIntersect(),
|
|
|
+
|
|
|
this.intersect && this.updateClosestPano(this.intersect),
|
|
|
this.closestPano || this.closestPanoInDirection(this.getMouseDirection()) ? (this.reticule.updatePosition(this.position, this.intersect),
|
|
|
k.navigation.panoScores && !k.navigation.mouseDirection && this.closestPanoInDirection(this.getDirection())) : this.reticule.hide()
|
|
@@ -21499,14 +21501,16 @@ function o(a, s, l) {
|
|
|
var t = t1 || this.model.floors.reduce(function(e, t) {
|
|
|
return t.hidden ? e : e.concat(t.collider.children)
|
|
|
}, this.mode === V.PANORAMA ? this.panoMarkers : []),
|
|
|
- t = t.slice(0)
|
|
|
+ t = t.slice(0)
|
|
|
+
|
|
|
+
|
|
|
i = new B.Vector3(e.x,e.y,-1).unproject(this.camera);
|
|
|
this.raycaster.set(i, this.getMouseDirection(e));
|
|
|
var n = this.raycaster.intersectObjects(t , true );//add true
|
|
|
|
|
|
var o = n[0];
|
|
|
|
|
|
- if(o){
|
|
|
+ if(o){
|
|
|
o.face && (o.normal = o.face.normal.applyQuaternion(o.object.quaternion),
|
|
|
this.position.clone().sub(o.point).dot(o.normal) < 0 && o.normal.negate(),
|
|
|
this.currentPano ? o.onFloor = o.point.y < this.position.y - .5 * this.currentPano.height : o.onFloor = o.point.y < this.position.y - .5,
|