@babylonjs/core 5.15.0 → 5.17.0

package/Engines/nativeEngine.d.ts

@@ -99,13 +99,17 @@ export declare class NativeEngine extends Engine {
     createVertexBuffer(vertices: DataArray, updateable?: boolean): NativeDataBuffer;
     protected _recordVertexArrayObject(vertexArray: any, vertexBuffers: {
         [key: string]: VertexBuffer;
-    }, indexBuffer: Nullable<NativeDataBuffer>, effect: Effect): void;
+    }, indexBuffer: Nullable<NativeDataBuffer>, effect: Effect, overrideVertexBuffers?: {
+        [kind: string]: Nullable<VertexBuffer>;
+    }): void;
     bindBuffers(vertexBuffers: {
         [key: string]: VertexBuffer;
     }, indexBuffer: Nullable<NativeDataBuffer>, effect: Effect): void;
     recordVertexArrayObject(vertexBuffers: {
         [key: string]: VertexBuffer;
-    }, indexBuffer: Nullable<NativeDataBuffer>, effect: Effect): WebGLVertexArrayObject;
+    }, indexBuffer: Nullable<NativeDataBuffer>, effect: Effect, overrideVertexBuffers?: {
+        [kind: string]: Nullable<VertexBuffer>;
+    }): WebGLVertexArrayObject;
     private _deleteVertexArray;
     bindVertexArrayObject(vertexArray: WebGLVertexArrayObject): void;
     releaseVertexArrayObject(vertexArray: WebGLVertexArrayObject): void;
@@ -540,5 +544,6 @@ export declare class NativeEngine extends Engine {
         height: number;
         descent: number;
     };
+    _readTexturePixels(texture: InternalTexture, width: number, height: number, faceIndex?: number, level?: number, buffer?: Nullable<ArrayBufferView>, flushRenderer?: boolean, noDataConversion?: boolean, x?: number, y?: number): Promise<ArrayBufferView>;
 }
 export {};

package/Engines/nativeEngine.js

