@galacean/engine 1.2.0-beta.5 → 1.2.0-beta.6

package/dist/browser.js

@@ -8847,6 +8847,7 @@
             var program = this._glProgram;
             var uniformInfos = this._getUniformInfos();
             var attributeInfos = this._getAttributeInfos();
+            var basicResources = this._engine._basicResources;
             uniformInfos.forEach(function(param) {
                 var name1 = param.name, size = param.size, type = param.type;
                 var shaderUniform = new ShaderUniform(_this._engine);
@@ -8940,16 +8941,16 @@
                         var defaultTexture;
                         switch(type){
                             case gl.SAMPLER_2D:
-                                defaultTexture = _this._engine._magentaTexture2D;
+                                defaultTexture = basicResources.whiteTexture2D;
                                 break;
                             case gl.SAMPLER_CUBE:
-                                defaultTexture = _this._engine._magentaTextureCube;
+                                defaultTexture = basicResources.whiteTextureCube;
                                 break;
                             case gl.UNSIGNED_INT_SAMPLER_2D:
-                                defaultTexture = _this._engine._uintMagentaTexture2D;
+                                defaultTexture = basicResources.uintWhiteTexture2D;
                                 break;
                             case gl.SAMPLER_2D_ARRAY:
-                                defaultTexture = _this._engine._magentaTexture2DArray;
+                                defaultTexture = basicResources.whiteTexture2DArray;
                                 break;
                             case gl.SAMPLER_2D_SHADOW:
                                 defaultTexture = _this._engine._depthTexture2D;
@@ -11259,14 +11260,15 @@
             }
             this._endLoop(swapFn);
         };
-        _proto.forEachAndClean = function forEachAndClean(callbackFn) {
+        _proto.forEachAndClean = function forEachAndClean(callbackFn, swapFn) {
             this._startLoop();
+            var preEnd = this.length;
             var elements = this._elements;
-            for(var i = 0, n = this.length; i < n; i++){
+            for(var i = 0, n = preEnd; i < n; i++){
                 var element = elements[i];
                 element && callbackFn(element);
             }
-            this._endLoopAndClear();
+            this._endLoopAndClean(preEnd, elements, swapFn);
         };
         _proto.sort = function sort(compareFn) {
             Utils._quickSort(this._elements, 0, this.length, compareFn);
@@ -11299,9 +11301,17 @@
                 this._blankCount = 0;
             }
         };
-        _proto._endLoopAndClear = function _endLoopAndClear() {
+        _proto._endLoopAndClean = function _endLoopAndClean(preEnd, elements, swapFn) {
+            var index = 0;
+            for(var i = preEnd, n = this.length; i < n; i++){
+                var element = elements[i];
+                if (!element) continue;
+                elements[index] = element;
+                swapFn(element, index);
+                index++;
+            }
             this._isLooping = false;
-            this.length = 0;
+            this.length = index;
             this._blankCount = 0;
         };
         return DisorderedArray;
@@ -20636,6 +20646,26 @@
             this.blitMesh = this._createBlitMesh(engine, vertices);
             this.flipYBlitMesh = this._createBlitMesh(engine, flipYVertices);
             this.blitMaterial = blitMaterial;
+            // Create white and magenta textures
+            var whitePixel = new Uint8Array([
+                255,
+                255,
+                255,
+                255
+            ]);
+            this.whiteTexture2D = this._create1x1Texture(engine, 0, exports.TextureFormat.R8G8B8A8, whitePixel);
+            this.whiteTextureCube = this._create1x1Texture(engine, 1, exports.TextureFormat.R8G8B8A8, whitePixel);
+            var isWebGL2 = engine._hardwareRenderer.isWebGL2;
+            if (isWebGL2) {
+                this.whiteTexture2DArray = this._create1x1Texture(engine, 2, exports.TextureFormat.R8G8B8A8, whitePixel);
+                var whitePixel32 = new Uint32Array([
+                    255,
+                    255,
+                    255,
+                    255
+                ]);
+                this.uintWhiteTexture2D = this._create1x1Texture(engine, 0, exports.TextureFormat.R32G32B32A32_UInt, whitePixel32);
+            }
         };
         var _proto = BasicResources.prototype;
         _proto._createBlitMesh = function _createBlitMesh(engine, vertices) {
@@ -20648,8 +20678,63 @@
             mesh.addSubMesh(0, 4, exports.MeshTopology.TriangleStrip);
             return mesh;
         };
+        _proto._create1x1Texture = function _create1x1Texture(engine, type, format, pixel) {
+            var texture;
+            switch(type){
+                case 0:
+                    var texture2D = new Texture2D(engine, 1, 1, format, false);
+                    texture2D.setPixelBuffer(pixel);
+                    texture = texture2D;
+                    break;
+                case 2:
+                    var texture2DArray = new Texture2DArray(engine, 1, 1, 1, format, false);
+                    texture2DArray.setPixelBuffer(0, pixel);
+                    texture = texture2DArray;
+                    break;
+                case 1:
+                    var textureCube = new TextureCube(engine, 1, format, false);
+                    for(var i = 0; i < 6; i++){
+                        textureCube.setPixelBuffer(exports.TextureCubeFace.PositiveX + i, pixel);
+                    }
+                    texture = textureCube;
+                    break;
+                default:
+                    throw "Invalid texture type";
+            }
+            texture.isGCIgnored = true;
+            engine.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
+                var _class = function _class() {
+                    return ContentRestorer.call(this, texture);
+                };
+                _inherits$2(_class, ContentRestorer);
+                var _proto = _class.prototype;
+                _proto.restoreContent = function restoreContent() {
+                    switch(type){
+                        case 0:
+                            this.resource.setPixelBuffer(pixel);
+                            break;
+                        case 2:
+                            this.resource.setPixelBuffer(0, pixel);
+                            break;
+                        case 1:
+                            for(var i = 0; i < 6; i++){
+                                this.resource.setPixelBuffer(exports.TextureCubeFace.PositiveX + i, pixel);
+                            }
+                            break;
+                    }
+                };
+                return _class;
+            }(ContentRestorer))());
+            return texture;
+        };
         return BasicResources;
     }();
