@babylonjs/core 5.0.0-alpha.60 → 5.0.0-alpha.64

package/Particles/particleSystem.js

@@ -162,11 +162,8 @@ var ParticleSystem = /** @class */ (function (_super) {
         _this._attachImageProcessingConfiguration(null);
         _this._customWrappers = { 0: new DrawWrapper(_this._engine) };
         _this._customWrappers[0].effect = customEffect;
-        _this._drawWrappers = { 0: new DrawWrapper(_this._engine) };
+        _this._drawWrappers = [];
         _this._useInstancing = _this._engine.getCaps().instancedArrays;
-        if (_this._drawWrappers[0].drawContext) {
-            _this._drawWrappers[0].drawContext.useInstancing = _this._useInstancing;
-        }
         _this._createIndexBuffer();
         _this._createVertexBuffers();
         // Default emitter type
@@ -838,11 +835,16 @@ var ParticleSystem = /** @class */ (function (_super) {
      * Resets the draw wrappers cache
      */
     ParticleSystem.prototype.resetDrawCache = function () {
-        var _a;
-        for (var blendMode in this._drawWrappers) {
-            var drawWrapper = this._drawWrappers[blendMode];
-            (_a = drawWrapper.drawContext) === null || _a === void 0 ? void 0 : _a.reset();
+        for (var _i = 0, _a = this._drawWrappers; _i < _a.length; _i++) {
+            var drawWrappers = _a[_i];
+            if (drawWrappers) {
+                for (var _b = 0, drawWrappers_1 = drawWrappers; _b < drawWrappers_1.length; _b++) {
+                    var drawWrapper = drawWrappers_1[_b];
+                    drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.dispose();
+                }
+            }
         }
+        this._drawWrappers = [];
     };
     ParticleSystem.prototype._fetchR = function (u, v, width, height, pixels) {
         u = Math.abs(u) * 0.5 + 0.5;
@@ -1480,13 +1482,18 @@ var ParticleSystem = /** @class */ (function (_super) {
         var defines = [];
         this.fillDefines(defines, blendMode);
         // Effect
-        var drawWrapper = this._drawWrappers[blendMode];
+        var currentRenderPassId = this._engine._features.supportRenderPasses ? this._engine.currentRenderPassId : 0;
+        var drawWrappers = this._drawWrappers[currentRenderPassId];
+        if (!drawWrappers) {
+            drawWrappers = this._drawWrappers[currentRenderPassId] = [];
+        }
+        var drawWrapper = drawWrappers[blendMode];
         if (!drawWrapper) {
             drawWrapper = new DrawWrapper(this._engine);
             if (drawWrapper.drawContext) {
                 drawWrapper.drawContext.useInstancing = this._useInstancing;
             }
-            this._drawWrappers[blendMode] = drawWrapper;
+            drawWrappers[blendMode] = drawWrapper;
         }
         var join = defines.join("\n");
         if (drawWrapper.defines !== join) {
@@ -1579,7 +1586,7 @@ var ParticleSystem = /** @class */ (function (_super) {
                 offset += this._useInstancing ? 1 : 4;
             }
             if (this._vertexBuffer) {
-                this._vertexBuffer.update(this._vertexData);
+                this._vertexBuffer.updateDirectly(this._vertexData, 0, this._particles.length);
             }
         }
         if (this.manualEmitCount === 0 && this.disposeOnStop) {
@@ -1743,11 +1750,7 @@ var ParticleSystem = /** @class */ (function (_super) {
      */
     ParticleSystem.prototype.dispose = function (disposeTexture) {
         if (disposeTexture === void 0) { disposeTexture = true; }
-        for (var blendMode in this._drawWrappers) {
-            var drawWrapper = this._drawWrappers[blendMode];
-            drawWrapper.dispose();
-        }
-        this._drawWrappers = {};
+        this.resetDrawCache();
         if (this._vertexBuffer) {
             this._vertexBuffer.dispose();
             this._vertexBuffer = null;
@@ -1777,6 +1780,9 @@ var ParticleSystem = /** @class */ (function (_super) {
             this._rampGradientsTexture = null;
         }
         this._removeFromRoot();
+        if (this.subEmitters && !this._subEmitters) {
+            this._prepareSubEmitterInternalArray();
+        }
         if (this._subEmitters && this._subEmitters.length) {
             for (var index = 0; index < this._subEmitters.length; index++) {
                 for (var _i = 0, _a = this._subEmitters[index]; _i < _a.length; _i++) {