@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/browser.js
CHANGED
|
@@ -1082,7 +1082,9 @@
|
|
|
1082
1082
|
return _this;
|
|
1083
1083
|
}
|
|
1084
1084
|
var _proto = UICanvas.prototype;
|
|
1085
|
-
|
|
1085
|
+
/**
|
|
1086
|
+
* @internal
|
|
1087
|
+
*/ _proto._raycast = function _raycast(ray, out, distance) {
|
|
1086
1088
|
if (distance === void 0) distance = Number.MAX_SAFE_INTEGER;
|
|
1087
1089
|
var renderers = this._getRenderers();
|
|
1088
1090
|
for(var i = renderers.length - 1; i >= 0; i--){
|
|
@@ -2894,11 +2896,13 @@
|
|
|
2894
2896
|
if (!scene.isActive || scene.destroyed) continue;
|
|
2895
2897
|
// @ts-ignore
|
|
2896
2898
|
var componentsManager = scene._componentsManager;
|
|
2897
|
-
|
|
2898
|
-
|
|
2899
|
+
// Overlay Canvas
|
|
2900
|
+
var canvasElements = componentsManager._overlayCanvases;
|
|
2901
|
+
// Screen to world ( Assume that world units have a one-to-one relationship with pixel units )
|
|
2902
|
+
ray.origin.set(position.x, scene.engine.canvas.height - position.y, 1);
|
|
2899
2903
|
ray.direction.set(0, 0, -1);
|
|
2900
2904
|
for(var j = canvasElements.length - 1; j >= 0; j--){
|
|
2901
|
-
if (canvasElements.get(j).
|
|
2905
|
+
if (canvasElements.get(j)._raycast(ray, hitResult)) {
|
|
2902
2906
|
this._updateRaycast(hitResult.component, pointer);
|
|
2903
2907
|
return;
|
|
2904
2908
|
}
|
|
@@ -2912,9 +2916,11 @@
|
|
|
2912
2916
|
continue;
|
|
2913
2917
|
}
|
|
2914
2918
|
camera.screenPointToRay(pointer.position, ray);
|
|
2915
|
-
|
|
2919
|
+
// Other canvases
|
|
2920
|
+
var isOrthographic = camera.isOrthographic;
|
|
2916
2921
|
var _camera_entity_transform = camera.entity.transform, cameraPosition = _camera_entity_transform.worldPosition, cameraForward = _camera_entity_transform.worldForward;
|
|
2917
|
-
|
|
2922
|
+
// Sort by rendering order
|
|
2923
|
+
canvasElements = componentsManager._canvases;
|
|
2918
2924
|
for(var k = 0, n = canvasElements.length; k < n; k++){
|
|
2919
2925
|
canvasElements.get(k)._updateSortDistance(isOrthographic, cameraPosition, cameraForward);
|
|
2920
2926
|
}
|
|
@@ -2925,10 +2931,11 @@
|
|
|
2925
2931
|
canvasElements.get(k1)._canvasIndex = k1;
|
|
2926
2932
|
}
|
|
2927
2933
|
var farClipPlane = camera.farClipPlane;
|
|
2928
|
-
|
|
2934
|
+
// Post-rendering first detection
|
|
2935
|
+
for(var k2 = 0, n2 = canvasElements.length; k2 < n2; k2++){
|
|
2929
2936
|
var canvas = canvasElements.get(k2);
|
|
2930
2937
|
if (!canvas._canRender(camera)) continue;
|
|
2931
|
-
if (canvas.
|
|
2938
|
+
if (canvas._raycast(ray, hitResult, farClipPlane)) {
|
|
2932
2939
|
this._updateRaycast(hitResult.component, pointer);
|
|
2933
2940
|
return;
|
|
2934
2941
|
}
|
|
@@ -2938,6 +2945,7 @@
|
|
|
2938
2945
|
return;
|
|
2939
2946
|
}
|
|
2940
2947
|
}
|
|
2948
|
+
this._updateRaycast(null);
|
|
2941
2949
|
}
|
|
2942
2950
|
};
|
|
2943
2951
|
_proto.processDrag = function processDrag(pointer) {
|