@galacean/engine 1.5.15 → 1.5.16

package/dist/browser.js

@@ -13697,7 +13697,7 @@
                 Logger.error("mipLevel only take effect in WebGL2.0");
             }
             var ignoreClearFlags;
-            if (this._cameraType !== CameraType$1.Normal && !this._renderTarget && !this._isIndependentCanvasEnabled()) {
+            if (this._cameraType !== CameraType$1.Normal && !this._renderTarget) {
                 ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
             }
             this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
@@ -13831,6 +13831,9 @@
                 width = canvas.width;
                 height = canvas.height;
             }
+            this._adjustPixelViewport(width, height);
+        };
+        _proto._adjustPixelViewport = function _adjustPixelViewport(width, height) {
             var viewport = this._viewport;
             this._pixelViewport.set(viewport.x * width, viewport.y * height, viewport.z * width, viewport.w * height);
             !this._customAspectRatio && this._dispatchModify(CameraModifyFlags.AspectRatio);
@@ -19040,7 +19043,8 @@
             } else {
                 uberShaderData.disableMacro(TonemappingEffect._enableMacro);
             }
-            Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, camera.viewport, this._uberMaterial, undefined);
+            var viewport = destTarget === camera.renderTarget ? camera.viewport : undefined;
+            Blitter.blitTexture(camera.engine, srcTexture, destTarget, 0, viewport, this._uberMaterial, undefined);
         };
         /**
        * @inheritdoc
@@ -19078,7 +19082,7 @@
                 uberShaderData.disableMacro(BloomEffect._hqMacro);
             }
             uberShaderData.setTexture(BloomEffect._dirtTextureProp, dirtTexture.value);
-            if (dirtTexture) {
+            if (dirtTexture.value) {
                 uberShaderData.enableMacro(BloomEffect._dirtMacro);
             } else {
                 uberShaderData.disableMacro(BloomEffect._dirtMacro);
@@ -19216,11 +19220,12 @@
             var enableFXAA = camera.antiAliasing === AntiAliasing.FXAA;
             // Should convert to sRGB when FXAA is enabled or camera's render target is not set
             var sourceTexture = this._inputRenderTarget.getColorTexture();
-            var outputRenderTarget = enableFXAA ? this._srgbRenderTarget : renderTarget;
-            Blitter.blitTexture(engine, sourceTexture, outputRenderTarget, 0, viewport, this._sRGBmaterial);
             if (enableFXAA) {
+                Blitter.blitTexture(engine, sourceTexture, this._srgbRenderTarget, 0, undefined, this._sRGBmaterial);
                 var sRGBTexture = this._srgbRenderTarget.getColorTexture();
                 Blitter.blitTexture(engine, sRGBTexture, renderTarget, 0, viewport, this._antiAliasingMaterial);
+            } else {
+                Blitter.blitTexture(engine, sourceTexture, renderTarget, 0, viewport, this._sRGBmaterial);
             }
         };
         _proto.release = function release() {
@@ -43737,7 +43742,7 @@
             var yStart = flipY ? srcHeight - viewport.y * srcHeight - copyHeight : viewport.y * srcHeight;
             var _srcRT__platformRenderTarget__frameBuffer;
             // @ts-ignore
-            var frameBuffer = (_srcRT__platformRenderTarget__frameBuffer = srcRT == null ? void 0 : srcRT._platformRenderTarget._frameBuffer) != null ? _srcRT__platformRenderTarget__frameBuffer : null;
+            var frameBuffer = (_srcRT__platformRenderTarget__frameBuffer = srcRT == null ? void 0 : srcRT._platformRenderTarget._frameBuffer) != null ? _srcRT__platformRenderTarget__frameBuffer : this._mainFrameBuffer;
             // @ts-ignore
             gl.bindFramebuffer(gl.FRAMEBUFFER, frameBuffer);
             // @ts-ignore
@@ -44965,6 +44970,25 @@
         /** start parse the scene or prefab or others */ _proto.start = function start() {
             this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parseAddedComponents).then(this._parseComponentsPropsAndMethods).then(this._parsePrefabModification).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
         };
+        _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
+            if (entityConfig === void 0) entityConfig = {};
+            var _entityConfig_isActive;
+            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 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._parseEntities = function _parseEntities() {
             var _this = this;
             var entitiesConfig = this.data.entities;
@@ -45175,25 +45199,6 @@
                 this._addComponentPlugin(componentId, component);
             }
         };
-        _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
-            if (entityConfig === void 0) entityConfig = {};
-            var _entityConfig_isActive;
-            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 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) {
             var entityMap = context.entityMap, components = context.components;
             var componentsMap = {};
@@ -49232,6 +49237,13 @@
             return _this;
         }
         var _proto = PrefabParser.prototype;
+        _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
+            if (entityConfig === void 0) entityConfig = {};
+            HierarchyParser.prototype._applyEntityData.call(this, entity, entityConfig);
+            // @ts-ignore
+            entity._markAsTemplate(this.context.resource);
+            return entity;
+        };
         _proto._handleRootEntity = function _handleRootEntity(id) {
             this.prefabResource._root = this.context.entityMap.get(id);
         };
@@ -51244,7 +51256,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.5.15";
+    var version = "1.5.16";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);