+    var TextureType;
+    (function(TextureType) {
+        TextureType[TextureType["Texture2D"] = 0] = "Texture2D";
+        TextureType[TextureType["TextureCube"] = 1] = "TextureCube";
+        TextureType[TextureType["Texture2DArray"] = 2] = "Texture2DArray";
+    })(TextureType || (TextureType = {}));
     /**
      * @internal
      * Rendering context.
@@ -25099,7 +25184,6 @@
                 _this.xrManager = new XRManager();
                 _this.xrManager._initialize(_assert_this_initialized(_this), xrDevice);
             }
-            _this._initMagentaTextures(hardwareRenderer);
             if (!hardwareRenderer.canIUse(exports.GLCapabilityType.depthTexture)) {
                 _this._macroCollection.enable(Engine._noDepthTextureMacro);
             } else {
@@ -25335,99 +25419,6 @@
         };
         /**
        * @internal
-       * Standalone for CanvasRenderer plugin.
-       */ _proto._initMagentaTextures = function _initMagentaTextures(hardwareRenderer) {
-            var whitePixel = new Uint8Array([
-                255,
-                255,
-                255,
-                255
-            ]);
-            var whiteTexture2D = new Texture2D(this, 1, 1, exports.TextureFormat.R8G8B8A8, false);
-            whiteTexture2D.setPixelBuffer(whitePixel);
-            whiteTexture2D.isGCIgnored = true;
-            var magentaPixel = new Uint8Array([
-                255,
-                0,
-                255,
-                255
-            ]);
-            var magentaTexture2D = new Texture2D(this, 1, 1, exports.TextureFormat.R8G8B8A8, false);
-            magentaTexture2D.setPixelBuffer(magentaPixel);
-            magentaTexture2D.isGCIgnored = true;
-            this.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
-                var _class = function _class() {
-                    return ContentRestorer.call(this, magentaTexture2D);
-                };
-                _inherits$2(_class, ContentRestorer);
-                var _proto = _class.prototype;
-                _proto.restoreContent = function restoreContent() {
-                    this.resource.setPixelBuffer(magentaPixel);
-                };
-                return _class;
-            }(ContentRestorer))());
-            var magentaTextureCube = new TextureCube(this, 1, exports.TextureFormat.R8G8B8A8, false);
-            for(var i = 0; i < 6; i++){
-                magentaTextureCube.setPixelBuffer(exports.TextureCubeFace.PositiveX + i, magentaPixel);
-            }
-            magentaTextureCube.isGCIgnored = true;
-            this.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
-                var _class = function _class() {
-                    return ContentRestorer.call(this, magentaTextureCube);
-                };
-                _inherits$2(_class, ContentRestorer);
-                var _proto = _class.prototype;
-                _proto.restoreContent = function restoreContent() {
-                    for(var i = 0; i < 6; i++){
-                        this.resource.setPixelBuffer(exports.TextureCubeFace.PositiveX + i, magentaPixel);
-                    }
-                };
-                return _class;
-            }(ContentRestorer))());
-            this._whiteTexture2D = whiteTexture2D;
-            this._magentaTexture2D = magentaTexture2D;
-            this._magentaTextureCube = magentaTextureCube;
-            if (hardwareRenderer.isWebGL2) {
-                var magentaPixel32 = new Uint32Array([
-                    255,
-                    0,
-                    255,
-                    255
-                ]);
-                var uintMagentaTexture2D = new Texture2D(this, 1, 1, exports.TextureFormat.R32G32B32A32_UInt, false);
-                uintMagentaTexture2D.setPixelBuffer(magentaPixel32);
-                uintMagentaTexture2D.isGCIgnored = true;
-                this.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
-                    var _class = function _class() {
-                        return ContentRestorer.call(this, uintMagentaTexture2D);
-                    };
-                    _inherits$2(_class, ContentRestorer);
-                    var _proto = _class.prototype;
-                    _proto.restoreContent = function restoreContent() {
-                        this.resource.setPixelBuffer(magentaPixel32);
-                    };
-                    return _class;
-                }(ContentRestorer))());
-                var magentaTexture2DArray = new Texture2DArray(this, 1, 1, 1, exports.TextureFormat.R8G8B8A8, false);
-                magentaTexture2DArray.setPixelBuffer(0, magentaPixel);
-                magentaTexture2DArray.isGCIgnored = true;
-                this.resourceManager.addContentRestorer(new /*#__PURE__*/ (function(ContentRestorer) {
-                    var _class = function _class() {
-                        return ContentRestorer.call(this, magentaTexture2DArray);
-                    };
-                    _inherits$2(_class, ContentRestorer);
-                    var _proto = _class.prototype;
-                    _proto.restoreContent = function restoreContent() {
-                        this.resource.setPixelBuffer(0, magentaPixel);
-                    };
-                    return _class;
-                }(ContentRestorer))());
-                this._uintMagentaTexture2D = uintMagentaTexture2D;
-                this._magentaTexture2DArray = magentaTexture2DArray;
-            }
-        };
-        /**
-       * @internal
        */ _proto._pendingGC = function _pendingGC() {
             if (this._frameInProcess) {
                 this._waitingGC = true;
@@ -26061,6 +26052,8 @@
                     script._started = true;
                     _this.removeOnStartScript(script);
                     script.onStart();
+                }, function(element, index) {
+                    element._onStartIndex = index;
                 });
             }
         };
