@galacean/engine-core 1.1.0-beta.47 → 1.1.0-beta.49

package/dist/miniprogram.js

@@ -14488,7 +14488,9 @@ var Collision = function Collision() {
         };
         if (hitResult != undefined) {
             var result = this._nativePhysicsScene.raycast(ray, distance, onRaycast, function(idx, distance, position, normal) {
-                hitResult.entity = _this._scene.engine._physicalObjectsMap[idx]._collider.entity;
+                var hitShape = _this._scene.engine._physicalObjectsMap[idx];
+                hitResult.entity = hitShape._collider.entity;
+                hitResult.shape = hitShape;
                 hitResult.distance = distance;
                 hitResult.normal.copyFrom(normal);
                 hitResult.point.copyFrom(position);
@@ -14497,6 +14499,7 @@ var Collision = function Collision() {
                 return true;
             } else {
                 hitResult.entity = null;
+                hitResult.shape = null;
                 hitResult.distance = 0;
                 hitResult.point.set(0, 0, 0);
                 hitResult.normal.set(0, 0, 0);
@@ -15158,6 +15161,7 @@ exports.DynamicColliderConstraints = void 0;
     /** The distance from the ray's origin to the impact point. */ this.distance = 0;
     /** The impact point in world space where the ray hit the collider. */ this.point = new miniprogram.Vector3();
     /** The normal of the surface the ray hit. */ this.normal = new miniprogram.Vector3();
+    /** The shape of the collider that was hit. */ this.shape = null;
 };
 
 /**
@@ -22032,7 +22036,7 @@ var passNum = 0;
         }
         // make suer from the same renderer.
         if (componentA.instanceId === componentB.instanceId) {
-            return dataA.material._priority - dataB.material._priority || componentA._distanceForSort - componentB._distanceForSort;
+            return dataA.material._priority - dataB.material._priority;
         } else {
             var distanceDiff = componentA._distanceForSort - componentB._distanceForSort;
             if (distanceDiff === 0) {
@@ -22055,7 +22059,7 @@ var passNum = 0;
         }
         // make suer from the same renderer.
         if (componentA.instanceId === componentB.instanceId) {
-            return dataA.material._priority - dataB.material._priority || componentB._distanceForSort - componentA._distanceForSort;
+            return dataA.material._priority - dataB.material._priority;
         } else {
             var distanceDiff = componentB._distanceForSort - componentA._distanceForSort;
             if (distanceDiff === 0) {

package/dist/module.js

@@ -14483,7 +14483,9 @@ var Collision = function Collision() {
         };
         if (hitResult != undefined) {
             var result = this._nativePhysicsScene.raycast(ray, distance, onRaycast, function(idx, distance, position, normal) {
-                hitResult.entity = _this._scene.engine._physicalObjectsMap[idx]._collider.entity;
+                var hitShape = _this._scene.engine._physicalObjectsMap[idx];
+                hitResult.entity = hitShape._collider.entity;
+                hitResult.shape = hitShape;
                 hitResult.distance = distance;
                 hitResult.normal.copyFrom(normal);
                 hitResult.point.copyFrom(position);
@@ -14492,6 +14494,7 @@ var Collision = function Collision() {
                 return true;
             } else {
                 hitResult.entity = null;
+                hitResult.shape = null;
                 hitResult.distance = 0;
                 hitResult.point.set(0, 0, 0);
                 hitResult.normal.set(0, 0, 0);
@@ -15153,6 +15156,7 @@ var DynamicColliderConstraints;
     /** The distance from the ray's origin to the impact point. */ this.distance = 0;
     /** The impact point in world space where the ray hit the collider. */ this.point = new Vector3();
     /** The normal of the surface the ray hit. */ this.normal = new Vector3();
+    /** The shape of the collider that was hit. */ this.shape = null;
 };
 
 /**
@@ -22027,7 +22031,7 @@ var passNum = 0;
         }
         // make suer from the same renderer.
         if (componentA.instanceId === componentB.instanceId) {
-            return dataA.material._priority - dataB.material._priority || componentA._distanceForSort - componentB._distanceForSort;
+            return dataA.material._priority - dataB.material._priority;
         } else {
             var distanceDiff = componentA._distanceForSort - componentB._distanceForSort;
             if (distanceDiff === 0) {
@@ -22050,7 +22054,7 @@ var passNum = 0;
         }
         // make suer from the same renderer.
         if (componentA.instanceId === componentB.instanceId) {
-            return dataA.material._priority - dataB.material._priority || componentB._distanceForSort - componentA._distanceForSort;
+            return dataA.material._priority - dataB.material._priority;
         } else {
             var distanceDiff = componentB._distanceForSort - componentA._distanceForSort;
             if (distanceDiff === 0) {