@babylonjs/core 5.0.0-alpha.61 → 5.0.0-alpha.62

package/Meshes/mesh.vertexData.d.ts

@@ -1,6 +1,7 @@
 import { Nullable, FloatArray, IndicesArray } from "../types";
 import { Matrix, Vector3, Vector2, Vector4 } from "../Maths/math.vector";
 import { Color4, Color3 } from '../Maths/math.color';
+import { Coroutine } from '../Misc/coroutine';
 declare type Geometry = import("../Meshes/geometry").Geometry;
 declare type Mesh = import("../Meshes/mesh").Mesh;
 import { ICreateCapsuleOptions } from "./Builders/capsuleBuilder";
@@ -183,7 +184,9 @@ export declare class VertexData {
      * @returns VertexData.
      */
     updateGeometry(geometry: Geometry): VertexData;
-    private _applyTo;
+    private readonly _applyTo;
+    /** @hidden */
+    _applyToCoroutine(meshOrGeometry: IGetSetVerticesData, updatable: boolean | undefined, isAsync: boolean): Coroutine<VertexData>;
     private _update;
     private static _TransformVector3Coordinates;
     private static _TransformVector3Normals;
@@ -202,6 +205,8 @@ export declare class VertexData {
      * @returns the modified VertexData
      */
     merge(others: VertexData | VertexData[], use32BitsIndices?: boolean): VertexData;
+    /** @hidden */
+    _mergeCoroutine(others: VertexData | VertexData[], use32BitsIndices: boolean | undefined, isAsync: boolean): Coroutine<VertexData>;
     private static _mergeElement;
     private _validate;
     /**

package/Meshes/mesh.vertexData.js

@@ -1,15 +1,17 @@
-import { __decorate } from "tslib";
+import { __decorate, __generator } from "tslib";
 import { Vector3, Vector4, TmpVectors } from "../Maths/math.vector.js";
 import { VertexBuffer } from "../Buffers/buffer.js";
 import { _WarnImport } from '../Misc/devTools.js';
 import { Color4 } from '../Maths/math.color.js';
 import { Logger } from '../Misc/logger.js';
 import { nativeOverride } from '../Misc/decorators.js';
+import { makeSyncFunction, runCoroutineSync } from '../Misc/coroutine.js';
 /**
  * This class contains the various kinds of data on every vertex of a mesh used in determining its shape and appearance
  */
 var VertexData = /** @class */ (function () {
     function VertexData() {
+        this._applyTo = makeSyncFunction(this._applyToCoroutine.bind(this));
     }
     /**
      * Uses the passed data array to set the set the values for the specified kind of data
@@ -73,7 +75,7 @@ var VertexData = /** @class */ (function () {
      * @returns the VertexData
      */
     VertexData.prototype.applyToMesh = function (mesh, updatable) {
-        this._applyTo(mesh, updatable);
+        this._applyTo(mesh, updatable, false);
         return this;
     };
     /**
@@ -84,7 +86,7 @@ var VertexData = /** @class */ (function () {
      * @returns VertexData
      */
     VertexData.prototype.applyToGeometry = function (geometry, updatable) {
-        this._applyTo(geometry, updatable);
+        this._applyTo(geometry, updatable, false);
         return this;
     };
     /**
@@ -109,57 +111,138 @@ var VertexData = /** @class */ (function () {
         this._update(geometry);
         return this;
     };
-    VertexData.prototype._applyTo = function (meshOrGeometry, updatable) {
+    /** @hidden */
+    VertexData.prototype._applyToCoroutine = function (meshOrGeometry, updatable, isAsync) {
         if (updatable === void 0) { updatable = false; }
-        if (this.positions) {
-            meshOrGeometry.setVerticesData(VertexBuffer.PositionKind, this.positions, updatable);
-        }
-        if (this.normals) {
-            meshOrGeometry.setVerticesData(VertexBuffer.NormalKind, this.normals, updatable);
-        }
-        if (this.tangents) {
-            meshOrGeometry.setVerticesData(VertexBuffer.TangentKind, this.tangents, updatable);
-        }
-        if (this.uvs) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UVKind, this.uvs, updatable);
-        }
-        if (this.uvs2) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UV2Kind, this.uvs2, updatable);
-        }
-        if (this.uvs3) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UV3Kind, this.uvs3, updatable);
-        }
-        if (this.uvs4) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UV4Kind, this.uvs4, updatable);
-        }
-        if (this.uvs5) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UV5Kind, this.uvs5, updatable);
-        }
-        if (this.uvs6) {
-            meshOrGeometry.setVerticesData(VertexBuffer.UV6Kind, this.uvs6, updatable);
-        }
-        if (this.colors) {
-            meshOrGeometry.setVerticesData(VertexBuffer.ColorKind, this.colors, updatable);
-        }
-        if (this.matricesIndices) {
-            meshOrGeometry.setVerticesData(VertexBuffer.MatricesIndicesKind, this.matricesIndices, updatable);
-        }
-        if (this.matricesWeights) {
-            meshOrGeometry.setVerticesData(VertexBuffer.MatricesWeightsKind, this.matricesWeights, updatable);
-        }
-        if (this.matricesIndicesExtra) {
-            meshOrGeometry.setVerticesData(VertexBuffer.MatricesIndicesExtraKind, this.matricesIndicesExtra, updatable);
-        }
-        if (this.matricesWeightsExtra) {
-            meshOrGeometry.setVerticesData(VertexBuffer.MatricesWeightsExtraKind, this.matricesWeightsExtra, updatable);
-        }
-        if (this.indices) {
-            meshOrGeometry.setIndices(this.indices, null, updatable);
-        }
-        else {
-            meshOrGeometry.setIndices([], null);
-        }
-        return this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!this.positions) return [3 /*break*/, 2];
+                    meshOrGeometry.setVerticesData(VertexBuffer.PositionKind, this.positions, updatable);
+                    if (!isAsync) return [3 /*break*/, 2];
+                    return [4 /*yield*/];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (!this.normals) return [3 /*break*/, 4];
+                    meshOrGeometry.setVerticesData(VertexBuffer.NormalKind, this.normals, updatable);
+                    if (!isAsync) return [3 /*break*/, 4];
+                    return [4 /*yield*/];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4:
+                    if (!this.tangents) return [3 /*break*/, 6];
+                    meshOrGeometry.setVerticesData(VertexBuffer.TangentKind, this.tangents, updatable);
+                    if (!isAsync) return [3 /*break*/, 6];
+                    return [4 /*yield*/];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    if (!this.uvs) return [3 /*break*/, 8];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UVKind, this.uvs, updatable);
+                    if (!isAsync) return [3 /*break*/, 8];
+                    return [4 /*yield*/];
+                case 7:
+                    _a.sent();
+                    _a.label = 8;
+                case 8:
+                    if (!this.uvs2) return [3 /*break*/, 10];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UV2Kind, this.uvs2, updatable);
+                    if (!isAsync) return [3 /*break*/, 10];
+                    return [4 /*yield*/];
+                case 9:
+                    _a.sent();
+                    _a.label = 10;
+                case 10:
+                    if (!this.uvs3) return [3 /*break*/, 12];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UV3Kind, this.uvs3, updatable);
+                    if (!isAsync) return [3 /*break*/, 12];
+                    return [4 /*yield*/];
+                case 11:
+                    _a.sent();
+                    _a.label = 12;
+                case 12:
+                    if (!this.uvs4) return [3 /*break*/, 14];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UV4Kind, this.uvs4, updatable);
+                    if (!isAsync) return [3 /*break*/, 14];
+                    return [4 /*yield*/];
+                case 13:
+                    _a.sent();
+                    _a.label = 14;
+                case 14:
+                    if (!this.uvs5) return [3 /*break*/, 16];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UV5Kind, this.uvs5, updatable);
+                    if (!isAsync) return [3 /*break*/, 16];
+                    return [4 /*yield*/];
+                case 15:
+                    _a.sent();
+                    _a.label = 16;
+                case 16:
+                    if (!this.uvs6) return [3 /*break*/, 18];
+                    meshOrGeometry.setVerticesData(VertexBuffer.UV6Kind, this.uvs6, updatable);
+                    if (!isAsync) return [3 /*break*/, 18];
+                    return [4 /*yield*/];
+                case 17:
+                    _a.sent();
+                    _a.label = 18;
+                case 18:
+                    if (!this.colors) return [3 /*break*/, 20];
+                    meshOrGeometry.setVerticesData(VertexBuffer.ColorKind, this.colors, updatable);
+                    if (!isAsync) return [3 /*break*/, 20];
+                    return [4 /*yield*/];
+                case 19:
+                    _a.sent();
+                    _a.label = 20;
+                case 20:
+                    if (!this.matricesIndices) return [3 /*break*/, 22];
+                    meshOrGeometry.setVerticesData(VertexBuffer.MatricesIndicesKind, this.matricesIndices, updatable);
+                    if (!isAsync) return [3 /*break*/, 22];
+                    return [4 /*yield*/];
+                case 21:
+                    _a.sent();
+                    _a.label = 22;
+                case 22:
+                    if (!this.matricesWeights) return [3 /*break*/, 24];
+                    meshOrGeometry.setVerticesData(VertexBuffer.MatricesWeightsKind, this.matricesWeights, updatable);
+                    if (!isAsync) return [3 /*break*/, 24];
+                    return [4 /*yield*/];
+                case 23:
+                    _a.sent();
+                    _a.label = 24;
+                case 24:
+                    if (!this.matricesIndicesExtra) return [3 /*break*/, 26];
+                    meshOrGeometry.setVerticesData(VertexBuffer.MatricesIndicesExtraKind, this.matricesIndicesExtra, updatable);
+                    if (!isAsync) return [3 /*break*/, 26];
+                    return [4 /*yield*/];
+                case 25:
+                    _a.sent();
+                    _a.label = 26;
+                case 26:
+                    if (!this.matricesWeightsExtra) return [3 /*break*/, 28];
+                    meshOrGeometry.setVerticesData(VertexBuffer.MatricesWeightsExtraKind, this.matricesWeightsExtra, updatable);
+                    if (!isAsync) return [3 /*break*/, 28];
+                    return [4 /*yield*/];
+                case 27:
+                    _a.sent();
+                    _a.label = 28;
+                case 28:
+                    if (!this.indices) return [3 /*break*/, 31];
+                    meshOrGeometry.setIndices(this.indices, null, updatable);
+                    if (!isAsync) return [3 /*break*/, 30];
+                    return [4 /*yield*/];
+                case 29:
+                    _a.sent();
+                    _a.label = 30;
+                case 30: return [3 /*break*/, 32];
+                case 31:
+                    meshOrGeometry.setIndices([], null);
+                    _a.label = 32;
+                case 32: return [2 /*return*/, this];
+            }
+        });
     };
     VertexData.prototype._update = function (meshOrGeometry, updateExtends, makeItUnique) {
         if (this.positions) {
@@ -278,73 +361,171 @@ var VertexData = /** @class */ (function () {
      * @returns the modified VertexData
      */
     VertexData.prototype.merge = function (others, use32BitsIndices) {
-        var _a, _b, _c, _d;
         if (use32BitsIndices === void 0) { use32BitsIndices = false; }
-        this._validate();
-        others = Array.isArray(others) ? others : [others];
-        for (var _i = 0, others_1 = others; _i < others_1.length; _i++) {
-            var other = others_1[_i];
-            other._validate();
-            if (!this.normals !== !other.normals ||
-                !this.tangents !== !other.tangents ||
-                !this.uvs !== !other.uvs ||
-                !this.uvs2 !== !other.uvs2 ||
-                !this.uvs3 !== !other.uvs3 ||
-                !this.uvs4 !== !other.uvs4 ||
-                !this.uvs5 !== !other.uvs5 ||
-                !this.uvs6 !== !other.uvs6 ||
-                !this.colors !== !other.colors ||
-                !this.matricesIndices !== !other.matricesIndices ||
-                !this.matricesWeights !== !other.matricesWeights ||
-                !this.matricesIndicesExtra !== !other.matricesIndicesExtra ||
-                !this.matricesWeightsExtra !== !other.matricesWeightsExtra) {
-                throw new Error("Cannot merge vertex data that do not have the same set of attributes");
-            }
-        }
-        var totalIndices = others.reduce(function (indexSum, vertexData) { var _a, _b; return indexSum + ((_b = (_a = vertexData.indices) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0); }, (_b = (_a = this.indices) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0);
-        if (totalIndices > 0) {
-            var indicesOffset = (_d = (_c = this.indices) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
-            if (!this.indices) {
-                this.indices = new Array(totalIndices);
-            }
-            if (this.indices.length !== totalIndices) {
-                if (Array.isArray(this.indices)) {
-                    this.indices.length = totalIndices;
-                }
-                else {
-                    var temp = use32BitsIndices || this.indices instanceof Uint32Array ? new Uint32Array(totalIndices) : new Uint16Array(totalIndices);
-                    temp.set(this.indices);
-                    this.indices = temp;
-                }
-            }
-            var positionsOffset = this.positions ? this.positions.length / 3 : 0;
-            for (var _e = 0, others_2 = others; _e < others_2.length; _e++) {
-                var other = others_2[_e];
-                if (other.indices) {
-                    for (var index = 0; index < other.indices.length; index++) {
+        return runCoroutineSync(this._mergeCoroutine(others, use32BitsIndices, false));
+    };
+    /** @hidden */
+    VertexData.prototype._mergeCoroutine = function (others, use32BitsIndices, isAsync) {
+        var _i, others_1, other, totalIndices, indicesOffset, temp, positionsOffset, _a, others_2, other, index;
+        var _b, _c, _d, _e;
+        if (use32BitsIndices === void 0) { use32BitsIndices = false; }
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    this._validate();
+                    others = Array.isArray(others) ? others : [others];
+                    for (_i = 0, others_1 = others; _i < others_1.length; _i++) {
+                        other = others_1[_i];
+                        other._validate();
+                        if (!this.normals !== !other.normals ||
+                            !this.tangents !== !other.tangents ||
+                            !this.uvs !== !other.uvs ||
+                            !this.uvs2 !== !other.uvs2 ||
+                            !this.uvs3 !== !other.uvs3 ||
+                            !this.uvs4 !== !other.uvs4 ||
+                            !this.uvs5 !== !other.uvs5 ||
+                            !this.uvs6 !== !other.uvs6 ||
+                            !this.colors !== !other.colors ||
+                            !this.matricesIndices !== !other.matricesIndices ||
+                            !this.matricesWeights !== !other.matricesWeights ||
+                            !this.matricesIndicesExtra !== !other.matricesIndicesExtra ||
+                            !this.matricesWeightsExtra !== !other.matricesWeightsExtra) {
+                            throw new Error("Cannot merge vertex data that do not have the same set of attributes");
+                        }
+                    }
+                    totalIndices = others.reduce(function (indexSum, vertexData) { var _a, _b; return indexSum + ((_b = (_a = vertexData.indices) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0); }, (_c = (_b = this.indices) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0);
+                    if (!(totalIndices > 0)) return [3 /*break*/, 4];
+                    indicesOffset = (_e = (_d = this.indices) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
+                    if (!this.indices) {
+                        this.indices = new Array(totalIndices);
+                    }
+                    if (this.indices.length !== totalIndices) {
+                        if (Array.isArray(this.indices)) {
+                            this.indices.length = totalIndices;
+                        }
+                        else {
+                            temp = use32BitsIndices || this.indices instanceof Uint32Array ? new Uint32Array(totalIndices) : new Uint16Array(totalIndices);
+                            temp.set(this.indices);
+                            this.indices = temp;
+                        }
+                    }
+                    positionsOffset = this.positions ? this.positions.length / 3 : 0;
+                    _a = 0, others_2 = others;
+                    _f.label = 1;
+                case 1:
+                    if (!(_a < others_2.length)) return [3 /*break*/, 4];
+                    other = others_2[_a];
+                    if (!other.indices) return [3 /*break*/, 3];
+                    for (index = 0; index < other.indices.length; index++) {
                         this.indices[indicesOffset + index] = other.indices[index] + positionsOffset;
                     }
                     // The call to _validate already checked for positions
                     positionsOffset += other.positions.length / 3;
                     indicesOffset += other.indices.length;
-                }
+                    if (!isAsync) return [3 /*break*/, 3];
+                    return [4 /*yield*/];
+                case 2:
+                    _f.sent();
+                    _f.label = 3;
+                case 3:
+                    _a++;
+                    return [3 /*break*/, 1];
+                case 4:
+                    this.positions = VertexData._mergeElement(this.positions, others.map(function (other) { return other.positions; }));
+                    if (!isAsync) return [3 /*break*/, 6];
+                    return [4 /*yield*/];
+                case 5:
+                    _f.sent();
+                    _f.label = 6;
+                case 6:
+                    this.normals = VertexData._mergeElement(this.normals, others.map(function (other) { return other.normals; }));
+                    if (!isAsync) return [3 /*break*/, 8];
+                    return [4 /*yield*/];
+                case 7:
+                    _f.sent();
+                    _f.label = 8;
+                case 8:
+                    this.tangents = VertexData._mergeElement(this.tangents, others.map(function (other) { return other.tangents; }));
+                    if (!isAsync) return [3 /*break*/, 10];
+                    return [4 /*yield*/];
+                case 9:
+                    _f.sent();
+                    _f.label = 10;
+                case 10:
+                    this.uvs = VertexData._mergeElement(this.uvs, others.map(function (other) { return other.uvs; }));
+                    if (!isAsync) return [3 /*break*/, 12];
+                    return [4 /*yield*/];
+                case 11:
+                    _f.sent();
+                    _f.label = 12;
+                case 12:
+                    this.uvs2 = VertexData._mergeElement(this.uvs2, others.map(function (other) { return other.uvs2; }));
+                    if (!isAsync) return [3 /*break*/, 14];
+                    return [4 /*yield*/];
+                case 13:
+                    _f.sent();
+                    _f.label = 14;
+                case 14:
+                    this.uvs3 = VertexData._mergeElement(this.uvs3, others.map(function (other) { return other.uvs3; }));
+                    if (!isAsync) return [3 /*break*/, 16];
+                    return [4 /*yield*/];
+                case 15:
+                    _f.sent();
+                    _f.label = 16;
+                case 16:
+                    this.uvs4 = VertexData._mergeElement(this.uvs4, others.map(function (other) { return other.uvs4; }));
+                    if (!isAsync) return [3 /*break*/, 18];
+                    return [4 /*yield*/];
+                case 17:
+                    _f.sent();
+                    _f.label = 18;
+                case 18:
+                    this.uvs5 = VertexData._mergeElement(this.uvs5, others.map(function (other) { return other.uvs5; }));
+                    if (!isAsync) return [3 /*break*/, 20];
+                    return [4 /*yield*/];
+                case 19:
+                    _f.sent();
+                    _f.label = 20;
+                case 20:
+                    this.uvs6 = VertexData._mergeElement(this.uvs6, others.map(function (other) { return other.uvs6; }));
+                    if (!isAsync) return [3 /*break*/, 22];
+                    return [4 /*yield*/];
+                case 21:
+                    _f.sent();
+                    _f.label = 22;
+                case 22:
+                    this.colors = VertexData._mergeElement(this.colors, others.map(function (other) { return other.colors; }));
+                    if (!isAsync) return [3 /*break*/, 24];
+                    return [4 /*yield*/];
+                case 23:
+                    _f.sent();
+                    _f.label = 24;
+                case 24:
+                    this.matricesIndices = VertexData._mergeElement(this.matricesIndices, others.map(function (other) { return other.matricesIndices; }));
+                    if (!isAsync) return [3 /*break*/, 26];
+                    return [4 /*yield*/];
+                case 25:
+                    _f.sent();
+                    _f.label = 26;
+                case 26:
+                    this.matricesWeights = VertexData._mergeElement(this.matricesWeights, others.map(function (other) { return other.matricesWeights; }));
+                    if (!isAsync) return [3 /*break*/, 28];
+                    return [4 /*yield*/];
+                case 27:
+                    _f.sent();
+                    _f.label = 28;
+                case 28:
+                    this.matricesIndicesExtra = VertexData._mergeElement(this.matricesIndicesExtra, others.map(function (other) { return other.matricesIndicesExtra; }));
+                    if (!isAsync) return [3 /*break*/, 30];
+                    return [4 /*yield*/];
+                case 29:
+                    _f.sent();
+                    _f.label = 30;
+                case 30:
+                    this.matricesWeightsExtra = VertexData._mergeElement(this.matricesWeightsExtra, others.map(function (other) { return other.matricesWeightsExtra; }));
+                    return [2 /*return*/, this];
             }
-        }
-        this.positions = VertexData._mergeElement(this.positions, others.map(function (other) { return other.positions; }));
-        this.normals = VertexData._mergeElement(this.normals, others.map(function (other) { return other.normals; }));
-        this.tangents = VertexData._mergeElement(this.tangents, others.map(function (other) { return other.tangents; }));
-        this.uvs = VertexData._mergeElement(this.uvs, others.map(function (other) { return other.uvs; }));
-        this.uvs2 = VertexData._mergeElement(this.uvs2, others.map(function (other) { return other.uvs2; }));
-        this.uvs3 = VertexData._mergeElement(this.uvs3, others.map(function (other) { return other.uvs3; }));
-        this.uvs4 = VertexData._mergeElement(this.uvs4, others.map(function (other) { return other.uvs4; }));
-        this.uvs5 = VertexData._mergeElement(this.uvs5, others.map(function (other) { return other.uvs5; }));
-        this.uvs6 = VertexData._mergeElement(this.uvs6, others.map(function (other) { return other.uvs6; }));
-        this.colors = VertexData._mergeElement(this.colors, others.map(function (other) { return other.colors; }));
-        this.matricesIndices = VertexData._mergeElement(this.matricesIndices, others.map(function (other) { return other.matricesIndices; }));
-        this.matricesWeights = VertexData._mergeElement(this.matricesWeights, others.map(function (other) { return other.matricesWeights; }));
-        this.matricesIndicesExtra = VertexData._mergeElement(this.matricesIndicesExtra, others.map(function (other) { return other.matricesIndicesExtra; }));
-        this.matricesWeightsExtra = VertexData._mergeElement(this.matricesWeightsExtra, others.map(function (other) { return other.matricesWeightsExtra; }));
-        return this;
+        });
     };
     VertexData._mergeElement = function (source, others) {
         var nonNullOthers = others.filter(function (other) { return other !== null && other !== undefined; });
@@ -447,7 +628,7 @@ var VertexData = /** @class */ (function () {
      * @returns a serialized object
      */
     VertexData.prototype.serialize = function () {
-        var serializationObject = this.serialize();
+        var serializationObject = {};
         if (this.positions) {
             serializationObject.positions = this.positions;
         }