@galacean/engine 1.1.0-beta.46 → 1.1.0-beta.49

package/dist/browser.js

@@ -19257,7 +19257,9 @@
             };
             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);
@@ -19266,6 +19268,7 @@
                     return true;
                 } else {
                     hitResult.entity = null;
+                    hitResult.shape = null;
                     hitResult.distance = 0;
                     hitResult.point.set(0, 0, 0);
                     hitResult.normal.set(0, 0, 0);
@@ -19923,6 +19926,7 @@
         /** 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;
     };
     /**
      * Describes how physics materials of the colliding objects are combined.
@@ -26713,7 +26717,7 @@
             }
             // 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) {
@@ -26736,7 +26740,7 @@
             }
             // 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) {
@@ -36028,7 +36032,7 @@
             var cap = this.capabilityList;
             var isWebGL2 = this.rhi.isWebGL2;
             var requireExtension = this.rhi.requireExtension.bind(this.rhi);
-            var shaderVertexID = exports.GLCapabilityType.shaderVertexID, standardDerivatives = exports.GLCapabilityType.standardDerivatives, shaderTextureLod = exports.GLCapabilityType.shaderTextureLod, elementIndexUint = exports.GLCapabilityType.elementIndexUint, depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, multipleSample = exports.GLCapabilityType.multipleSample, drawBuffers = exports.GLCapabilityType.drawBuffers, astc = exports.GLCapabilityType.astc, astc_webkit = exports.GLCapabilityType.astc_webkit, etc = exports.GLCapabilityType.etc, etc_webkit = exports.GLCapabilityType.etc_webkit, etc1 = exports.GLCapabilityType.etc1, etc1_webkit = exports.GLCapabilityType.etc1_webkit, pvrtc = exports.GLCapabilityType.pvrtc, pvrtc_webkit = exports.GLCapabilityType.pvrtc_webkit, s3tc = exports.GLCapabilityType.s3tc, s3tc_webkit = exports.GLCapabilityType.s3tc_webkit, bptc = exports.GLCapabilityType.bptc, textureFloat = exports.GLCapabilityType.textureFloat, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, textureFloatLinear = exports.GLCapabilityType.textureFloatLinear, textureHalfFloatLinear = exports.GLCapabilityType.textureHalfFloatLinear, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat, colorBufferFloat = exports.GLCapabilityType.colorBufferFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic;
+            var shaderVertexID = exports.GLCapabilityType.shaderVertexID, standardDerivatives = exports.GLCapabilityType.standardDerivatives, shaderTextureLod = exports.GLCapabilityType.shaderTextureLod, elementIndexUint = exports.GLCapabilityType.elementIndexUint, depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, multipleSample = exports.GLCapabilityType.multipleSample, drawBuffers = exports.GLCapabilityType.drawBuffers, blendMinMax = exports.GLCapabilityType.blendMinMax, astc = exports.GLCapabilityType.astc, astc_webkit = exports.GLCapabilityType.astc_webkit, etc = exports.GLCapabilityType.etc, etc_webkit = exports.GLCapabilityType.etc_webkit, etc1 = exports.GLCapabilityType.etc1, etc1_webkit = exports.GLCapabilityType.etc1_webkit, pvrtc = exports.GLCapabilityType.pvrtc, pvrtc_webkit = exports.GLCapabilityType.pvrtc_webkit, s3tc = exports.GLCapabilityType.s3tc, s3tc_webkit = exports.GLCapabilityType.s3tc_webkit, bptc = exports.GLCapabilityType.bptc, textureFloat = exports.GLCapabilityType.textureFloat, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, textureFloatLinear = exports.GLCapabilityType.textureFloatLinear, textureHalfFloatLinear = exports.GLCapabilityType.textureHalfFloatLinear, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat, colorBufferFloat = exports.GLCapabilityType.colorBufferFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic;
             cap.set(shaderVertexID, isWebGL2);
             cap.set(standardDerivatives, isWebGL2 || !!requireExtension(standardDerivatives));
             cap.set(shaderTextureLod, isWebGL2 || !!requireExtension(shaderTextureLod));
@@ -36038,6 +36042,7 @@
             cap.set(instancedArrays, isWebGL2 || !!requireExtension(instancedArrays));
             cap.set(multipleSample, isWebGL2);
             cap.set(drawBuffers, isWebGL2 || !!requireExtension(drawBuffers));
+            cap.set(blendMinMax, isWebGL2 || !!requireExtension(blendMinMax));
             cap.set(textureFloat, isWebGL2 || !!requireExtension(textureFloat));
             cap.set(textureHalfFloat, isWebGL2 || !!requireExtension(textureHalfFloat));
             cap.set(textureFloatLinear, !!requireExtension(textureFloatLinear));
@@ -36078,9 +36083,13 @@
             }
         };
         _proto._compatibleAllInterface = function _compatibleAllInterface() {
-            var depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, drawBuffers = exports.GLCapabilityType.drawBuffers, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat;
+            var depthTexture = exports.GLCapabilityType.depthTexture, vertexArrayObject = exports.GLCapabilityType.vertexArrayObject, instancedArrays = exports.GLCapabilityType.instancedArrays, drawBuffers = exports.GLCapabilityType.drawBuffers, textureFilterAnisotropic = exports.GLCapabilityType.textureFilterAnisotropic, textureHalfFloat = exports.GLCapabilityType.textureHalfFloat, colorBufferHalfFloat = exports.GLCapabilityType.colorBufferHalfFloat, WEBGL_colorBufferFloat = exports.GLCapabilityType.WEBGL_colorBufferFloat, blendMinMax = exports.GLCapabilityType.blendMinMax;
             var isWebGL2 = this.rhi.isWebGL2;
             if (!isWebGL2) {
+                this._compatibleInterface(blendMinMax, {
+                    MIN: "MIN_EXT",
+                    MAX: "MAX_EXT"
+                });
                 this._compatibleInterface(depthTexture, {
                     UNSIGNED_INT_24_8: "UNSIGNED_INT_24_8_WEBGL"
                 });
@@ -40003,7 +40012,7 @@
         };
         /**
        * Parse the glb format.
-       */ GLTFUtils.parseGLB = function parseGLB(context, glb) {
+       */ GLTFUtils.parseGLB = function parseGLB(context, originBuffer) {
             var UINT32_LENGTH = 4;
             var GLB_HEADER_MAGIC = 0x46546c67; // 'glTF'
             var GLB_HEADER_LENGTH = 12;
@@ -40011,7 +40020,7 @@
                 JSON: 0x4e4f534a,
                 BIN: 0x004e4942
             };
-            var dataView = new DataView(glb);
+            var dataView = new DataView(originBuffer);
             // read header
             var header = {
                 magic: dataView.getUint32(0, true),
@@ -40019,8 +40028,9 @@
                 length: dataView.getUint32(2 * UINT32_LENGTH, true)
             };
             if (header.magic !== GLB_HEADER_MAGIC) {
-                console.error("Invalid glb magic number. Expected 0x46546C67, found 0x" + header.magic.toString(16));
-                return null;
+                return {
+                    originBuffer: originBuffer
+                };
             }
             // read main data
             var chunkLength = dataView.getUint32(GLB_HEADER_LENGTH, true);
@@ -40030,7 +40040,7 @@
                 console.error("Invalid glb chunk type. Expected 0x4E4F534A, found 0x" + chunkType.toString(16));
                 return null;
             }
-            var glTFData = new Uint8Array(glb, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
+            var glTFData = new Uint8Array(originBuffer, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
             var glTF = JSON.parse(Utils.decodeText(glTFData));
             // read all buffers
             var buffers = [];
@@ -40044,7 +40054,7 @@
                     return null;
                 }
                 var currentOffset = byteOffset + 2 * UINT32_LENGTH;
-                var buffer = glb.slice(currentOffset, currentOffset + chunkLength);
+                var buffer = originBuffer.slice(currentOffset, currentOffset + chunkLength);
                 buffers.push(buffer);
                 restoreGLBBufferSlice.push(new Vector2(currentOffset, chunkLength));
                 byteOffset += chunkLength + 2 * UINT32_LENGTH;
@@ -41440,23 +41450,20 @@
             var requestConfig = {
                 type: "arraybuffer"
             };
-            var isGLB = this._isGLB(url);
-            contentRestorer.isGLB = isGLB;
-            var promise = isGLB ? request(url, requestConfig).then(function(glb) {
+            return request(url, requestConfig).then(function(buffer) {
                 restoreBufferRequests.push(new BufferRequestInfo(url, requestConfig));
-                return GLTFUtils.parseGLB(context, glb);
-            }).then(function(param) {
-                var glTF = param.glTF, buffers = param.buffers;
-                context.buffers = buffers;
-                return glTF;
-            }) : request(url, {
-                type: "json"
+                return GLTFUtils.parseGLB(context, buffer);
+            }).then(function(result) {
+                var _result;
+                if ((_result = result) == null ? void 0 : _result.glTF) {
+                    contentRestorer.isGLB = true;
+                    context.buffers = result.buffers;
+                    return result.glTF;
+                } else {
+                    contentRestorer.isGLB = false;
+                    return JSON.parse(Utils.decodeText(new Uint8Array(result.originBuffer)));
+                }
             });
-            return promise;
-        };
-        _proto._isGLB = function _isGLB(url) {
-            var index = url.lastIndexOf(".");
-            return url.substring(index + 1, index + 4) === "glb";
         };
         return GLTFSchemaParser;
     }(GLTFParser);
@@ -44090,7 +44097,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.46";
+    var version = "1.1.0-beta.49";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);