@galacean/engine 1.4.0-beta.1 → 1.4.0

package/dist/browser.js

@@ -10868,8 +10868,6 @@
             //@ts-ignore
             this._viewport._onValueChanged = null;
             this.engine.canvas._sizeUpdateFlagManager.removeListener(this._onPixelViewportChanged);
-            this._updateFlagManager = null;
-            this._entity = null;
             this._globalShaderMacro = null;
             this._frustum = null;
             this._renderPipeline = null;
@@ -15137,7 +15135,6 @@
                 var material = materials[i];
                 material && this._addResourceReferCount(material, -1);
             }
-            this._entity = null;
             this._globalShaderMacro = null;
             this._bounds = null;
             this._materials = null;
@@ -22443,7 +22440,6 @@
                 this._setParent(null);
             }
             this.isActive = false;
-            this._updateFlagManager = null;
         };
         /**
        * @internal
@@ -25558,7 +25554,7 @@
      * Describes a contact point where the collision occurs.
      */ var ContactPoint = function ContactPoint() {
         /** The position of the contact point between the shapes, in world space. */ this.position = new Vector3();
-        /** The normal of the contacting surfaces at the contact point. The normal direction points from the second shape to the first shape. */ this.normal = new Vector3();
+        /** The normal of the contacting surfaces at the contact point. The normal direction points from the other shape to the self shape. */ this.normal = new Vector3();
         /** The impulse applied at the contact point, in world space. Divide by the simulation time step to get a force value. */ this.impulse = new Vector3();
     };
     /**
@@ -25575,7 +25571,8 @@
        * 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 factor = nativeCollision.shape0Id < nativeCollision.shape1Id ? 1 : -1;
+            var smallerShapeId = Math.min(nativeCollision.shape0Id, nativeCollision.shape1Id);
+            var factor = this.shape.id === smallerShapeId ? 1 : -1;
             var nativeContactPoints = nativeCollision.getContacts();
             var length = nativeContactPoints.size();
             for(var i = 0; i < length; i++){
@@ -28131,6 +28128,8 @@
                 var currY = (latestEvent.clientY - top) * heightPixelRatio;
                 pointer.deltaPosition.set(currX - position.x, currY - position.y);
                 position.set(currX, currY);
+                pointer.button = _pointerDec2BinMap[latestEvent.button] || PointerButton.None;
+                pointer.pressedButtons = latestEvent.buttons;
                 for(var i = 0; i < length; i++){
                     var event = events[i];
                     switch(event.type){
@@ -29298,11 +29297,16 @@
     }();
     var UIUtils = /*#__PURE__*/ function() {
         function UIUtils() {}
-        UIUtils.renderOverlay = function renderOverlay(engine, uiCanvases) {
+        UIUtils.renderOverlay = function renderOverlay(engine, scene, uiCanvases) {
+            var canvas = engine.canvas, rhi = engine._hardwareRenderer, renderContext = engine._renderContext, batcherManager = engine._batcherManager;
             var uiRenderQueue = this._renderQueue || (this._renderQueue = new RenderQueue(RenderQueueType.Transparent));
             var virtualCamera = this._virtualCamera || (this._virtualCamera = new VirtualCamera());
             var viewport = this._viewport || (this._viewport = new Vector4(0, 0, 1, 1));
-            var canvas = engine.canvas, rhi = engine._hardwareRenderer, renderContext = engine._renderContext, batcherManager = engine._batcherManager;
+            // @ts-ignore
+            var camera = this._overlayCamera || (this._overlayCamera = new OverlayCamera());
+            camera.engine = engine;
+            camera.scene = scene;
+            renderContext.camera = camera;
             var _virtualCamera_projectionMatrix = virtualCamera.projectionMatrix, projectE = _virtualCamera_projectionMatrix.elements;
             var _virtualCamera_viewMatrix = virtualCamera.viewMatrix, viewE = _virtualCamera_viewMatrix.elements;
             projectE[0] = 2 / canvas.width, projectE[5] = 2 / canvas.height, projectE[10] = 0;
@@ -29310,8 +29314,8 @@
             for(var i = 0, n = uiCanvases.length; i < n; i++){
                 var uiCanvas = uiCanvases.get(i);
                 if (uiCanvas) {
-                    var transform = uiCanvas.entity.transform;
-                    viewE[12] = -transform.position.x, viewE[13] = -transform.position.y;
+                    var position = uiCanvas.entity.transform.position;
+                    viewE[12] = -position.x, viewE[13] = -position.y;
                     Matrix.multiply(virtualCamera.projectionMatrix, virtualCamera.viewMatrix, virtualCamera.viewProjectionMatrix);
                     renderContext.applyVirtualCamera(virtualCamera, false);
                     renderContext.rendererUpdateFlag |= ContextRendererUpdateFlag.ProjectionMatrix;
@@ -29327,6 +29331,14 @@
         };
         return UIUtils;
     }();
+    var OverlayCamera = function OverlayCamera() {
+        // @ts-ignore
+        this.instanceId = ++EngineObject._instanceIdCounter;
+        this.shaderData = new ShaderData(ShaderDataGroup.Camera);
+        this.enableFrustumCulling = true;
+        this.cullingMask = Layer.Everything;
+        this._globalShaderMacro = new ShaderMacroCollection();
+    };
     /**
      * XRManager located in the main package, its implementation logic is XRManagerExtended in the sub-package engine-xr.
      */ var XRManager = /*#__PURE__*/ function() {
@@ -29651,25 +29663,25 @@
                 var cameras = componentsManager._activeCameras;
                 if (cameras.length === 0) {
                     Logger.debug("No active camera in scene.");
-                    return "continue";
-                }
-                cameras.forEach(function(camera) {
-                    componentsManager.callCameraOnBeginRender(camera);
-                    // Update post process manager
-                    scene.postProcessManager._update(camera);
-                    camera.render();
-                    componentsManager.callCameraOnEndRender(camera);
-                    // Temp solution for webgl implement bug
-                    if (_this1._hardwareRenderer._options._forceFlush) {
-                        _this1._hardwareRenderer.flush();
-                    }
-                }, function(camera, index) {
-                    camera._cameraIndex = index;
-                });
+                } else {
+                    cameras.forEach(function(camera) {
+                        componentsManager.callCameraOnBeginRender(camera);
+                        // Update post process manager
+                        scene.postProcessManager._update(camera);
+                        camera.render();
+                        componentsManager.callCameraOnEndRender(camera);
+                        // Temp solution for webgl implement bug
+                        if (_this1._hardwareRenderer._options._forceFlush) {
+                            _this1._hardwareRenderer.flush();
+                        }
+                    }, function(camera, index) {
+                        camera._cameraIndex = index;
+                    });
+                }
                 var uiCanvas = componentsManager._overlayCanvases;
                 if (uiCanvas.length > 0) {
                     componentsManager.sortOverlayUICanvases();
-                    UIUtils.renderOverlay(_this, uiCanvas);
+                    UIUtils.renderOverlay(_this, scene, uiCanvas);
                 }
             };
             var _this1 = this;
@@ -34782,11 +34794,7 @@
                 if (transition.mute) continue;
                 if (transitionCollection.isSoloMode && !transition.solo) continue;
                 if (this._checkConditions(transition)) {
-                    if (this._applyTransition(layerData, transition, aniUpdate)) {
-                        return transition;
-                    } else {
-                        return null;
-                    }
+                    return this._applyTransition(layerData, transition, aniUpdate);
                 }
             }
         };