@@ -750,7 +750,7 @@ var NativeEngine = /** @class */ (function (_super) {
             drawBuffersExtension: false,
             depthTextureExtension: false,
             vertexArrayObject: true,
-            instancedArrays: false,
+            instancedArrays: true,
             supportOcclusionQuery: false,
             canUseTimestampForTimerQuery: false,
             blendMinMax: false,
@@ -933,7 +933,7 @@ var NativeEngine = /** @class */ (function (_super) {
         }
         return buffer;
     };
-    NativeEngine.prototype._recordVertexArrayObject = function (vertexArray, vertexBuffers, indexBuffer, effect) {
+    NativeEngine.prototype._recordVertexArrayObject = function (vertexArray, vertexBuffers, indexBuffer, effect, overrideVertexBuffers) {
         if (indexBuffer) {
             this._engine.recordIndexBuffer(vertexArray, indexBuffer.nativeIndexBuffer);
         }
@@ -942,10 +942,16 @@ var NativeEngine = /** @class */ (function (_super) {
             var location_1 = effect.getAttributeLocation(index);
             if (location_1 >= 0) {
                 var kind = attributes[index];
-                var vertexBuffer = vertexBuffers[kind];
+                var vertexBuffer = null;
+                if (overrideVertexBuffers) {
+                    vertexBuffer = overrideVertexBuffers[kind];
+                }
+                if (!vertexBuffer) {
+                    vertexBuffer = vertexBuffers[kind];
+                }
                 if (vertexBuffer) {
                     var buffer = vertexBuffer.getBuffer();
-                    if (buffer) {
+                    if (buffer && buffer.nativeVertexBuffer) {
                         this._engine.recordVertexBuffer(vertexArray, buffer.nativeVertexBuffer, location_1, vertexBuffer.byteOffset, vertexBuffer.byteStride, vertexBuffer.getSize(), this._getNativeAttribType(vertexBuffer.type), vertexBuffer.normalized, vertexBuffer.getInstanceDivisor());
                     }
                 }
@@ -960,9 +966,9 @@ var NativeEngine = /** @class */ (function (_super) {
         this._recordVertexArrayObject(this._boundBuffersVertexArray, vertexBuffers, indexBuffer, effect);
         this.bindVertexArrayObject(this._boundBuffersVertexArray);
     };
-    NativeEngine.prototype.recordVertexArrayObject = function (vertexBuffers, indexBuffer, effect) {
+    NativeEngine.prototype.recordVertexArrayObject = function (vertexBuffers, indexBuffer, effect, overrideVertexBuffers) {
         var vertexArray = this._engine.createVertexArray();
-        this._recordVertexArrayObject(vertexArray, vertexBuffers, indexBuffer, effect);
+        this._recordVertexArrayObject(vertexArray, vertexBuffers, indexBuffer, effect, overrideVertexBuffers);
         return vertexArray;
     };
     NativeEngine.prototype._deleteVertexArray = function (vertexArray) {
@@ -1887,7 +1893,7 @@ var NativeEngine = /** @class */ (function (_super) {
             }
         }
         if (scene) {
-            scene._addPendingData(texture);
+            scene.addPendingData(texture);
         }
         texture.url = url;
         texture.generateMipMaps = !noMipmap;
@@ -1907,7 +1913,7 @@ var NativeEngine = /** @class */ (function (_super) {
         }
         var onInternalError = function (message, exception) {
             if (scene) {
-                scene._removePendingData(texture);
+                scene.removePendingData(texture);
             }
             if (url === originalUrl) {
                 if (onLoadObserver) {
@@ -1934,7 +1940,7 @@ var NativeEngine = /** @class */ (function (_super) {
             var onload_1 = function (data) {
                 if (!texture._hardwareTexture) {
                     if (scene) {
-                        scene._removePendingData(texture);
+                        scene.removePendingData(texture);
                     }
                     return;
                 }
@@ -1948,7 +1954,7 @@ var NativeEngine = /** @class */ (function (_super) {
                     var filter = _this._getNativeSamplingMode(samplingMode);
                     _this._setTextureSampling(underlyingResource, filter);
                     if (scene) {
-                        scene._removePendingData(texture);
+                        scene.removePendingData(texture);
                     }
                     texture.onLoadedObservable.notifyObservers(texture);
                     texture.onLoadedObservable.clear();
@@ -2710,6 +2716,20 @@ var NativeEngine = /** @class */ (function (_super) {
         var result = { ascent: 0, height: 0, descent: 0 };
         return result;
     };
+    NativeEngine.prototype._readTexturePixels = function (texture, width, height, faceIndex, level, buffer, flushRenderer, noDataConversion, x, y) {
+        var _a, _b, _c, _d;
+        if (faceIndex !== undefined && faceIndex !== -1) {
+            throw new Error("Reading cubemap faces is not supported, but faceIndex is ".concat(faceIndex, "."));
+        }
+        return this._engine
+            .readTexture((_a = texture._hardwareTexture) === null || _a === void 0 ? void 0 : _a.underlyingResource, level !== null && level !== void 0 ? level : 0, x !== null && x !== void 0 ? x : 0, y !== null && y !== void 0 ? y : 0, width, height, (_b = buffer === null || buffer === void 0 ? void 0 : buffer.buffer) !== null && _b !== void 0 ? _b : null, (_c = buffer === null || buffer === void 0 ? void 0 : buffer.byteOffset) !== null && _c !== void 0 ? _c : 0, (_d = buffer === null || buffer === void 0 ? void 0 : buffer.byteLength) !== null && _d !== void 0 ? _d : 0)
+            .then(function (rawBuffer) {
+            if (!buffer) {
+                buffer = new Uint8Array(rawBuffer);
+            }
+            return buffer;
+        });
+    };
     // This must match the protocol version in NativeEngine.cpp
     NativeEngine.PROTOCOL_VERSION = 6;
     return NativeEngine;