@galacean/engine-rhi-webgl 1.1.0-alpha.2 → 1.1.0-alpha.4

package/dist/main.js

@@ -561,7 +561,7 @@ var GLBuffer = /*#__PURE__*/ function() {
         this._vaoMap = new Map();
         this._primitive = primitive;
         this._canUseInstancedArrays = rhi.canIUse(engineCore.GLCapabilityType.instancedArrays);
-        this._useVao = rhi.canIUse(engineCore.GLCapabilityType.vertexArrayObject);
+        this._isSupportVAO = rhi.canIUse(engineCore.GLCapabilityType.vertexArrayObject);
         this._gl = rhi.gl;
     }
     var _proto = GLPrimitive.prototype;
@@ -570,10 +570,8 @@ var GLBuffer = /*#__PURE__*/ function() {
    */ _proto.draw = function draw(shaderProgram, subMesh) {
         var gl = this._gl;
         var primitive = this._primitive;
-        // @ts-ignore
-        var useVao = this._useVao && primitive._enableVAO;
+        var useVao = this._isSupportVAO && primitive.enableVAO;
         if (useVao) {
-            // @ts-ignore
             if (primitive._bufferStructChanged) {
                 this._clearVAO();
             }
@@ -585,15 +583,14 @@ var GLBuffer = /*#__PURE__*/ function() {
         } else {
             this._bindBufferAndAttrib(shaderProgram);
         }
-        // @ts-ignore
-        var _indexBufferBinding = primitive._indexBufferBinding, _instanceCount = primitive._instanceCount, _glIndexType = primitive._glIndexType, _glIndexByteCount = primitive._glIndexByteCount;
+        var indexBufferBinding = primitive.indexBufferBinding, instanceCount = primitive.instanceCount, _glIndexType = primitive._glIndexType, _glIndexByteCount = primitive._glIndexByteCount;
         var topology = subMesh.topology, start = subMesh.start, count = subMesh.count;
-        if (!_instanceCount) {
-            if (_indexBufferBinding) {
+        if (!instanceCount) {
+            if (indexBufferBinding) {
                 if (useVao) {
                     gl.drawElements(topology, count, _glIndexType, start * _glIndexByteCount);
                 } else {
-                    var _glBuffer = _indexBufferBinding.buffer._platformBuffer._glBuffer;
+                    var _glBuffer = indexBufferBinding.buffer._platformBuffer._glBuffer;
                     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _glBuffer);
                     gl.drawElements(topology, count, _glIndexType, start * _glIndexByteCount);
                     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
@@ -603,17 +600,17 @@ var GLBuffer = /*#__PURE__*/ function() {
             }
         } else {
             if (this._canUseInstancedArrays) {
-                if (_indexBufferBinding) {
+                if (indexBufferBinding) {
                     if (useVao) {
-                        gl.drawElementsInstanced(topology, count, _glIndexType, start * _glIndexByteCount, _instanceCount);
+                        gl.drawElementsInstanced(topology, count, _glIndexType, start * _glIndexByteCount, instanceCount);
                     } else {
-                        var _glBuffer1 = _indexBufferBinding.buffer._platformBuffer._glBuffer;
+                        var _glBuffer1 = indexBufferBinding.buffer._platformBuffer._glBuffer;
                         gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _glBuffer1);
-                        gl.drawElementsInstanced(topology, count, _glIndexType, start * _glIndexByteCount, _instanceCount);
+                        gl.drawElementsInstanced(topology, count, _glIndexType, start * _glIndexByteCount, instanceCount);
                         gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
                     }
                 } else {
-                    gl.drawArraysInstanced(topology, start, count, _instanceCount);
+                    gl.drawArraysInstanced(topology, start, count, instanceCount);
                 }
             } else {
                 engineCore.Logger.error("ANGLE_instanced_arrays extension is not supported");
@@ -627,18 +624,16 @@ var GLBuffer = /*#__PURE__*/ function() {
         }
     };
     _proto.destroy = function destroy() {
-        this._useVao && this._clearVAO();
+        this._isSupportVAO && this._clearVAO();
     };
     /**
    * Bind buffer and attribute.
    */ _proto._bindBufferAndAttrib = function _bindBufferAndAttrib(shaderProgram) {
         var gl = this._gl;
         var primitive = this._primitive;
-        // @ts-ignore
-        var vertexBufferBindings = primitive._vertexBufferBindings;
+        var vertexBufferBindings = primitive.vertexBufferBindings;
         this._attribLocArray.length = 0;
         var attributeLocation = shaderProgram.attributeLocation;
-        // @ts-ignore
         var attributes = primitive._vertexElementMap;
         var vbo;
         var lastBoundVbo;
@@ -677,10 +672,9 @@ var GLBuffer = /*#__PURE__*/ function() {
         var gl = this._gl;
         var vao = gl.createVertexArray();
         /** register VAO */ gl.bindVertexArray(vao);
-        // @ts-ignore
-        var _indexBufferBinding = this._primitive._indexBufferBinding;
-        if (_indexBufferBinding) {
-            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _indexBufferBinding.buffer._platformBuffer._glBuffer);
+        var indexBufferBinding = this._primitive.indexBufferBinding;
+        if (indexBufferBinding) {
+            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, indexBufferBinding.buffer._platformBuffer._glBuffer);
         }
         this._bindBufferAndAttrib(shaderProgram);
         /** unbind */ gl.bindVertexArray(null);
@@ -1917,8 +1911,7 @@ exports.WebGLMode = void 0;
     _proto.drawPrimitive = function drawPrimitive(primitive, subPrimitive, shaderProgram) {
         // todo: VAO not support morph animation
         if (primitive) {
-            //@ts-ignore
-            primitive._draw(shaderProgram, subPrimitive);
+            primitive.draw(shaderProgram, subPrimitive);
         } else {
             engineCore.Logger.error("draw primitive failed.");
         }