@@ -34806,13 +34814,11 @@
             return true;
         };
         _proto._applyTransition = function _applyTransition(layerData, transition, aniUpdate) {
-            // Need prepare first, it should crossFade when to exit
-            var success = this._prepareCrossFadeByTransition(transition, layerData.layerIndex);
             if (transition.isExit) {
                 this._checkAnyAndEntryState(layerData, 0, aniUpdate);
-                return transition;
+                return null;
             }
-            return success ? transition : null;
+            return this._prepareCrossFadeByTransition(transition, layerData.layerIndex) ? transition : null;
         };
         _proto._checkConditions = function _checkConditions(transition) {
             var conditions = transition.conditions;
@@ -43434,10 +43440,16 @@
             return this._getEntityByConfig(entityConfig).then(function(entity) {
                 var _entityConfig_isActive;
                 entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
-                var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
-                if (position) entity.transform.position.copyFrom(position);
-                if (rotation) entity.transform.rotation.copyFrom(rotation);
-                if (scale) entity.transform.scale.copyFrom(scale);
+                var transform = entity.transform;
+                var transformConfig = entityConfig.transform;
+                if (transformConfig) {
+                    _this.parsePropsAndMethods(transform, transformConfig);
+                } else {
+                    var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+                    if (position) transform.position.copyFrom(position);
+                    if (rotation) transform.rotation.copyFrom(rotation);
+                    if (scale) transform.scale.copyFrom(scale);
+                }
                 var _entityConfig_layer;
                 entity.layer = (_entityConfig_layer = entityConfig.layer) != null ? _entityConfig_layer : entity.layer;
                 // @ts-ignore
@@ -43578,7 +43590,8 @@
                     return entity;
                 });
             } else {
-                var entity = new Entity(engine, entityConfig.name);
+                var transform = entityConfig.transform;
+                var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
                 return Promise.resolve(entity);
             }
         };
@@ -44071,7 +44084,8 @@
             });
         };
         _proto._parseEntity = function _parseEntity(entityConfig, engine) {
-            var entity = new Entity(engine, entityConfig.name);
+            var transform = entityConfig.transform;
+            var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
             if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
             return Promise.resolve(entity);
         };
@@ -44131,11 +44145,17 @@
             entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
             var _entityConfig_name;
             entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
-            var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale, layer = entityConfig.layer;
-            if (position) entity.transform.position.copyFrom(position);
-            if (rotation) entity.transform.rotation.copyFrom(rotation);
-            if (scale) entity.transform.scale.copyFrom(scale);
-            if (layer) entity.layer = layer;
+            var transform = entity.transform;
+            var transformConfig = entityConfig.transform;
+            if (transformConfig) {
+                this._reflectionParser.parsePropsAndMethods(transform, transformConfig);
+            } else {
+                var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+                if (position) transform.position.copyFrom(position);
+                if (rotation) transform.rotation.copyFrom(rotation);
+                if (scale) transform.scale.copyFrom(scale);
+            }
+            if (entityConfig.layer) entity.layer = entityConfig.layer;
             return entity;
         };
         _proto._generateInstanceContext = function _generateInstanceContext(entity, context, path) {
@@ -49937,7 +49957,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.0-beta.1";
+    var version = "1.4.0";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);