@galacean/engine-core 0.0.0-experimental-2.0-game.12 → 0.0.0-experimental-2.0-game.13

package/dist/main.js

@@ -7801,7 +7801,13 @@ ShaderFactory._std140TypeInfoMap = {
 };
 ShaderFactory._has300OutInFragReg = /\bout\s+(?:\w+\s+)?vec4\s+\w+\s*;/;
 ShaderFactory._precisionStr = "\n#ifdef GL_FRAGMENT_PRECISION_HIGH\n  precision highp float;\n  precision highp int;\n#else\n  precision mediump float;\n  precision mediump int;\n#endif\n";
-ShaderFactory._derivedDefines = "#define renderer_MVMat (camera_ViewMat * renderer_ModelMat)\n#define renderer_MVPMat (camera_VPMat * renderer_ModelMat)\n#define renderer_NormalMat mat4(transpose(inverse(mat3(renderer_ModelMat))))";
+// Derived built-ins re-exposed on top of `renderer_ModelMat`.
+// `renderer_NormalMat` uses the cofactor (cross-product) form, which algebraically equals
+// `det(M) · transpose(inverse(M))`. After `normalize()` it's directionally identical to the
+// classic `transpose(inverse(M))`, but stays NaN-free when `M` is singular (e.g. any scale
+// axis is 0 — common in animations that pop / hide via scale). `sign(det)` (`s` below)
+// keeps mirrored matrices facing the right way
+ShaderFactory._derivedDefines = "mat3 _normalMatFromModel(mat3 m) {\n    vec3 c0 = cross(m[1], m[2]);\n    vec3 c1 = cross(m[2], m[0]);\n    vec3 c2 = cross(m[0], m[1]);\n    float s = (dot(m[0], c0) < 0.0) ? -1.0 : 1.0;\n    return mat3(c0 * s, c1 * s, c2 * s);\n}\n#define renderer_MVMat (camera_ViewMat * renderer_ModelMat)\n#define renderer_MVPMat (camera_VPMat * renderer_ModelMat)\n#define renderer_NormalMat mat4(_normalMatFromModel(mat3(renderer_ModelMat)))";
 // Built-in renderer uniforms. value=true means derived (remove but not added to UBO)
 ShaderFactory._builtinRendererUniforms = {
     renderer_ModelMat: false,
@@ -19119,7 +19125,7 @@ RenderContext._flipYViewProjectionMatrix = new engineMath.Matrix();
     /** Scene. */ AssetType["Scene"] = "Scene";
     /** Font. */ AssetType["Font"] = "Font";
     /** Source Font, include ttf, otf and woff. */ AssetType["SourceFont"] = "SourceFont";
-    /** AudioClip, include ogg, wav and mp3. */ AssetType["Audio"] = "Audio";
+    /** AudioClip, include ogg, wav, mp3, m4a, aac and flac. */ AssetType["Audio"] = "Audio";
     /** Project asset. */ AssetType["Project"] = "project";
     /** PhysicsMaterial. */ AssetType["PhysicsMaterial"] = "PhysicsMaterial";
     /** RenderTarget. */ AssetType["RenderTarget"] = "RenderTarget";
@@ -22029,8 +22035,7 @@ __decorate([
    * You need to obtain the actual number of contact points from the function's return value.
    */ _proto.getContacts = function getContacts(outContacts) {
         var nativeCollision = this._nativeCollision;
-        var smallerShapeId = Math.min(nativeCollision.shape0Id, nativeCollision.shape1Id);
-        var factor = this.shape.id === smallerShapeId ? 1 : -1;
+        var factor = this.shape.id === nativeCollision.shape1Id ? 1 : -1;
         var nativeContactPoints = nativeCollision.getContacts();
         var length = nativeContactPoints.size();
         for(var i = 0; i < length; i++){
@@ -33696,8 +33701,8 @@ function _type_of(obj) {
         if (this._tryCrossFadeInterrupt(layerData, transitionDuration, destState, deltaTime, aniUpdate)) {
             return;
         }
-        var srcPlaySpeed = srcState.speed * speed;
-        var dstPlaySpeed = destState.speed * speed;
+        var srcPlaySpeed = srcPlayData.speed * speed;
+        var dstPlaySpeed = destPlayData.speed * speed;
         var dstPlayDeltaTime = dstPlaySpeed * deltaTime;
         srcPlayData && srcPlayData.updateOrientation(srcPlaySpeed * deltaTime);
         destPlayData && destPlayData.updateOrientation(dstPlayDeltaTime);