@galacean/engine-rhi-webgl 1.2.0-alpha.13 → 1.2.0-alpha.15

package/dist/main.js

@@ -1077,7 +1077,7 @@ var GLBuffer = /*#__PURE__*/ function() {
    * @internal
    */ GLTexture._getRenderBufferDepthFormatDetail = function _getRenderBufferDepthFormatDetail(format, gl, isWebGL2) {
         switch(format){
-            case engineCore.RenderBufferDepthFormat.Depth:
+            case engineCore.TextureFormat.Depth:
                 return {
                     internalFormat: isWebGL2 ? gl.DEPTH_COMPONENT32F : gl.DEPTH_COMPONENT16,
                     baseFormat: gl.DEPTH_COMPONENT,
@@ -1085,7 +1085,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.DepthStencil:
+            case engineCore.TextureFormat.DepthStencil:
                 return {
                     internalFormat: isWebGL2 ? gl.DEPTH32F_STENCIL8 : gl.DEPTH_STENCIL,
                     baseFormat: gl.DEPTH_STENCIL,
@@ -1093,7 +1093,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_STENCIL_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Stencil:
+            case engineCore.TextureFormat.Stencil:
                 return {
                     internalFormat: gl.STENCIL_INDEX8,
                     baseFormat: gl.STENCIL_ATTACHMENT,
@@ -1101,7 +1101,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.STENCIL_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Depth16:
+            case engineCore.TextureFormat.Depth16:
                 return {
                     internalFormat: gl.DEPTH_COMPONENT16,
                     baseFormat: gl.DEPTH_COMPONENT,
@@ -1109,7 +1109,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Depth24Stencil8:
+            case engineCore.TextureFormat.Depth24Stencil8:
                 return {
                     internalFormat: isWebGL2 ? gl.DEPTH24_STENCIL8 : gl.DEPTH_STENCIL,
                     baseFormat: gl.DEPTH_STENCIL,
@@ -1117,7 +1117,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_STENCIL_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Depth24:
+            case engineCore.TextureFormat.Depth24:
                 return {
                     internalFormat: gl.DEPTH_COMPONENT24,
                     baseFormat: gl.DEPTH_COMPONENT,
@@ -1125,7 +1125,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Depth32:
+            case engineCore.TextureFormat.Depth32:
                 return {
                     internalFormat: gl.DEPTH_COMPONENT32F,
                     baseFormat: gl.DEPTH_COMPONENT,
@@ -1133,7 +1133,7 @@ var GLBuffer = /*#__PURE__*/ function() {
                     isCompressed: false,
                     attachment: gl.DEPTH_ATTACHMENT
                 };
-            case engineCore.RenderBufferDepthFormat.Depth32Stencil8:
+            case engineCore.TextureFormat.Depth32Stencil8:
                 return {
                     internalFormat: gl.DEPTH32F_STENCIL8,
                     baseFormat: gl.DEPTH_STENCIL,
@@ -1203,9 +1203,9 @@ var GLBuffer = /*#__PURE__*/ function() {
    */ GLTexture._supportRenderBufferDepthFormat = function _supportRenderBufferDepthFormat(format, rhi) {
         if (!rhi.isWebGL2) {
             switch(format){
-                case engineCore.RenderBufferDepthFormat.Depth24:
-                case engineCore.RenderBufferDepthFormat.Depth32:
-                case engineCore.RenderBufferDepthFormat.Depth32Stencil8:
+                case engineCore.TextureFormat.Depth24:
+                case engineCore.TextureFormat.Depth32:
+                case engineCore.TextureFormat.Depth32Stencil8:
                     return false;
             }
         }
@@ -1308,6 +1308,7 @@ var GLBuffer = /*#__PURE__*/ function() {
     function GLRenderTarget(rhi, target) {
         this._MSAAColorRenderBuffers = [];
         this._curMipLevel = 0;
+        this._curFaceIndex = undefined;
         this._gl = rhi.gl;
         this._isWebGL2 = rhi.isWebGL2;
         this._target = target;
@@ -1359,21 +1360,23 @@ var GLBuffer = /*#__PURE__*/ function() {
     var _proto = GLRenderTarget.prototype;
     /**
    * Set which face and mipLevel of the cube texture to render to.
-   * @param faceIndex - Cube texture face
    * @param mipLevel - Set mip level the data want to write
-   */ _proto.setRenderTargetInfo = function setRenderTargetInfo(faceIndex, mipLevel) {
+   * @param faceIndex - Cube texture face
+   */ _proto.activeRenderTarget = function activeRenderTarget(mipLevel, faceIndex) {
+        // @todo: support MRT
         var _this = this, gl = _this._gl, target = _this._target;
-        var depthTexture = target.depthTexture;
-        var colorTexture = target.getColorTexture(0);
-        var mipChanged = mipLevel !== this._curMipLevel;
         gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
+        var mipChanged = mipLevel !== this._curMipLevel;
+        var faceChanged = faceIndex !== this._curFaceIndex;
+        var colorTexture = target.getColorTexture(0);
         if (colorTexture) {
             var isCube = _instanceof(colorTexture, engineCore.TextureCube);
-            if (mipChanged || isCube) {
+            if (mipChanged || isCube && faceChanged) {
                 gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, isCube ? gl.TEXTURE_CUBE_MAP_POSITIVE_X + faceIndex : gl.TEXTURE_2D, // @ts-ignore
                 colorTexture._platformTexture._glTexture, mipLevel);
             }
         }
+        var depthTexture = target.depthTexture;
         if (depthTexture) {
             var isCube1 = _instanceof(depthTexture, engineCore.TextureCube);
             if (mipChanged || isCube1) {
@@ -1390,8 +1393,10 @@ var GLBuffer = /*#__PURE__*/ function() {
             }
         }
         this._curMipLevel = mipLevel;
-        // revert current activated render target
-        this._activeRenderTarget();
+        this._curFaceIndex = faceIndex;
+        if (this._MSAAFrameBuffer) {
+            gl.bindFramebuffer(gl.FRAMEBUFFER, this._MSAAFrameBuffer);
+        }
     };
     /**
    * Blit FBO.
@@ -1429,20 +1434,6 @@ var GLBuffer = /*#__PURE__*/ function() {
         this._MSAAColorRenderBuffers.length = 0;
         this._MSAADepthRenderBuffer = null;
     };
-    /**
-   * Activate this RenderTarget.
-   * @internal
-   * @remarks
-   * If MSAA is turned on, MSAA FBO is activated, and then this._blitRenderTarget() is performed to exchange FBO.
-   * If MSAA is not turned on, activate the main FBO.
-   */ _proto._activeRenderTarget = function _activeRenderTarget() {
-        var gl = this._gl;
-        if (this._MSAAFrameBuffer) {
-            gl.bindFramebuffer(gl.FRAMEBUFFER, this._MSAAFrameBuffer);
-        } else {
-            gl.bindFramebuffer(gl.FRAMEBUFFER, this._frameBuffer);
-        }
-    };
     _proto._bindMainFBO = function _bindMainFBO() {
         var gl = this._gl;
         var isWebGL2 = this._isWebGL2;
@@ -1917,23 +1908,30 @@ exports.WebGLMode = void 0;
             engineCore.Logger.error("draw primitive failed.");
         }
     };
-    _proto.activeRenderTarget = function activeRenderTarget(renderTarget, viewport, mipLevel) {
-        var gl = this._gl;
+    _proto.getMainFrameBufferWidth = function getMainFrameBufferWidth() {
+        return this._mainFrameWidth || this._gl.drawingBufferWidth;
+    };
+    _proto.getMainFrameBufferHeight = function getMainFrameBufferHeight() {
+        return this._mainFrameHeight || this._gl.drawingBufferHeight;
+    };
+    _proto.activeRenderTarget = function activeRenderTarget(renderTarget, viewport, isFlipProjection, mipLevel, faceIndex) {
         var bufferWidth, bufferHeight;
         if (renderTarget) {
-            var /** @ts-ignore */ _renderTarget__platformRenderTarget;
-            (_renderTarget__platformRenderTarget = renderTarget._platformRenderTarget) == null ? void 0 : _renderTarget__platformRenderTarget._activeRenderTarget();
+            /** @ts-ignore */ renderTarget._isContentLost = false;
+            /** @ts-ignore */ var platformRenderTarget = renderTarget._platformRenderTarget;
+            platformRenderTarget.activeRenderTarget(mipLevel, faceIndex);
             bufferWidth = renderTarget.width >> mipLevel;
             bufferHeight = renderTarget.height >> mipLevel;
         } else {
+            var gl = this._gl;
             gl.bindFramebuffer(gl.FRAMEBUFFER, this._mainFrameBuffer);
-            bufferWidth = this._mainFrameWidth || gl.drawingBufferWidth;
-            bufferHeight = this._mainFrameHeight || gl.drawingBufferHeight;
+            bufferWidth = this.getMainFrameBufferWidth();
+            bufferHeight = this.getMainFrameBufferHeight();
         }
         var width = bufferWidth * viewport.z;
         var height = bufferHeight * viewport.w;
         var x = viewport.x * bufferWidth;
-        var y = bufferHeight - viewport.y * bufferHeight - height;
+        var y = isFlipProjection ? viewport.y * bufferHeight : bufferHeight - viewport.y * bufferHeight - height;
         this.viewport(x, y, width, height);
         this.scissor(x, y, width, height);
     };