@predy-js/render-interface 0.1.61-beta.2 → 0.1.61-beta.22

package/dist/index.mjs

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.1.61-beta.2
+ * Version: v0.1.61-beta.22
  */
 
 /******************************************************************************
@@ -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];
 }
@@ -466,7 +468,7 @@ function renderMeshes(renderer, state) {
         else if (!mesh.hide) {
             delegate.willRenderMesh && delegate.willRenderMesh(mesh, state);
             renderMesh(renderer, mesh, state);
-            delegate.didiRenderMesh && delegate.didiRenderMesh(mesh, state);
+            delegate.didRenderMesh && delegate.didRenderMesh(mesh, state);
         }
     }
     for (var i = 0; i < sortedMeshes.length; i++) {
@@ -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;
@@ -1790,65 +1790,77 @@ var GLProgram = /** @class */ (function () {
             renderer.state.useProgram(this.glHandle);
         }
     };
+    GLProgram.prototype.getSemanticValue = function (state, semanticName) {
+        var renderPassSemantics = state.currentPass.semantics;
+        var renderFrameSemantics = state.currentFrame.semantics;
+        if (renderPassSemantics.hasSemanticValue(semanticName)) {
+            return renderPassSemantics.getSemanticValue(semanticName, state);
+        }
+        else if (renderFrameSemantics.hasSemanticValue(semanticName)) {
+            return renderFrameSemantics.getSemanticValue(semanticName, state);
+        }
+    };
     GLProgram.prototype.setupUniforms = function (state) {
         var _this = this;
         this.bind();
-        var frame = state.currentFrame;
         var material = state.currentMesh.material;
         var gl = this.renderer.gl;
         var blocks = material._dataBlocks;
         var shared = this.shared;
-        var uniformSemantics = material.uniformSemantics;
-        var renderPassSemantics = state.currentPass.semantics;
-        var renderFrameSemantics = frame.semantics;
-        // semantic {uModel:'MODEL'}
         temArr.clear();
         forEach(this.uniformBlockMap, function (uboInfo, name) {
             if (uboInfo) {
-                for (var i = 0; i < blocks.length; i++) {
-                    var block = blocks[i];
-                    var uboBuffer = block.createUboBuffer(uboInfo);
+                var block_1 = material.getDataBlockByName(uboInfo.name);
+                if (block_1) {
+                    forEach(block_1.uniformSemantics, function (semanticName, uniformName) {
+                        if (uniformName in uboInfo.uniforms && !block_1.hasUniformValue(uniformName)) {
+                            var val = _this.getSemanticValue(state, semanticName);
+                            if (val || val === 0) {
+                                block_1.setUniformValue(uniformName, val, true);
+                            }
+                        }
+                    });
+                    var uboBuffer = block_1.createUboBuffer(uboInfo);
                     if (uboBuffer) {
-                        block.setUboBuffer(uboBuffer);
-                        temArr.add(block);
+                        block_1.setUboBuffer(uboBuffer);
+                        temArr.add(block_1);
                         return uboBuffer.bind(gl, _this.glHandle, uboInfo.index);
                     }
                 }
             }
         });
         forEach(this.uniformInfoMap, function (info, name) {
-            var val, hasUniformValue;
+            var val;
             for (var i = 0; i < blocks.length; i++) {
                 var block = blocks[i];
-                if (temArr.has(block)) {
+                var semanticName = block.uniformSemantics[name];
+                if (info.isTexture) {
+                    if (block.hasUniformValue(name)) {
+                        val = block.getUniformTexture(name);
+                    }
+                    else if (semanticName) {
+                        val = _this.getSemanticValue(state, semanticName);
+                    }
+                }
+                else if (temArr.has(block)) {
                     continue;
                 }
-                if (block.hasUniformValue(name)) {
+                else if (block.hasUniformValue(name)) {
                     if (!shared && !block._uniformFlags[name] && info.textureIndex === -1) {
                         //not dirty, don't assign
                         return;
                     }
                     val = block.getUniformValue(name);
-                    hasUniformValue = true;
-                    break;
                 }
-            }
-            if (!hasUniformValue) {
-                var semanticName = uniformSemantics[name];
-                if (semanticName) {
-                    if (renderPassSemantics.hasSemanticValue(semanticName)) {
-                        val = renderPassSemantics.getSemanticValue(semanticName, state);
-                    }
-                    else if (renderFrameSemantics.hasSemanticValue(semanticName)) {
-                        val = renderFrameSemantics.getSemanticValue(semanticName, state);
-                    }
+                else if (semanticName) {
+                    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"));
                 }
-            }
-            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"));
             }
         });
     };
@@ -2418,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 () {
@@ -2749,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 () {
@@ -2802,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;
@@ -4452,24 +4470,29 @@ var GLMaterial = /** @class */ (function () {
 }());
 
 function isUniformStruct(value) {
-    return (isObj(value)) && (value.length === undefined) && value.assignRenderer === undefined;
+    return (isObj(value)) && (value.length === undefined);
 }
 function isUniformStructArray(value) {
     return (value) && (value.length !== undefined) && isUniformStruct(value[0]);
 }
 var MarsMaterialDataBlock = /** @class */ (function () {
     function MarsMaterialDataBlock(props, renderer) {
+        var _this = this;
         this._isDestroyed = false;
         this._isDestroyed = false;
         this.name = props.name || 'defDataBlock';
         this._uniformValues = {};
         this._uniformFlags = {};
         this.uboBufferMap = {};
+        this._uniformTextures = {};
         this._uniformValueRanges = {};
         this._keepUboData = !!props.keepUboData;
+        this.uniformSemantics = props.uniformSemantics || {};
+        this._uniformPrivate = {};
         if (props.uniformValues) {
             this.setUniformValues(props.uniformValues);
         }
+        forEach(props.uniformTextures, function (tex, name) { return _this.setUniformTexture(name, tex); });
         if (renderer) {
             this.assignRenderer(renderer);
         }
@@ -4507,6 +4530,20 @@ var MarsMaterialDataBlock = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    MarsMaterialDataBlock.prototype.setUniformTexture = function (uniformName, texture) {
+        if (texture) {
+            this._uniformTextures[uniformName] = texture;
+            this._assignUniformValueRenderer(texture, this.renderer);
+            this._uniformPrivate[uniformName] = true;
+        }
+        else {
+            delete this._uniformTextures[uniformName];
+            delete this._uniformPrivate[uniformName];
+        }
+    };
+    MarsMaterialDataBlock.prototype.getUniformTexture = function (uniformName) {
+        return this._uniformTextures[uniformName];
+    };
     MarsMaterialDataBlock.prototype.assignRenderer = function (renderer) {
         var _this = this;
         if (this.renderer && renderer !== this.renderer) {
@@ -4515,7 +4552,7 @@ var MarsMaterialDataBlock = /** @class */ (function () {
         if (renderer && !this.renderer) {
             // @ts-expect-error safe to assign
             this.renderer = renderer;
-            forEach(this._uniformValues, function (value) {
+            forEach(this._uniformTextures, function (value) {
                 _this._assignUniformValueRenderer(value, renderer);
             });
         }
@@ -4544,11 +4581,11 @@ var MarsMaterialDataBlock = /** @class */ (function () {
         this._uniformFlags[name] = true;
     };
     MarsMaterialDataBlock.prototype.hasUniformValue = function (name) {
-        return name in this._uniformValues;
+        return !!this._uniformPrivate[name];
     };
     MarsMaterialDataBlock.prototype.destroy = function (options) {
         if ((options === null || options === void 0 ? void 0 : options.textures) !== DestroyOptions.keep) {
-            forEach(this._uniformValues, function (uniform) {
+            forEach(this._uniformTextures, function (uniform) {
                 if (uniform instanceof MarsTexture) {
                     uniform.destroy();
                 }
@@ -4561,10 +4598,13 @@ var MarsMaterialDataBlock = /** @class */ (function () {
         });
         // @ts-expect-error safe to assign
         this.uboBufferMap = {};
+        this._uniformPrivate = {};
         // @ts-expect-error safe to assign
         this._uniformFlags = {};
         // @ts-expect-error safe to assign
         this._uniformValues = {};
+        // @ts-expect-error safe to assign
+        this._uniformTextures = {};
         this.assignRenderer = throwDestroyedError;
         this._isDestroyed = true;
     };
@@ -4574,20 +4614,39 @@ var MarsMaterialDataBlock = /** @class */ (function () {
     MarsMaterialDataBlock.prototype.getUniformValues = function () {
         return this._uniformValues;
     };
-    MarsMaterialDataBlock.prototype.setUniformValue = function (name, value) {
+    MarsMaterialDataBlock.prototype.setUniformValue = function (name, value, isSemantic) {
         var _this = this;
         if (value === undefined) {
+            var originValue = this._uniformValues[name];
+            if (isUniformStruct(originValue)) {
+                forEach(originValue, function (data, key) {
+                    var nameInStruct = name + '.' + key;
+                    delete _this._uniformPrivate[nameInStruct];
+                });
+            }
+            else if (isUniformStructArray(originValue)) {
+                originValue.forEach(function (valueData, i) {
+                    forEach(valueData, function (valueInStruct, key) {
+                        var nameInStruct = name + '[' + i + ']' + '.' + key;
+                        delete _this._uniformPrivate[nameInStruct];
+                    });
+                });
+            }
             delete this._uniformValues[name];
             this._uniformFlags[name] = false;
+            delete this._uniformPrivate[name];
+        }
+        else if (value instanceof MarsTexture) {
+            throw Error('setUniformValue not accept texture:' + name);
         }
         else {
+            this._uniformPrivate[name] = !isSemantic;
             if (isUniformStruct(value)) {
                 forEach(value, function (data, key) {
                     var nameInStruct = name + '.' + key;
-                    var valueInStruct = data;
-                    _this._uniformValues[nameInStruct] = valueInStruct;
+                    _this._uniformValues[nameInStruct] = data;
                     _this._uniformFlags[nameInStruct] = true;
-                    _this._assignUniformValueRenderer(valueInStruct, _this.renderer);
+                    _this._uniformPrivate[nameInStruct] = true;
                 });
                 // 只是用来保存结构体对象
                 this._uniformValues[name] = value;
@@ -4599,7 +4658,7 @@ var MarsMaterialDataBlock = /** @class */ (function () {
                         var nameInStruct = name + '[' + i + ']' + '.' + key;
                         _this._uniformValues[nameInStruct] = valueInStruct;
                         _this._uniformFlags[nameInStruct] = true;
-                        _this._assignUniformValueRenderer(valueInStruct, _this.renderer);
+                        _this._uniformPrivate[nameInStruct] = true;
                     });
                 });
                 // 只是用来保存结构体对象
@@ -4609,7 +4668,6 @@ var MarsMaterialDataBlock = /** @class */ (function () {
             else {
                 this._uniformValues[name] = value;
                 this._uniformFlags[name] = true;
-                this._assignUniformValueRenderer(value, this.renderer);
             }
         }
         return true;
@@ -4620,10 +4678,21 @@ var MarsMaterialDataBlock = /** @class */ (function () {
             _this.setUniformValue(key, val);
         });
     };
+    MarsMaterialDataBlock.prototype.setUniformSemantic = function (name, semantic) {
+        if (semantic) {
+            this.uniformSemantics[name] = semantic;
+        }
+        else {
+            delete this.uniformSemantics[name];
+        }
+    };
     MarsMaterialDataBlock.prototype.clone = function (name) {
         return new MarsMaterialDataBlock({
             name: name,
             uniformValues: this._uniformValues,
+            uniformTextures: this._uniformTextures,
+            uniformSemantics: this.uniformSemantics,
+            keepUboData: this._keepUboData,
         }, this.renderer);
     };
     return MarsMaterialDataBlock;
@@ -4638,13 +4707,10 @@ var MarsMaterial = /** @class */ (function () {
         this.renderType = 0 /* MaterialRenderType.normal */;
         this.states = this.createMaterialStates(options.states);
         this.options = options;
+        this._dbMap = {};
         if (!this._dataBlocks.length) {
-            this._dataBlocks[0] = new MarsMaterialDataBlock({ name: '' });
-        }
-        if (options.uniformValues) {
-            this.defaultDataBlock.setUniformValues(options.uniformValues);
+            this._dataBlocks[0] = new MarsMaterialDataBlock({ name: 'main' });
         }
-        this.uniformSemantics = Object.assign({}, options.uniformSemantics);
     }
     Object.defineProperty(MarsMaterial.prototype, "isDestroyed", {
         get: function () {
@@ -4655,7 +4721,7 @@ var MarsMaterial = /** @class */ (function () {
     });
     Object.defineProperty(MarsMaterial.prototype, "dataBlocks", {
         get: function () {
-            return this._dataBlocks.slice();
+            return this._dataBlocks;
         },
         enumerable: false,
         configurable: true
@@ -4727,6 +4793,9 @@ var MarsMaterial = /** @class */ (function () {
         return Object.freeze(ret);
     };
     MarsMaterial.prototype.addDataBlock = function (b) {
+        if (this.getDataBlockByName(b.name)) {
+            throw Error('dataBlock with same name:' + b.name);
+        }
         if (arrAdd(this._dataBlocks, b)) {
             b.invalidAllFlags();
             var r = this.renderer;
@@ -4735,16 +4804,19 @@ var MarsMaterial = /** @class */ (function () {
             }
         }
     };
+    MarsMaterial.prototype.getDataBlockByName = function (name) {
+        var cache = this._dbMap[name];
+        if (!cache) {
+            var db = this._dataBlocks.find(function (db) { return db.name === name; });
+            if (db) {
+                return this._dbMap[name] = db;
+            }
+        }
+        return cache;
+    };
     MarsMaterial.prototype.removeDataBlock = function (b) {
         arrRemove(this._dataBlocks, b);
-    };
-    MarsMaterial.prototype.setUniformSemantic = function (uniformName, semantic) {
-        if (semantic === undefined) {
-            delete this.uniformSemantics[uniformName];
-        }
-        else {
-            this.uniformSemantics[uniformName] = semantic;
-        }
+        delete this._dbMap[b.name];
     };
     MarsMaterial.prototype.assignRenderer = function (renderer) {
         if (!this.materialInternal) {
@@ -4818,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对象。
  *
@@ -4849,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;
@@ -4871,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];
@@ -4924,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);
@@ -5023,7 +5099,6 @@ var MarsGeometry = /** @class */ (function () {
                 buffers[name] = {
                     data: data,
                     usage: usage,
-                    target: constants.ARRAY_BUFFER,
                     name: name,
                 };
                 var gltype = attributeData2GLType(data);
@@ -5063,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,
@@ -5177,8 +5255,6 @@ var MarsGeometry = /** @class */ (function () {
             var option = {
                 data: data,
                 usage: gpuBufferOption.usage,
-                target: gpuBufferOption.target,
-                elementCount: data.length,
             };
             buffers[gpuBufferName] = option;
             this._dirtyFlags[gpuBufferName].discard = true;
@@ -5278,19 +5354,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.SHORT;
+                }
+                else if (data instanceof Uint32Array) {
+                    this.indexDataType = constants.INT;
+                }
             }
             // 顶点属性参数
             var options = {
@@ -5301,6 +5379,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
@@ -5515,7 +5594,7 @@ var MarsExtWrap = /** @class */ (function () {
                 fb.viewport[3] = target.height || source.height;
                 renderer.internal.resetColorAttachments(fb, [target.internal]);
                 var mesh = rp.meshes[0];
-                mesh.material.defaultDataBlock.setUniformValue('uTex', source);
+                mesh.material.defaultDataBlock.setUniformTexture('uTex', source);
                 RenderFrameInternal.renderRenderPass(renderer, rp, { currentFrame: {} });
             }
         }
@@ -5660,6 +5739,20 @@ var MarsRenderer = /** @class */ (function () {
             }
         }
     };
+    MarsRenderer.prototype.cancelAnimationFrame = function (id) {
+        return window.cancelAnimationFrame(id);
+    };
+    MarsRenderer.prototype.getErrors = function () {
+        var gl = this.internal.gl;
+        var err = gl.getError();
+        if (err) {
+            return ['webgl error:' + err];
+        }
+        return [];
+    };
+    MarsRenderer.prototype.requestAnimationFrame = function (cb) {
+        return window.requestAnimationFrame(cb);
+    };
     return MarsRenderer;
 }());
 
@@ -5695,7 +5788,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;
@@ -5726,7 +5820,7 @@ var MarsSharedGeometry = /** @class */ (function (_super) {
     return MarsSharedGeometry;
 }(MarsGeometry));
 
-consoleLog('version: ' + "0.1.61-beta.2");
+consoleLog('version: ' + "0.1.61-beta.22");
 
-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