@@ -28974,7 +28967,7 @@
                 depthOnlyPass.onConfig(camera);
                 depthOnlyPass.onRender(context, cullingResults);
             } else {
-                camera.shaderData.setTexture(exports.Camera._cameraDepthTextureProperty, engine._whiteTexture2D);
+                camera.shaderData.setTexture(exports.Camera._cameraDepthTextureProperty, engine._basicResources.whiteTexture2D);
             }
             // Check if need to create internal color texture
             var independentCanvasEnabled = camera.independentCanvasEnabled;
@@ -42947,7 +42940,8 @@
             var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
             var materialPromises = new Array(rendererCount);
             for(var i = 0; i < rendererCount; i++){
-                materialPromises[i] = context.get(exports.GLTFParserType.Material, glTFMeshPrimitives[i].material);
+                var _glTFMeshPrimitives_i_material;
+                materialPromises[i] = context.get(exports.GLTFParserType.Material, (_glTFMeshPrimitives_i_material = glTFMeshPrimitives[i].material) != null ? _glTFMeshPrimitives_i_material : -1);
             }
             return Promise.all([
                 context.get(exports.GLTFParserType.Mesh, meshID),
@@ -45092,7 +45086,7 @@
     ], KHR_materials_anisotropy);
 
     //@ts-ignore
-    var version = "1.2.0-beta.5";
+    var version = "1.2.0-beta.6";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);