@predy-js/render-interface 0.1.61-beta.8 → 0.1.61

package/dist/index.mjs

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.1.61-beta.8
+ * Version: v0.1.61
  */
 
 /******************************************************************************
@@ -149,7 +149,9 @@ var TextureSourceType;
     TextureSourceType[TextureSourceType["mipmaps"] = 7] = "mipmaps";
 })(TextureSourceType || (TextureSourceType = {}));
 
-var _a$6, _b$2;
+var GPUBufferOptionsMemoryShared = 1 << 1;
+
+var _a$6, _b$3;
 // @ts-expect-error safe to assign
 var constants = {};
 {
@@ -188,11 +190,11 @@ 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);
+var MatAttrLocPairMap = (_b$3 = {},
+    _b$3[constants.FLOAT_MAT2] = [2, 2],
+    _b$3[constants.FLOAT_MAT3] = [3, 3],
+    _b$3[constants.FLOAT_MAT4] = [4, 4],
+    _b$3);
 function getMatAttrLocPair(type) {
     return MatAttrLocPairMap[type] || [1, 1];
 }
@@ -674,19 +676,17 @@ var GPUCapabilityEmpty = /** @class */ (function () {
 var GLGPUBuffer = /** @class */ (function () {
     function GLGPUBuffer(options, renderer) {
         this._isDestroyed = false;
-        this.target = options.target || constants.ARRAY_BUFFER;
-        this.type = options.type || constants.FLOAT;
         this.renderer = renderer;
         this.glBuffer = renderer.createGLBuffer(this, options.name);
         this.usage = options.usage || constants.STATIC_DRAW;
-        this.bytesPerElement = getBytesPerElementByGLType(this.type);
         this._byteLength = 0;
         this.name = options.name || '';
+        this.target = options.target || constants.ARRAY_BUFFER;
         if (options.data) {
             this.bufferData(options.data);
         }
-        else if (options.elementCount) {
-            this.bufferData(getBytesPerElementByGLType(this.type) * options.elementCount);
+        else if (options.byteLength) {
+            this.bufferData(options.byteLength);
         }
     }
     Object.defineProperty(GLGPUBuffer.prototype, "byteLength", {
@@ -703,13 +703,6 @@ var GLGPUBuffer = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GLGPUBuffer.prototype, "elementCount", {
-        get: function () {
-            return (this.byteLength / this.bytesPerElement);
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(GLGPUBuffer.prototype, "level", {
         get: function () {
             var _a;
@@ -747,6 +740,7 @@ var GLGPUBuffer = /** @class */ (function () {
                     gl.bufferSubData(target, 0, typedArray);
                 }
             }
+            gl.bindBuffer(target, null);
         }
         else {
             this._byteLength = 0;
@@ -756,7 +750,7 @@ var GLGPUBuffer = /** @class */ (function () {
         if (this.renderer) {
             var gl = this.renderer.gl;
             var target = this.target;
-            var byteOffset = elementOffset * this.bytesPerElement;
+            var byteOffset = elementOffset * typedArray.BYTES_PER_ELEMENT;
             gl.bindBuffer(target, this.glBuffer);
             var byteLength = byteOffset + typedArray.byteLength;
             if (byteLength > this._byteLength) {
@@ -764,6 +758,7 @@ var GLGPUBuffer = /** @class */ (function () {
                 gl.bufferData(target, byteLength, this.usage);
             }
             gl.bufferSubData(target, byteOffset, typedArray);
+            gl.bindBuffer(target, null);
         }
         else {
             this._byteLength = 0;
@@ -780,13 +775,19 @@ var GLGPUBuffer = /** @class */ (function () {
         var _a;
         if (this.level === 2) {
             var gl = (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.gl;
+            var target = this.target;
             if (gl) {
-                gl.getBufferSubData(this.target, elementOffset * this.bytesPerElement, typedArray);
+                gl.bindBuffer(target, this.glBuffer);
+                gl.getBufferSubData(target, elementOffset * typedArray.BYTES_PER_ELEMENT, typedArray);
+                gl.bindBuffer(target, null);
                 return true;
             }
         }
         return false;
     };
+    GLGPUBuffer.prototype.getElementCount = function (bytePerElement) {
+        return this._byteLength / bytePerElement;
+    };
     GLGPUBuffer.prototype.assignRenderer = function (renderer) {
         if (!this.renderer) {
             // @ts-expect-error safe to assign
@@ -1448,7 +1449,7 @@ function assignTextureLoc(gl, info, value, renderer, index) {
     }
 }
 
-var _a$4, _b$1;
+var _a$4, _b$2;
 var BlockUniformInfoOffset = 1;
 var BlockUniformInfoByteLength = 8;
 var BlockUniformInfoType = 0;
@@ -1590,43 +1591,42 @@ var MemorySetter = (_a$4 = {},
     _a$4[constants.BOOL_VEC3] = setUInt8Array,
     _a$4[constants.BOOL_VEC4] = setUInt8Array,
     _a$4);
-var ItemPerValueMap = (_b$1 = {},
-    _b$1[constants.FLOAT] = 1,
-    _b$1[constants.INT] = 1,
-    _b$1[constants.UNSIGNED_INT] = 1,
-    _b$1[constants.SHORT] = 1,
-    _b$1[constants.BOOL] = 1,
-    _b$1[constants.UNSIGNED_SHORT] = 1,
-    _b$1[constants.FLOAT_VEC2] = 2,
-    _b$1[constants.FLOAT_VEC3] = 3,
-    _b$1[constants.FLOAT_VEC4] = 4,
-    _b$1[constants.FLOAT_MAT2] = 4,
-    _b$1[constants.FLOAT_MAT3] = 9,
-    _b$1[constants.FLOAT_MAT4] = 16,
-    _b$1[constants.FLOAT_MAT2x3] = 6,
-    _b$1[constants.FLOAT_MAT2x4] = 8,
-    _b$1[constants.FLOAT_MAT4x3] = 12,
-    _b$1[constants.FLOAT_MAT4x2] = 8,
-    _b$1[constants.FLOAT_MAT3x4] = 12,
-    _b$1[constants.FLOAT_MAT3x2] = 6,
-    _b$1[constants.INT_VEC2] = 2,
-    _b$1[constants.INT_VEC3] = 3,
-    _b$1[constants.INT_VEC4] = 4,
-    _b$1[constants.UNSIGNED_INT_VEC2] = 2,
-    _b$1[constants.UNSIGNED_INT_VEC3] = 3,
-    _b$1[constants.UNSIGNED_INT_VEC4] = 4,
-    _b$1[constants.BOOL_VEC2] = 2,
-    _b$1[constants.BOOL_VEC3] = 3,
-    _b$1[constants.BOOL_VEC4] = 4,
-    _b$1);
+var ItemPerValueMap = (_b$2 = {},
+    _b$2[constants.FLOAT] = 1,
+    _b$2[constants.INT] = 1,
+    _b$2[constants.UNSIGNED_INT] = 1,
+    _b$2[constants.SHORT] = 1,
+    _b$2[constants.BOOL] = 1,
+    _b$2[constants.UNSIGNED_SHORT] = 1,
+    _b$2[constants.FLOAT_VEC2] = 2,
+    _b$2[constants.FLOAT_VEC3] = 3,
+    _b$2[constants.FLOAT_VEC4] = 4,
+    _b$2[constants.FLOAT_MAT2] = 4,
+    _b$2[constants.FLOAT_MAT3] = 9,
+    _b$2[constants.FLOAT_MAT4] = 16,
+    _b$2[constants.FLOAT_MAT2x3] = 6,
+    _b$2[constants.FLOAT_MAT2x4] = 8,
+    _b$2[constants.FLOAT_MAT4x3] = 12,
+    _b$2[constants.FLOAT_MAT4x2] = 8,
+    _b$2[constants.FLOAT_MAT3x4] = 12,
+    _b$2[constants.FLOAT_MAT3x2] = 6,
+    _b$2[constants.INT_VEC2] = 2,
+    _b$2[constants.INT_VEC3] = 3,
+    _b$2[constants.INT_VEC4] = 4,
+    _b$2[constants.UNSIGNED_INT_VEC2] = 2,
+    _b$2[constants.UNSIGNED_INT_VEC3] = 3,
+    _b$2[constants.UNSIGNED_INT_VEC4] = 4,
+    _b$2[constants.BOOL_VEC2] = 2,
+    _b$2[constants.BOOL_VEC3] = 3,
+    _b$2[constants.BOOL_VEC4] = 4,
+    _b$2);
 var fullRange = [0, 0];
 var UniformBlockBuffer = /** @class */ (function () {
     function UniformBlockBuffer(renderer, info) {
         this.buffer = new GLGPUBuffer({
             target: constants.UNIFORM_BUFFER,
             name: info.name,
-            type: constants.BYTE,
-            elementCount: info.size,
+            byteLength: info.size,
         }, renderer);
         this.dirtyFlags = {};
         this.info = info;
@@ -1856,12 +1856,12 @@ var GLProgram = /** @class */ (function () {
                     val = _this.getSemanticValue(state, semanticName);
                 }
                 if (val !== undefined && val !== null) {
-                    _this.setGLUniformValue(name, val, info, gl);
-                }
-                else if (!info.isTexture) {
-                    consoleWarn("mesh ".concat(state.currentMesh.name, " uniform ").concat(name, " value unset"));
+                    return _this.setGLUniformValue(name, val, info, gl);
                 }
             }
+            if (!info.isTexture) {
+                consoleWarn("mesh ".concat(state.currentMesh.name, " uniform ").concat(name, " value unset"));
+            }
         });
     };
     GLProgram.prototype.setGLUniformValue = function (name, value, info, gl) {
@@ -2430,7 +2430,7 @@ function registerCompressedTexture(gl) {
     return 0;
 }
 
-var _a$2, _b;
+var _a$2, _b$1;
 var flipCanvas;
 var imageBitMapAvailable$1 = typeof ImageBitmap === 'function' && typeof createImageBitmap == 'function';
 var GLTexture = /** @class */ (function () {
@@ -2761,14 +2761,14 @@ var FORMAT_HALF_FLOAT = (_a$2 = {},
     _a$2[constants.LUMINANCE_ALPHA] = 33327,
     _a$2[constants.LUMINANCE] = 33325,
     _a$2);
-var FORMAT_FLOAT = (_b = {},
-    _b[constants.RGBA] = 34836,
-    _b[constants.RGB] = 34837,
-    _b[constants.ALPHA] = 33326,
-    _b[constants.RED] = 33326,
-    _b[constants.LUMINANCE_ALPHA] = 33328,
-    _b[constants.LUMINANCE] = 33326,
-    _b);
+var FORMAT_FLOAT = (_b$1 = {},
+    _b$1[constants.RGBA] = 34836,
+    _b$1[constants.RGB] = 34837,
+    _b$1[constants.ALPHA] = 33326,
+    _b$1[constants.RED] = 33326,
+    _b$1[constants.LUMINANCE_ALPHA] = 33328,
+    _b$1[constants.LUMINANCE] = 33326,
+    _b$1);
 
 var GL_LOST_EVENT = 'webglcontextlost';
 var GLGPURenderer = /** @class */ (function () {
@@ -2814,6 +2814,12 @@ var GLGPURenderer = /** @class */ (function () {
             gl.canvas.addEventListener(GL_LOST_EVENT, this.onContextLose);
         }
     }
+    GLGPURenderer.prototype.requestAnimationFrame = function (cb) {
+        return window.requestAnimationFrame(cb);
+    };
+    GLGPURenderer.prototype.cancelAnimationFrame = function (id) {
+        return window.cancelAnimationFrame(id);
+    };
     Object.defineProperty(GLGPURenderer.prototype, "isDestroyed", {
         get: function () {
             return this._isDestroyed;
@@ -4684,6 +4690,9 @@ var MarsMaterialDataBlock = /** @class */ (function () {
         return new MarsMaterialDataBlock({
             name: name,
             uniformValues: this._uniformValues,
+            uniformTextures: this._uniformTextures,
+            uniformSemantics: this.uniformSemantics,
+            keepUboData: this._keepUboData,
         }, this.renderer);
     };
     return MarsMaterialDataBlock;
@@ -4807,6 +4816,7 @@ var MarsMaterial = /** @class */ (function () {
     };
     MarsMaterial.prototype.removeDataBlock = function (b) {
         arrRemove(this._dataBlocks, b);
+        delete this._dbMap[b.name];
     };
     MarsMaterial.prototype.assignRenderer = function (renderer) {
         if (!this.materialInternal) {
@@ -4880,12 +4890,15 @@ var GLVertexArrayObject = /** @class */ (function () {
     return GLVertexArrayObject;
 }());
 
-var _a$1;
+var _a$1, _b;
 var INDEX_TYPE_MAP = (_a$1 = {},
-    _a$1[Uint8Array.BYTES_PER_ELEMENT] = constants.UNSIGNED_BYTE,
     _a$1[Uint16Array.BYTES_PER_ELEMENT] = constants.UNSIGNED_SHORT,
     _a$1[Uint32Array.BYTES_PER_ELEMENT] = constants.UNSIGNED_INT,
     _a$1);
+var TYPE_BYTE_MAP = (_b = {},
+    _b[constants.UNSIGNED_SHORT] = Uint16Array.BYTES_PER_ELEMENT,
+    _b[constants.UNSIGNED_INT] = Uint32Array.BYTES_PER_ELEMENT,
+    _b);
 /**
  * GLGeometry对象，保存GLGPUBuffer对象。
  *
@@ -4911,7 +4924,8 @@ var GLGeometry = /** @class */ (function () {
                 buffers[name] = new GLGPUBuffer(opt, renderer);
             });
             if (option.index && option.index.data) {
-                this._indexBuffer = this.createIndexBuffer(option.index.data, renderer);
+                var ret = this.createIndexBuffer(option.index.data, renderer);
+                this.setIndexBuffer(ret[0], ret[1]);
             }
         }
         this._buffersMap = buffers;
@@ -4933,18 +4947,18 @@ var GLGeometry = /** @class */ (function () {
         (_a = this.vaoMap[name]) === null || _a === void 0 ? void 0 : _a.destroy();
         this.vaoMap[name] = undefined;
     };
-    GLGeometry.prototype.setIndexBuffer = function (buffer) {
+    GLGeometry.prototype.setIndexBuffer = function (buffer, indexBufferType) {
         this._indexBuffer = buffer;
+        this.indexBufferType = indexBufferType;
     };
     GLGeometry.prototype.createIndexBuffer = function (data, renderer) {
         var type = INDEX_TYPE_MAP[data.BYTES_PER_ELEMENT];
         var indexOption = {
             data: data,
             target: constants.ELEMENT_ARRAY_BUFFER,
-            type: type,
             name: "".concat(this.name, "##index"),
         };
-        return new GLGPUBuffer(indexOption, renderer);
+        return [new GLGPUBuffer(indexOption, renderer), type];
     };
     GLGeometry.prototype.getGPUBuffer = function (name) {
         return this._buffersMap[name];
@@ -4986,10 +5000,10 @@ var GLGeometry = /** @class */ (function () {
         if (gl && gpu) {
             var drawCount = this.drawCount;
             if (index) {
-                var type = index.type;
+                var type = this.indexBufferType;
                 //bind by vao
                 //this._indexBuffer?.bind();
-                var dc = isNaN(drawCount) ? index.elementCount : drawCount;
+                var dc = isNaN(drawCount) ? index.getElementCount(TYPE_BYTE_MAP[type]) : drawCount;
                 if (dc > 0) {
                     if (useInstancedDraw) {
                         gpu.drawElementsInstanced(gl, this.mode, dc, type, this.drawStart || 0, state.currentMesh.instanceCount);
@@ -5085,7 +5099,6 @@ var MarsGeometry = /** @class */ (function () {
                 buffers[name] = {
                     data: data,
                     usage: usage,
-                    target: constants.ARRAY_BUFFER,
                     name: name,
                 };
                 var gltype = attributeData2GLType(data);
@@ -5125,6 +5138,9 @@ var MarsGeometry = /** @class */ (function () {
         });
         // 顶点索引
         this._index = (_a = option.index) === null || _a === void 0 ? void 0 : _a.data;
+        if (this._index instanceof Uint8Array) {
+            throw Error('Uint8 Index not support');
+        }
         dirtyFlags['index'] = {
             dirty: true,
             discard: true,
@@ -5240,7 +5256,6 @@ var MarsGeometry = /** @class */ (function () {
                 data: data,
                 usage: gpuBufferOption.usage,
                 target: gpuBufferOption.target,
-                elementCount: data.length,
             };
             buffers[gpuBufferName] = option;
             this._dirtyFlags[gpuBufferName].discard = true;
@@ -5340,19 +5355,21 @@ var MarsGeometry = /** @class */ (function () {
         return this._attributesName;
     };
     MarsGeometry.prototype.assignRenderer = function (renderer) {
-        var _a;
         if (!this.internal) {
             // 索引缓冲区参数
             var indexBufferOption = undefined;
             if (this._index) {
-                var type = INDEX_TYPE_MAP[(_a = this._index) === null || _a === void 0 ? void 0 : _a.BYTES_PER_ELEMENT];
                 var data = this._index;
                 indexBufferOption = {
-                    target: constants.ELEMENT_ARRAY_BUFFER,
-                    type: type,
                     data: data,
                     usage: constants.STATIC_DRAW,
                 };
+                if (data instanceof Uint16Array) {
+                    this.indexDataType = constants.UNSIGNED_SHORT;
+                }
+                else if (data instanceof Uint32Array) {
+                    this.indexDataType = constants.UNSIGNED_INT;
+                }
             }
             // 顶点属性参数
             var options = {
@@ -5363,6 +5380,7 @@ var MarsGeometry = /** @class */ (function () {
                 buffers: this._buffers,
                 mode: this.mode,
                 index: indexBufferOption,
+                indexDataType: this.indexDataType,
                 name: this.name,
             };
             //@ts-expect-error safe to set
@@ -5771,7 +5789,8 @@ var MarsSharedGeometry = /** @class */ (function (_super) {
             glgeo.drawStart = this.drawStart;
             glgeo.mode = this.mode;
             if (this._index) {
-                glgeo._indexBuffer = glgeo.createIndexBuffer(this._index, renderer.internal);
+                var ret = glgeo.createIndexBuffer(this._index, renderer.internal);
+                glgeo.setIndexBuffer(ret[0], ret[1]);
             }
             //@ts-expect-error safe to assign
             this.internal = glgeo;
@@ -5802,7 +5821,7 @@ var MarsSharedGeometry = /** @class */ (function (_super) {
     return MarsSharedGeometry;
 }(MarsGeometry));
 
-consoleLog('version: ' + "0.1.61-beta.8");
+consoleLog('version: ' + "0.1.61");
 
-export { DestroyOptions, MarsGeometry as Geometry, MarsInstancedMesh as InstancedMesh, MarsTextureFactory, MarsMaterial as Material, MarsMaterialDataBlock as MaterialDataBlock, MarsMesh as Mesh, MarsRenderFrame as RenderFrame, MarsRenderPass as RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassMeshOrder, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, MarsRenderer as Renderer, ShaderCompileResultStatus, ShaderLibraryEmpty, MarsSharedGeometry as SharedGeometry, MarsTexture as Texture, TextureLoadAction, TextureSourceType, TextureStoreAction, constants, getDefaultGPUCapability, getDefaultTextureFactory, setDefaultTextureFactory };
+export { DestroyOptions, GPUBufferOptionsMemoryShared, MarsGeometry as Geometry, MarsInstancedMesh as InstancedMesh, MarsTextureFactory, MarsMaterial as Material, MarsMaterialDataBlock as MaterialDataBlock, MarsMesh as Mesh, MarsRenderFrame as RenderFrame, MarsRenderPass as RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassMeshOrder, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, MarsRenderer as Renderer, ShaderCompileResultStatus, ShaderLibraryEmpty, MarsSharedGeometry as SharedGeometry, MarsTexture as Texture, TextureLoadAction, TextureSourceType, TextureStoreAction, constants, getDefaultGPUCapability, getDefaultTextureFactory, setDefaultTextureFactory };
 //# sourceMappingURL=index.mjs.map