@galacean/engine-ui 1.4.0-beta.2 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser.js +16 -8
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +16 -8
- package/dist/main.js.map +1 -1
- package/dist/module.js +16 -8
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/component/UICanvas.d.ts +1 -3
package/dist/module.js
CHANGED
|
@@ -1078,7 +1078,9 @@ var UICanvas = /*#__PURE__*/ function(Component) {
|
|
|
1078
1078
|
return _this;
|
|
1079
1079
|
}
|
|
1080
1080
|
var _proto = UICanvas.prototype;
|
|
1081
|
-
|
|
1081
|
+
/**
|
|
1082
|
+
* @internal
|
|
1083
|
+
*/ _proto._raycast = function _raycast(ray, out, distance) {
|
|
1082
1084
|
if (distance === void 0) distance = Number.MAX_SAFE_INTEGER;
|
|
1083
1085
|
var renderers = this._getRenderers();
|
|
1084
1086
|
for(var i = renderers.length - 1; i >= 0; i--){
|
|
@@ -2890,11 +2892,13 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
|
|
|
2890
2892
|
if (!scene.isActive || scene.destroyed) continue;
|
|
2891
2893
|
// @ts-ignore
|
|
2892
2894
|
var componentsManager = scene._componentsManager;
|
|
2893
|
-
|
|
2894
|
-
|
|
2895
|
+
// Overlay Canvas
|
|
2896
|
+
var canvasElements = componentsManager._overlayCanvases;
|
|
2897
|
+
// Screen to world ( Assume that world units have a one-to-one relationship with pixel units )
|
|
2898
|
+
ray.origin.set(position.x, scene.engine.canvas.height - position.y, 1);
|
|
2895
2899
|
ray.direction.set(0, 0, -1);
|
|
2896
2900
|
for(var j = canvasElements.length - 1; j >= 0; j--){
|
|
2897
|
-
if (canvasElements.get(j).
|
|
2901
|
+
if (canvasElements.get(j)._raycast(ray, hitResult)) {
|
|
2898
2902
|
this._updateRaycast(hitResult.component, pointer);
|
|
2899
2903
|
return;
|
|
2900
2904
|
}
|
|
@@ -2908,9 +2912,11 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
|
|
|
2908
2912
|
continue;
|
|
2909
2913
|
}
|
|
2910
2914
|
camera.screenPointToRay(pointer.position, ray);
|
|
2911
|
-
|
|
2915
|
+
// Other canvases
|
|
2916
|
+
var isOrthographic = camera.isOrthographic;
|
|
2912
2917
|
var _camera_entity_transform = camera.entity.transform, cameraPosition = _camera_entity_transform.worldPosition, cameraForward = _camera_entity_transform.worldForward;
|
|
2913
|
-
|
|
2918
|
+
// Sort by rendering order
|
|
2919
|
+
canvasElements = componentsManager._canvases;
|
|
2914
2920
|
for(var k = 0, n = canvasElements.length; k < n; k++){
|
|
2915
2921
|
canvasElements.get(k)._updateSortDistance(isOrthographic, cameraPosition, cameraForward);
|
|
2916
2922
|
}
|
|
@@ -2921,10 +2927,11 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
|
|
|
2921
2927
|
canvasElements.get(k1)._canvasIndex = k1;
|
|
2922
2928
|
}
|
|
2923
2929
|
var farClipPlane = camera.farClipPlane;
|
|
2924
|
-
|
|
2930
|
+
// Post-rendering first detection
|
|
2931
|
+
for(var k2 = 0, n2 = canvasElements.length; k2 < n2; k2++){
|
|
2925
2932
|
var canvas = canvasElements.get(k2);
|
|
2926
2933
|
if (!canvas._canRender(camera)) continue;
|
|
2927
|
-
if (canvas.
|
|
2934
|
+
if (canvas._raycast(ray, hitResult, farClipPlane)) {
|
|
2928
2935
|
this._updateRaycast(hitResult.component, pointer);
|
|
2929
2936
|
return;
|
|
2930
2937
|
}
|
|
@@ -2934,6 +2941,7 @@ var UIPointerEventEmitter = /*#__PURE__*/ function(PointerEventEmitter1) {
|
|
|
2934
2941
|
return;
|
|
2935
2942
|
}
|
|
2936
2943
|
}
|
|
2944
|
+
this._updateRaycast(null);
|
|
2937
2945
|
}
|
|
2938
2946
|
};
|
|
2939
2947
|
_proto.processDrag = function processDrag(pointer) {
|