@galacean/engine-ui 1.4.0-beta.2 → 1.4.0

package/dist/main.js

@@ -1082,7 +1082,9 @@ exports.UICanvas = /*#__PURE__*/ function(Component) {
         return _this;
     }
     var _proto = UICanvas.prototype;
-    _proto.raycast = function raycast(ray, out, distance) {
+    /**
+   * @internal
+   */ _proto._raycast = function _raycast(ray, out, distance) {
         if (distance === void 0) distance = Number.MAX_SAFE_INTEGER;
         var renderers = this._getRenderers();
         for(var i = renderers.length - 1; i >= 0; i--){
@@ -2894,11 +2896,13 @@ exports.UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
             if (!scene.isActive || scene.destroyed) continue;
             // @ts-ignore
             var componentsManager = scene._componentsManager;
-            /** Overlay Canvas */ var canvasElements = componentsManager._overlayCanvases;
-            ray.origin.set(position.x, position.y, 1);
+            // Overlay Canvas
+            var canvasElements = componentsManager._overlayCanvases;
+            // Screen to world ( Assume that world units have a one-to-one relationship with pixel units )
+            ray.origin.set(position.x, scene.engine.canvas.height - position.y, 1);
             ray.direction.set(0, 0, -1);
             for(var j = canvasElements.length - 1; j >= 0; j--){
-                if (canvasElements.get(j).raycast(ray, hitResult)) {
+                if (canvasElements.get(j)._raycast(ray, hitResult)) {
                     this._updateRaycast(hitResult.component, pointer);
                     return;
                 }
@@ -2912,9 +2916,11 @@ exports.UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
                     continue;
                 }
                 camera.screenPointToRay(pointer.position, ray);
-                /** Other canvases */ var isOrthographic = camera.isOrthographic;
+                // Other canvases
+                var isOrthographic = camera.isOrthographic;
                 var _camera_entity_transform = camera.entity.transform, cameraPosition = _camera_entity_transform.worldPosition, cameraForward = _camera_entity_transform.worldForward;
-                /** Sort by rendering order */ canvasElements = componentsManager._canvases;
+                // Sort by rendering order
+                canvasElements = componentsManager._canvases;
                 for(var k = 0, n = canvasElements.length; k < n; k++){
                     canvasElements.get(k)._updateSortDistance(isOrthographic, cameraPosition, cameraForward);
                 }
@@ -2925,10 +2931,11 @@ exports.UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
                     canvasElements.get(k1)._canvasIndex = k1;
                 }
                 var farClipPlane = camera.farClipPlane;
-                /** Post-rendering first detection */ for(var k2 = 0, n2 = canvasElements.length; k2 < n2; k2++){
+                // Post-rendering first detection
+                for(var k2 = 0, n2 = canvasElements.length; k2 < n2; k2++){
                     var canvas = canvasElements.get(k2);
                     if (!canvas._canRender(camera)) continue;
-                    if (canvas.raycast(ray, hitResult, farClipPlane)) {
+                    if (canvas._raycast(ray, hitResult, farClipPlane)) {
                         this._updateRaycast(hitResult.component, pointer);
                         return;
                     }
@@ -2938,6 +2945,7 @@ exports.UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
                     return;
                 }
             }
+            this._updateRaycast(null);
         }
     };
     _proto.processDrag = function processDrag(pointer) {