@predy-js/render-interface 0.1.8 → 0.1.10

package/dist/index.js

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.1.8
+ * Version: v0.1.10
  */
 
 'use strict';
@@ -153,7 +153,7 @@ exports.TextureSourceType = void 0;
     TextureSourceType[TextureSourceType["mipmaps"] = 7] = "mipmaps";
 })(exports.TextureSourceType || (exports.TextureSourceType = {}));
 
-var _a$6;
+var _a$6, _b$2;
 // @ts-expect-error safe to assign
 var constants = {};
 {
@@ -192,6 +192,14 @@ function getBytesPerElementByGLType(type) {
     var _a;
     return ((_a = map[type]) === null || _a === void 0 ? void 0 : _a.BYTES_PER_ELEMENT) || 0;
 }
+var MatAttrLocPairMap = (_b$2 = {},
+    _b$2[constants.FLOAT_MAT2] = [2, 2],
+    _b$2[constants.FLOAT_MAT3] = [3, 3],
+    _b$2[constants.FLOAT_MAT4] = [4, 4],
+    _b$2);
+function getMatAttrLocPair(type) {
+    return MatAttrLocPairMap[type] || [1, 1];
+}
 
 exports.ShaderCompileResultStatus = void 0;
 (function (ShaderCompileResultStatus) {
@@ -1844,7 +1852,7 @@ var GLProgram = /** @class */ (function () {
         var uniformInfo = DATA_DICT[info.type];
         var subInfos = info.subInfos;
         if (subInfos.length > 0 && Array.isArray(value) && Array.isArray(value[0])) {
-            for (var i = 0; i < subInfos.length; ++i) {
+            for (var i = 0; i < subInfos.length && i < value.length; ++i) {
                 var subInfo = subInfos[i];
                 uniformInfo.uniform(gl, subInfo, value[i], this.renderer);
             }
@@ -1856,6 +1864,7 @@ var GLProgram = /** @class */ (function () {
         var _a;
         var gl = this.renderer.gl;
         var vao = geometry.createVao(this.id);
+        var gpu = this.renderer.gpu;
         if (vao) {
             vao.bind();
             if (vao.ready) {
@@ -1873,8 +1882,26 @@ var GLProgram = /** @class */ (function () {
                     throw Error("no buffer named ".concat(attribute.dataSource || name));
                 }
                 buffer.bind();
-                gl.enableVertexAttribArray(attrInfo.loc);
-                gl.vertexAttribPointer(attrInfo.loc, attribute.size, attribute.type, attribute.normalize, attribute.stride || 0, attribute.offset || 0);
+                if (attribute.size > 4) {
+                    var _a = getMatAttrLocPair(attrInfo.type), row = _a[0], col = _a[1];
+                    var bytesPerRow = getBytesPerElementByGLType(attribute.type) * col;
+                    var stride = row * bytesPerRow;
+                    for (var i = 0; i < row; i++) {
+                        var loc = attrInfo.loc + i;
+                        gl.enableVertexAttribArray(loc);
+                        gl.vertexAttribPointer(loc, col, attribute.type, attribute.normalize, stride, i * bytesPerRow);
+                        if (attribute.instanceDivisor && gpu.capability.instanceDraw) {
+                            gpu.vertexAttribDivisor(gl, loc, attribute.instanceDivisor);
+                        }
+                    }
+                }
+                else {
+                    gl.enableVertexAttribArray(attrInfo.loc);
+                    gl.vertexAttribPointer(attrInfo.loc, attribute.size, attribute.type, attribute.normalize, attribute.stride || 0, attribute.offset || 0);
+                    if (attribute.instanceDivisor && gpu.capability.instanceDraw) {
+                        gpu.vertexAttribDivisor(gl, attrInfo.loc, attribute.instanceDivisor);
+                    }
+                }
             }
         });
         (_a = geometry._indexBuffer) === null || _a === void 0 ? void 0 : _a.bind();
@@ -2227,6 +2254,7 @@ var GLGPUCapability = /** @class */ (function () {
             }
             this.internalFormatDepth16 = level2 ? gl.DEPTH_COMPONENT16 : gl.DEPTH_COMPONENT;
             this.internalFormatDepth24_stencil8 = level2 ? gl.DEPTH24_STENCIL8 : gl.DEPTH_STENCIL;
+            this.instanceDrawExt = gl.getExtension('ANGLE_instanced_arrays');
             var floatTexture = (level2 || gl.getExtension('OES_texture_float')) ? gl.FLOAT : 0;
             var halfFloatTexture = level2 ? WebGL2RenderingContext.HALF_FLOAT : (((_a = gl.getExtension('OES_texture_half_float')) === null || _a === void 0 ? void 0 : _a.HALF_FLOAT_OES) || 0);
             var detail = {
@@ -2246,7 +2274,7 @@ var GLGPUCapability = /** @class */ (function () {
                 floatLinear: floatLinear,
                 maxTextureAnisotropy: textureAnisotropicExt ? gl.getParameter(textureAnisotropicExt.MAX_TEXTURE_MAX_ANISOTROPY_EXT) : 0,
                 shaderTextureLod: level2 || !!gl.getExtension('EXT_shader_texture_lod'),
-                instanceDraw: level2 || !!gl.getExtension('ANGLE_instanced_arrays'),
+                instanceDraw: level2 || !!this.instanceDrawExt,
                 drawBuffers: level2 || !!this.drawBufferExtension,
                 asyncShaderCompile: !!gl.getExtension('KHR_parallel_shader_compile'),
                 intIndexElementBuffer: !!gl.getExtension('OES_element_index_uint'),
@@ -2296,6 +2324,39 @@ var GLGPUCapability = /** @class */ (function () {
             consoleError('invalid color attachment index:' + index);
         }
     };
+    GLGPUCapability.prototype.vertexAttribDivisor = function (gl, loc, divisor) {
+        if (this.level === 2) {
+            gl.vertexAttribDivisor(loc, divisor);
+        }
+        else if (this.instanceDrawExt) {
+            this.instanceDrawExt.vertexAttribDivisorANGLE(loc, divisor);
+        }
+        else {
+            consoleWarn('instance draw not support');
+        }
+    };
+    GLGPUCapability.prototype.drawElementsInstanced = function (gl, mode, count, type, offset, instanceCount) {
+        if (this.level === 2) {
+            gl.drawElementsInstanced(mode, count, type, offset, instanceCount);
+        }
+        else if (this.instanceDrawExt) {
+            this.instanceDrawExt.drawElementsInstancedANGLE(mode, count, type, offset, instanceCount);
+        }
+        else {
+            consoleWarn('instance draw not support');
+        }
+    };
+    GLGPUCapability.prototype.drawArraysInstanced = function (gl, mode, first, count, instanceCount) {
+        if (this.level === 2) {
+            gl.drawArraysInstanced(mode, first, count, instanceCount);
+        }
+        else if (this.instanceDrawExt) {
+            this.instanceDrawExt.drawArraysInstancedANGLE(mode, first, count, instanceCount);
+        }
+        else {
+            consoleWarn('instance draw not support');
+        }
+    };
     GLGPUCapability.prototype.drawBuffers = function (gl, bufferStates) {
         var ext = this.drawBufferExtension;
         if (this.level === 1 && !ext) {
@@ -2773,9 +2834,6 @@ var GLGPURenderer = /** @class */ (function () {
     GLGPURenderer.prototype.createBuffer = function (options) {
         return new GLGPUBuffer(options, this);
     };
-    GLGPURenderer.prototype.parseSceneSchema = function (schema) {
-        throw new Error('Method not implemented.');
-    };
     GLGPURenderer.prototype.resize = function (width, height) {
         var gl = this.gl;
         if (gl && gl.drawingBufferWidth !== width || gl.drawingBufferHeight !== height) {
@@ -4738,10 +4796,12 @@ var GLGeometry = /** @class */ (function () {
         return null;
     };
     GLGeometry.prototype.draw = function (state) {
-        var _a;
+        var _a, _b;
         var index = this._indexBuffer;
         var gl = (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.gl;
-        if (gl) {
+        var gpu = (_b = this.renderer) === null || _b === void 0 ? void 0 : _b.gpu;
+        var useInstancedDraw = (gpu === null || gpu === void 0 ? void 0 : gpu.capability.instanceDraw) && state.currentMesh.instanceCount > 0;
+        if (gl && gpu) {
             var drawCount = this.drawCount;
             if (index) {
                 var type = index.type;
@@ -4749,11 +4809,21 @@ var GLGeometry = /** @class */ (function () {
                 //this._indexBuffer?.bind();
                 var dc = isNaN(drawCount) ? index.elementCount : drawCount;
                 if (dc > 0) {
-                    gl.drawElements(this.mode, dc, type, this.drawStart || 0);
+                    if (useInstancedDraw) {
+                        gpu.drawElementsInstanced(gl, this.mode, dc, type, this.drawStart || 0, state.currentMesh.instanceCount);
+                    }
+                    else {
+                        gl.drawElements(this.mode, dc, type, this.drawStart || 0);
+                    }
                 }
             }
             else if (drawCount > 0) {
-                gl.drawArrays(this.mode, this.drawStart, this.drawCount);
+                if (useInstancedDraw) {
+                    gpu.drawArraysInstanced(gl, this.mode, this.drawStart, this.drawCount, state.currentMesh.instanceCount);
+                }
+                else {
+                    gl.drawArrays(this.mode, this.drawStart, this.drawCount);
+                }
             }
         }
     };
@@ -4844,6 +4914,7 @@ var MarsGeometry = /** @class */ (function () {
                     type: type || gltype,
                     normalize: !!attr.normalize,
                     dataSource: (name),
+                    instanceDivisor: attr.instanceDivisor,
                 };
                 attributesReleasable[name] = releasable || false;
                 dirtyFlags[name] = {
@@ -5174,7 +5245,7 @@ var MarsGeometry = /** @class */ (function () {
 
 var seed = 1;
 var MarsMesh = /** @class */ (function () {
-    function MarsMesh(options) {
+    function MarsMesh(options, renderer) {
         this._isDestroyed = false;
         this.material = options.material instanceof MarsMaterial ? options.material : new MarsMaterial(options.material);
         var geo = options.geometry;
@@ -5191,6 +5262,9 @@ var MarsMesh = /** @class */ (function () {
         this.priority = options.priority || 0;
         this.hide = false;
         this.worldMatrix = options.worldMatrix || [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+        if (renderer) {
+            this.assignRenderer(renderer);
+        }
     }
     Object.defineProperty(MarsMesh.prototype, "isDestroyed", {
         get: function () {
@@ -5261,6 +5335,15 @@ var MarsMesh = /** @class */ (function () {
     };
     return MarsMesh;
 }());
+var MarsInstancedMesh = /** @class */ (function (_super) {
+    __extends(MarsInstancedMesh, _super);
+    function MarsInstancedMesh(options, renderer) {
+        var _this = _super.call(this, options, renderer) || this;
+        _this.instanceCount = options.instanceCount;
+        return _this;
+    }
+    return MarsInstancedMesh;
+}(MarsMesh));
 
 var copyShaderId = '$mri-internal-copy';
 var MarsExtWrap = /** @class */ (function () {
@@ -5524,9 +5607,10 @@ var MarsSharedGeometry = /** @class */ (function (_super) {
     return MarsSharedGeometry;
 }(MarsGeometry));
 
-consoleLog('version: ' + "0.1.8");
+consoleLog('version: ' + "0.1.10");
 
 exports.Geometry = MarsGeometry;
+exports.InstancedMesh = MarsInstancedMesh;
 exports.MarsTextureFactory = MarsTextureFactory;
 exports.Material = MarsMaterial;
 exports.MaterialDataBlock = MarsMaterialDataBlock;