docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
this._tryCatchOnError(() => {
| <mask> this._loadAsync(null, scene, data, rootUrl, onSuccess, onProgress, onError);
<mask> }
<mask>
<mask> private _loadAsync(nodeNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onSuccess: () => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void {
<mask> try {
<mask> this._loadData(data);
<mask> this._babylonScene = scene;
<mask> this._rootUrl = rootUrl;
<mask>
<mask> this._successCallback = onSuccess;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _loadMaterialLOD(loader: GLTFLoader, materials: IGLTFMaterial[], index: number, assign: (babylonMaterial: Material, isNew: boolean) => void, onComplete: () => void): void {
loader._loadMaterial(materials[index], (babylonMaterial, isNew) => {
</s> add private _loadMaterialLOD(loader: GLTFLoader, context: string, materials: IGLTFMaterial[], index: number, assign: (babylonMaterial: Material, isNew: boolean) => void, onComplete: () => void): void {
loader._loadMaterial(context, materials[index], (babylonMaterial, isNew) => { </s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
</s> remove private _loadNodeLOD(loader: GLTFLoader, nodes: IGLTFNode[], index: number, onComplete: () => void): void {
</s> add private _loadNodeLOD(loader: GLTFLoader, context: string, nodes: IGLTFNode[], index: number, onComplete: () => void): void { </s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> remove loader._loadNode(nodes[index]);
</s> add loader._loadNode(context, nodes[index]); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
GLTFUtils.AssignIndices(this._gltf.accessors);
GLTFUtils.AssignIndices(this._gltf.animations);
GLTFUtils.AssignIndices(this._gltf.buffers);
GLTFUtils.AssignIndices(this._gltf.bufferViews);
GLTFUtils.AssignIndices(this._gltf.images);
GLTFUtils.AssignIndices(this._gltf.materials);
GLTFUtils.AssignIndices(this._gltf.meshes);
GLTFUtils.AssignIndices(this._gltf.nodes);
GLTFUtils.AssignIndices(this._gltf.scenes);
GLTFUtils.AssignIndices(this._gltf.skins);
GLTFUtils.AssignIndices(this._gltf.textures);
| <mask> this._progressCallback = onProgress;
<mask> this._errorCallback = onError;
<mask>
<mask> this._addPendingData(this);
<mask> this._loadDefaultScene(nodeNames);
<mask> this._loadAnimations();
<mask> this._removePendingData(this);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadScene(nodeNames);
</s> add this._loadDefaultScene(nodeNames);
</s> remove }
catch (e) {
this._onError(e.message);
}
</s> add });
</s> remove babylonTexture.coordinatesIndex = texCoord;
</s> add babylonTexture.coordinatesIndex = coordinatesIndex || 0;
</s> remove babylonTexture.name = texture.name || "texture" + textureInfo.index;
</s> add babylonTexture.name = texture.name || "texture" + texture.index;
</s> remove babylonMaterial.metallicTexture = this._loadTexture(properties.metallicRoughnessTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.metallicRoughnessTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find metallic roughness texture " + properties.metallicRoughnessTexture.index);
}
babylonMaterial.metallicTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.metallicRoughnessTexture.texCoord);
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadDefaultScene(nodeNames);
| <mask> this._progressCallback = onProgress;
<mask> this._errorCallback = onError;
<mask>
<mask> this._addPendingData(this);
<mask> this._loadScene(nodeNames);
<mask> this._loadAnimations();
<mask> this._removePendingData(this);
<mask> }
<mask> catch (e) {
<mask> this._onError(e.message);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove }
catch (e) {
this._onError(e.message);
}
</s> add });
</s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
});
| <mask> this._addPendingData(this);
<mask> this._loadScene(nodeNames);
<mask> this._loadAnimations();
<mask> this._removePendingData(this);
<mask> }
<mask> catch (e) {
<mask> this._onError(e.message);
<mask> }
<mask> }
<mask>
<mask> public _onError(message: string): void {
<mask> if (this._disposed) {
<mask> return;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadScene(nodeNames);
</s> add this._loadDefaultScene(nodeNames);
</s> remove public _onError(message: string): void {
</s> add private _onError(message: string): void {
</s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
</s> remove Tools.Error("glTF Loader Error: " + message);
</s> add Tools.Error("glTF Loader: " + message);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _onError(message: string): void {
| <mask> this._onError(e.message);
<mask> }
<mask> }
<mask>
<mask> public _onError(message: string): void {
<mask> if (this._disposed) {
<mask> return;
<mask> }
<mask>
<mask> Tools.Error("glTF Loader Error: " + message);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove Tools.Error("glTF Loader Error: " + message);
</s> add Tools.Error("glTF Loader: " + message);
</s> remove }
catch (e) {
this._onError(e.message);
}
</s> add });
</s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
</s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> remove }
}, () => {
if (!this._disposed) {
this._onError("Failed to load texture '" + source.uri + "'");
this._removePendingData(texture);
}
</s> add });
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
Tools.Error("glTF Loader: " + message);
| <mask> if (this._disposed) {
<mask> return;
<mask> }
<mask>
<mask> Tools.Error("glTF Loader Error: " + message);
<mask>
<mask> if (this._errorCallback) {
<mask> this._errorCallback(message);
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _onError(message: string): void {
</s> add private _onError(message: string): void {
</s> remove }
catch (e) {
this._onError(e.message);
}
</s> add });
</s> remove }
}, () => {
if (!this._disposed) {
this._onError("Failed to load texture '" + source.uri + "'");
this._removePendingData(texture);
}
</s> add });
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
</s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
</s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadDefaultScene(nodeNames: any): void {
var scene = GLTFUtils.GetArrayItem(this._gltf.scenes, this._gltf.scene || 0);
| <mask> private _startAnimations(): void {
<mask> this._getAnimationTargets().forEach(target => this._babylonScene.beginAnimation(target, 0, Number.MAX_VALUE, true));
<mask> }
<mask>
<mask> private _loadScene(nodeNames: any): void {
<mask> var scene = this._getArrayItem(this._gltf.scenes, this._gltf.scene || 0, "Scene");
<mask> if (!scene) {
<mask> return;
<mask> }
<mask>
<mask> this._rootNode = { name: "__root__" };
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error("Failed to find scene " + (this._gltf.scene || 0));
</s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
</s> remove public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
</s> add public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove public _onError(message: string): void {
</s> add private _onError(message: string): void {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error("Failed to find scene " + (this._gltf.scene || 0));
| <mask>
<mask> private _loadScene(nodeNames: any): void {
<mask> var scene = this._getArrayItem(this._gltf.scenes, this._gltf.scene || 0, "Scene");
<mask> if (!scene) {
<mask> return;
<mask> }
<mask>
<mask> this._rootNode = { name: "__root__" };
<mask>
<mask> switch (this._parent.coordinateSystemMode) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _loadScene(nodeNames: any): void {
var scene = this._getArrayItem(this._gltf.scenes, this._gltf.scene || 0, "Scene");
</s> add private _loadDefaultScene(nodeNames: any): void {
var scene = GLTFUtils.GetArrayItem(this._gltf.scenes, this._gltf.scene || 0);
</s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
</s> remove this._rootNode.rotation = [0, 1, 0, 0];
this._rootNode.scale = [1, 1, -1];
</s> add this._rootNode.babylonMesh.rotation = new Vector3(0, Math.PI, 0);
this._rootNode.babylonMesh.scaling = new Vector3(1, 1, -1);
</s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
</s> add public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
| <mask> if (!scene) {
<mask> return;
<mask> }
<mask>
<mask> this._rootNode = { name: "__root__" };
<mask>
<mask> switch (this._parent.coordinateSystemMode) {
<mask> case GLTFLoaderCoordinateSystemMode.AUTO:
<mask> if (!this._babylonScene.useRightHandedSystem) {
<mask> this._rootNode.rotation = [0, 1, 0, 0];
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._rootNode.rotation = [0, 1, 0, 0];
this._rootNode.scale = [1, 1, -1];
</s> add this._rootNode.babylonMesh.rotation = new Vector3(0, Math.PI, 0);
this._rootNode.babylonMesh.scaling = new Vector3(1, 1, -1);
</s> remove return;
</s> add throw new Error("Failed to find scene " + (this._gltf.scene || 0));
</s> remove private _loadScene(nodeNames: any): void {
var scene = this._getArrayItem(this._gltf.scenes, this._gltf.scene || 0, "Scene");
</s> add private _loadDefaultScene(nodeNames: any): void {
var scene = GLTFUtils.GetArrayItem(this._gltf.scenes, this._gltf.scene || 0);
</s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._rootNode.babylonMesh.rotation = new Vector3(0, Math.PI, 0);
this._rootNode.babylonMesh.scaling = new Vector3(1, 1, -1);
| <mask>
<mask> switch (this._parent.coordinateSystemMode) {
<mask> case GLTFLoaderCoordinateSystemMode.AUTO:
<mask> if (!this._babylonScene.useRightHandedSystem) {
<mask> this._rootNode.rotation = [0, 1, 0, 0];
<mask> this._rootNode.scale = [1, 1, -1];
<mask> }
<mask> break;
<mask> case GLTFLoaderCoordinateSystemMode.PASS_THROUGH:
<mask> // do nothing
<mask> break;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
</s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
<mask> Tools.Error("Invalid coordinate system mode (" + this._parent.coordinateSystemMode + ")");
<mask> return;
<mask> }
<mask>
<mask> this._loadNode(this._rootNode);
<mask>
<mask> var nodeIndices = scene.nodes;
<mask>
<mask> this._traverseNodes(nodeIndices, (node, index, parentNode) => {
<mask> node.index = index;
<mask> node.parent = parentNode;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._traverseNodes(nodeIndices, (node, index, parentNode) => {
node.index = index;
</s> add this._traverseNodes(context, nodeIndices, (node, parentNode) => {
</s> remove var materials = this._gltf.materials;
if (materials) {
materials.forEach((material, index) => material.index = index);
}
var skins = this._gltf.skins;
if (skins) {
skins.forEach((skin, index) => skin.index = index);
}
</s> add </s> remove this._onError("Invalid alpha mode '" + material.alphaMode + "'");
return;
</s> add throw new Error(context + ": Invalid alpha mode '" + material.alphaMode + "'");
</s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove this._onError("Invalid component type (" + componentType + ")");
return;
</s> add throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts | |
this._traverseNodes(context, nodeIndices, (node, parentNode) => {
| <mask> this._loadNode(this._rootNode);
<mask>
<mask> var nodeIndices = scene.nodes;
<mask>
<mask> this._traverseNodes(nodeIndices, (node, index, parentNode) => {
<mask> node.index = index;
<mask> node.parent = parentNode;
<mask> return true;
<mask> }, this._rootNode);
<mask>
<mask> var materials = this._gltf.materials;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadNode(this._rootNode);
</s> add </s> remove var materials = this._gltf.materials;
if (materials) {
materials.forEach((material, index) => material.index = index);
}
var skins = this._gltf.skins;
if (skins) {
skins.forEach((skin, index) => skin.index = index);
}
</s> add </s> remove this._traverseNodes(nodeIndices, node => {
</s> add this._traverseNodes(context, nodeIndices, node => {
</s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove this._loadMaterialLOD(loader, materials, materials.length - 1, assign, () => {
</s> add this._loadMaterialLOD(loader, context, materials, materials.length - 1, assign, () => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
<mask> node.parent = parentNode;
<mask> return true;
<mask> }, this._rootNode);
<mask>
<mask> var materials = this._gltf.materials;
<mask> if (materials) {
<mask> materials.forEach((material, index) => material.index = index);
<mask> }
<mask>
<mask> var skins = this._gltf.skins;
<mask> if (skins) {
<mask> skins.forEach((skin, index) => skin.index = index);
<mask> }
<mask>
<mask> if (nodeNames) {
<mask> if (!(nodeNames instanceof Array)) {
<mask> nodeNames = [nodeNames];
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._traverseNodes(nodeIndices, (node, index, parentNode) => {
node.index = index;
</s> add this._traverseNodes(context, nodeIndices, (node, parentNode) => {
</s> remove this._traverseNodes(nodeIndices, node => {
</s> add this._traverseNodes(context, nodeIndices, node => {
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.occlusionTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find occlusion texture " + material.occlusionTexture.index);
}
babylonMaterial.ambientTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.occlusionTexture.texCoord);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts | |
this._traverseNodes(context, nodeIndices, node => {
| <mask> nodeNames = [nodeNames];
<mask> }
<mask>
<mask> var filteredNodeIndices = new Array<number>();
<mask> this._traverseNodes(nodeIndices, node => {
<mask> if (nodeNames.indexOf(node.name) !== -1) {
<mask> filteredNodeIndices.push(node.index);
<mask> return false;
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var materials = this._gltf.materials;
if (materials) {
materials.forEach((material, index) => material.index = index);
}
var skins = this._gltf.skins;
if (skins) {
skins.forEach((skin, index) => skin.index = index);
}
</s> add </s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove return;
</s> add throw new Error(context + ": Failed to find node " + nodeIndices[i]);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
| <mask> nodeIndices = filteredNodeIndices;
<mask> }
<mask>
<mask> for (var i = 0; i < nodeIndices.length; i++) {
<mask> var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
<mask> if (!node) {
<mask> return;
<mask> }
<mask>
<mask> this._loadNode(node);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(context + ": Failed to find node " + nodeIndices[i]);
</s> remove var animationName = animation.name || "anim" + animationIndex;
</s> add var animationName = animation.name || "anim" + animation.index;
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove loader._traverseNode(extension.ids[i], action, parentNode);
</s> add var lodNode = GLTFUtils.GetArrayItem(loader._gltf.nodes, extension.ids[i]);
if (!lodNode) {
throw new Error(context + ": Failed to find node " + extension.ids[i]);
}
loader._traverseNode(context, lodNode, action, parentNode); </s> remove loader._traverseNode(index, action, parentNode);
</s> add loader._traverseNode(context, node, action, parentNode); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Failed to find node " + nodeIndices[i]);
| <mask>
<mask> for (var i = 0; i < nodeIndices.length; i++) {
<mask> var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
<mask> if (!node) {
<mask> return;
<mask> }
<mask>
<mask> this._loadNode(node);
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove var animationName = animation.name || "anim" + animationIndex;
</s> add var animationName = animation.name || "anim" + animation.index;
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove loader._traverseNode(extension.ids[i], action, parentNode);
</s> add var lodNode = GLTFUtils.GetArrayItem(loader._gltf.nodes, extension.ids[i]);
if (!lodNode) {
throw new Error(context + ": Failed to find node " + extension.ids[i]);
}
loader._traverseNode(context, lodNode, action, parentNode); </s> remove loader._traverseNode(index, action, parentNode);
</s> add loader._traverseNode(context, node, action, parentNode); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadNode("nodes[" + nodeIndices[i] + "]", node);
| <mask> if (!node) {
<mask> return;
<mask> }
<mask>
<mask> this._loadNode(node);
<mask> }
<mask>
<mask> // Disable the root mesh until the asset is ready to render.
<mask> this._rootNode.babylonMesh.setEnabled(false);
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadNode(node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, node)) {
</s> add public _loadNode(context: string, node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, context, node)) {
</s> remove return;
</s> add throw new Error(context + ": Failed to find node " + nodeIndices[i]);
</s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
</s> remove this._loadMaterialLOD(loader, materials, index - 1, assign, onComplete);
</s> add this._loadMaterialLOD(loader, context, materials, index - 1, assign, onComplete); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _loadNode(context: string, node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, context, node)) {
| <mask> // Disable the root mesh until the asset is ready to render.
<mask> this._rootNode.babylonMesh.setEnabled(false);
<mask> }
<mask>
<mask> public _loadNode(node: IGLTFNode): void {
<mask> if (GLTFLoaderExtension.LoadNode(this, node)) {
<mask> return;
<mask> }
<mask>
<mask> node.babylonMesh = new Mesh(node.name || "mesh" + node.index, this._babylonScene);
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadNode(node);
</s> add this._loadNode("nodes[" + nodeIndices[i] + "]", node);
</s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
</s> remove this._loadMaterialBaseProperties(material);
this._loadMaterialMetallicRoughnessProperties(material);
</s> add this._loadMaterialBaseProperties(context, material);
this._loadMaterialMetallicRoughnessProperties(context, material);
</s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
</s> remove this._loadMaterialLOD(loader, materials, index - 1, assign, onComplete);
</s> add this._loadMaterialLOD(loader, context, materials, index - 1, assign, onComplete); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
| <mask> node.babylonMesh = new Mesh(node.name || "mesh" + node.index, this._babylonScene);
<mask>
<mask> this._loadTransform(node);
<mask>
<mask> if (node.mesh !== undefined) {
<mask> var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
<mask> if (!mesh) {
<mask> return;
<mask> }
<mask>
<mask> this._loadMesh(node, mesh);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
</s> remove public _loadNode(node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, node)) {
</s> add public _loadNode(context: string, node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, context, node)) {
</s> remove this._loadMesh(node, mesh);
</s> add this._loadMesh("meshes[" + node.mesh + "]", node, mesh);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Failed to find mesh " + node.mesh);
| <mask>
<mask> if (node.mesh !== undefined) {
<mask> var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
<mask> if (!mesh) {
<mask> return;
<mask> }
<mask>
<mask> this._loadMesh(node, mesh);
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
</s> remove this._loadMesh(node, mesh);
</s> add this._loadMesh("meshes[" + node.mesh + "]", node, mesh);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadMesh("meshes[" + node.mesh + "]", node, mesh);
| <mask> if (!mesh) {
<mask> return;
<mask> }
<mask>
<mask> this._loadMesh(node, mesh);
<mask> }
<mask>
<mask> node.babylonMesh.parent = node.parent ? node.parent.babylonMesh : null;
<mask>
<mask> node.babylonAnimationTargets = node.babylonAnimationTargets || [];
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
</s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
</s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
| <mask>
<mask> node.babylonAnimationTargets = node.babylonAnimationTargets || [];
<mask> node.babylonAnimationTargets.push(node.babylonMesh);
<mask>
<mask> if (node.skin !== undefined) {
<mask> var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
<mask> if (!skin) {
<mask> return;
<mask> }
<mask>
<mask> node.babylonMesh.skeleton = this._loadSkin(skin);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(context + ": Failed to find skin " + node.skin);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove this._loadMesh(node, mesh);
</s> add this._loadMesh("meshes[" + node.mesh + "]", node, mesh);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Failed to find skin " + node.skin);
| <mask>
<mask> if (node.skin !== undefined) {
<mask> var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
<mask> if (!skin) {
<mask> return;
<mask> }
<mask>
<mask> node.babylonMesh.skeleton = this._loadSkin(skin);
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
| <mask> if (!skin) {
<mask> return;
<mask> }
<mask>
<mask> node.babylonMesh.skeleton = this._loadSkin(skin);
<mask> }
<mask>
<mask> if (node.camera !== undefined) {
<mask> // TODO: handle cameras
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(context + ": Failed to find skin " + node.skin);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove return;
</s> add throw new Error(context + ": Failed to find mesh " + node.mesh);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var animationName = animation.name || "anim" + animation.index;
| <mask> animation.targets.push(morphTarget);
<mask> }
<mask> }
<mask> else {
<mask> var animationName = animation.name || "anim" + animationIndex;
<mask> var babylonAnimation = new Animation(animationName, targetPath, 1, animationType);
<mask> babylonAnimation.setKeys(keys);
<mask>
<mask> for (var i = 0; i < targetNode.babylonAnimationTargets.length; i++) {
<mask> var target = targetNode.babylonAnimationTargets[i];
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var node = this._getArrayItem(this._gltf.nodes, nodeIndices[i], "Node");
</s> add var node = GLTFUtils.GetArrayItem(this._gltf.nodes, nodeIndices[i]);
</s> remove return;
</s> add throw new Error(context + ": Failed to find node " + nodeIndices[i]);
</s> remove loader._traverseNode(index, action, parentNode);
</s> add loader._traverseNode(context, node, action, parentNode); </s> remove loader._traverseNode(extension.ids[i], action, parentNode);
</s> add var lodNode = GLTFUtils.GetArrayItem(loader._gltf.nodes, extension.ids[i]);
if (!lodNode) {
throw new Error(context + ": Failed to find node " + extension.ids[i]);
}
loader._traverseNode(context, lodNode, action, parentNode); </s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var inputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.input);
| <mask> }
<mask> }
<mask> };
<mask>
<mask> var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
<mask> if (!inputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(inputAccessor, data => {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
</s> remove this._loadAccessorAsync(inputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
</s> remove var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> add var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
</s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
| <mask> };
<mask>
<mask> var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
<mask> if (!inputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(inputAccessor, data => {
<mask> inputData = <Float32Array>data;
<mask> checkSuccess();
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
</s> add var inputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.input);
</s> remove this._loadAccessorAsync(inputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
</s> remove var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> add var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
</s> remove this._loadAccessorAsync(outputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + outputAccessor.index + "]", outputAccessor, data => {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
| <mask> if (!inputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(inputAccessor, data => {
<mask> inputData = <Float32Array>data;
<mask> checkSuccess();
<mask> });
<mask>
<mask> var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> add var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
</s> remove var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
</s> add var inputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.input);
</s> remove this._loadAccessorAsync(outputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + outputAccessor.index + "]", outputAccessor, data => {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
| <mask> inputData = <Float32Array>data;
<mask> checkSuccess();
<mask> });
<mask>
<mask> var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
<mask> if (!outputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(outputAccessor, data => {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
</s> remove this._loadAccessorAsync(inputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
</s> remove this._loadAccessorAsync(outputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + outputAccessor.index + "]", outputAccessor, data => {
</s> remove var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
</s> add var inputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.input);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
| <mask> });
<mask>
<mask> var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
<mask> if (!outputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(outputAccessor, data => {
<mask> outputData = <Float32Array>data;
<mask> checkSuccess();
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> add var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
</s> remove this._loadAccessorAsync(inputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
</s> remove this._loadAccessorAsync(outputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + outputAccessor.index + "]", outputAccessor, data => {
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
</s> remove var inputAccessor = this._getArrayItem(this._gltf.accessors, sampler.input, "Animation sampler input accessor");
</s> add var inputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.input);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadAccessorAsync("accessors[" + outputAccessor.index + "]", outputAccessor, data => {
| <mask> if (!outputAccessor) {
<mask> return;
<mask> }
<mask>
<mask> this._loadAccessorAsync(outputAccessor, data => {
<mask> outputData = <Float32Array>data;
<mask> checkSuccess();
<mask> });
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find output accessor " + sampler.output);
</s> remove var outputAccessor = this._getArrayItem(this._gltf.accessors, sampler.output, "Animation sampler output accessor");
</s> add var outputAccessor = GLTFUtils.GetArrayItem(this._gltf.accessors, sampler.output);
</s> remove this._loadAccessorAsync(inputAccessor, data => {
</s> add this._loadAccessorAsync("accessors[" + inputAccessor.index + "]", inputAccessor, data => {
</s> remove return;
</s> add throw new Error(samplerContext + ": Failed to find input accessor " + sampler.input);
</s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
| <mask> checkSuccess();
<mask> });
<mask> }
<mask>
<mask> private _validateUri(uri: string): boolean {
<mask> if (!uri) {
<mask> this._onError("Uri is missing");
<mask> return false;
<mask> }
<mask>
<mask> return true;
<mask> }
<mask>
<mask> private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
<mask> this._addPendingData(buffer);
<mask>
<mask> if (buffer.loadedData) {
<mask> setTimeout(() => {
<mask> onSuccess(buffer.loadedData);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
</s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
| <mask> private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
<mask> this._addPendingData(buffer);
<mask>
<mask> if (buffer.loadedData) {
<mask> setTimeout(() => {
<mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
<mask> });
<mask> }
<mask> else if (buffer.loadedObservable) {
<mask> buffer.loadedObservable.add(buffer => {
<mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
</s> remove }
private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
byteOffset += (bufferView.byteOffset || 0);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
| <mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
<mask> });
<mask> }
<mask> else if (this._validateUri(buffer.uri)) {
<mask> if (GLTFUtils.IsBase64(buffer.uri)) {
<mask> var data = GLTFUtils.DecodeBase64(buffer.uri);
<mask> buffer.loadedData = new Uint8Array(data);
<mask> setTimeout(() => {
<mask> onSuccess(buffer.loadedData);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
| <mask> else if (this._validateUri(buffer.uri)) {
<mask> if (GLTFUtils.IsBase64(buffer.uri)) {
<mask> var data = GLTFUtils.DecodeBase64(buffer.uri);
<mask> buffer.loadedData = new Uint8Array(data);
<mask> setTimeout(() => {
<mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
<mask> });
<mask> }
<mask> else {
<mask> buffer.loadedObservable = new Observable<IGLTFBuffer>();
<mask> buffer.loadedObservable.add(buffer => {
<mask> onSuccess(buffer.loadedData);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
</s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (!GLTFUtils.ValidateUri(buffer.uri)) {
throw new Error(context + ": Uri '" + buffer.uri + "' is invalid");
}
| <mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
<mask> }
<mask> else {
<mask> buffer.loadedObservable = new Observable<IGLTFBuffer>();
<mask> buffer.loadedObservable.add(buffer => {
<mask> onSuccess(buffer.loadedData);
<mask> this._removePendingData(buffer);
<mask> });
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
</s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
</s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
| <mask> this._removePendingData(buffer);
<mask> });
<mask>
<mask> Tools.LoadFile(this._rootUrl + buffer.uri, data => {
<mask> buffer.loadedData = new Uint8Array(data);
<mask> buffer.loadedObservable.notifyObservers(buffer);
<mask> buffer.loadedObservable = null;
<mask> }, event => {
<mask> this._onProgress(event);
<mask> }, this._babylonScene.database, true, request => {
<mask> this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
<mask> });
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._onProgress(event);
</s> add this._tryCatchOnError(() => {
this._onProgress(event);
});
</s> remove this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
</s> add this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove setTimeout(() => {
onSuccess(buffer.loadedData);
this._removePendingData(buffer);
});
</s> add onSuccess(buffer.loadedData);
this._removePendingData(buffer);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._tryCatchOnError(() => {
this._onProgress(event);
});
| <mask> buffer.loadedData = new Uint8Array(data);
<mask> buffer.loadedObservable.notifyObservers(buffer);
<mask> buffer.loadedObservable = null;
<mask> }, event => {
<mask> this._onProgress(event);
<mask> }, this._babylonScene.database, true, request => {
<mask> this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
<mask> });
<mask> }
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
</s> add this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove }
}, () => {
if (!this._disposed) {
this._onError("Failed to load texture '" + source.uri + "'");
this._removePendingData(texture);
}
</s> add });
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
| <mask> buffer.loadedObservable = null;
<mask> }, event => {
<mask> this._onProgress(event);
<mask> }, this._babylonScene.database, true, request => {
<mask> this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
<mask> });
<mask> }
<mask> }
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._onProgress(event);
</s> add this._tryCatchOnError(() => {
this._onProgress(event);
});
</s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove }
}, () => {
if (!this._disposed) {
this._onError("Failed to load texture '" + source.uri + "'");
this._removePendingData(texture);
}
</s> add });
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
| <mask> }
<mask> }
<mask> }
<mask>
<mask> private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
<mask> if (!byteStride) {
<mask> return new Int8Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Int8Array(buffer, byteOffset);
<mask> let targetBuffer = new Int8Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
<mask> if (!byteStride) {
<mask> return new Uint8Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Uint8Array(buffer, byteOffset);
<mask> let targetBuffer = new Uint8Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
<mask> if (!byteStride) {
<mask> return new Int16Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Int16Array(buffer, byteOffset);
<mask> let targetBuffer = new Int16Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
<mask> if (!byteStride) {
<mask> return new Uint16Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Uint16Array(buffer, byteOffset);
<mask> let targetBuffer = new Uint16Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
<mask> if (!byteStride) {
<mask> return new Uint32Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Uint32Array(buffer, byteOffset);
<mask> let targetBuffer = new Uint32Array(byteLength);
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return targetBuffer;
</s> add onSuccess(data);
});
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
| <mask> if (!byteStride) {
<mask> return new Uint32Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Uint32Array(buffer, byteOffset);
<mask> let targetBuffer = new Uint32Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove return targetBuffer;
</s> add onSuccess(data);
});
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
| <mask>
<mask> let sourceBuffer = new Uint32Array(buffer, byteOffset);
<mask> let targetBuffer = new Uint32Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return targetBuffer;
</s> add onSuccess(data);
});
</s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
onSuccess(data);
});
| <mask> let targetBuffer = new Uint32Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
<mask> if (!byteStride) {
<mask> return new Float32Array(buffer, byteOffset, byteLength);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
| <mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
<mask> if (!byteStride) {
<mask> return new Float32Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Float32Array(buffer, byteOffset);
<mask> let targetBuffer = new Float32Array(byteLength);
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return targetBuffer;
</s> add onSuccess(data);
});
</s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
</s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
| <mask> if (!byteStride) {
<mask> return new Float32Array(buffer, byteOffset, byteLength);
<mask> }
<mask>
<mask> let sourceBuffer = new Float32Array(buffer, byteOffset);
<mask> let targetBuffer = new Float32Array(byteLength);
<mask>
<mask> this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
<mask>
<mask> return targetBuffer;
<mask> }
<mask>
<mask> private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
<mask> let tempIndex = 0;
<mask> let sourceIndex = 0;
<mask> let storageSize = bytePerComponent;
<mask>
<mask> while (tempIndex < length) {
<mask> for (var cursor = 0; cursor < storageSize; cursor++) {
<mask> targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
<mask> tempIndex++;
<mask> }
<mask> sourceIndex += stride;
<mask> }
<mask> }
<mask>
<mask> private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
<mask> byteOffset += (bufferView.byteOffset || 0);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove return targetBuffer;
</s> add onSuccess(data);
});
</s> remove }
private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
byteOffset += (bufferView.byteOffset || 0);
</s> add </s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
<mask> tempIndex++;
<mask> }
<mask> sourceIndex += stride;
<mask> }
<mask> }
<mask>
<mask> private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
<mask> byteOffset += (bufferView.byteOffset || 0);
<mask>
<mask> var buffer = this._getArrayItem(this._gltf.buffers, bufferView.buffer, "Buffer");
<mask> if (!buffer) {
<mask> return;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var buffer = this._getArrayItem(this._gltf.buffers, bufferView.buffer, "Buffer");
if (!buffer) {
return;
</s> add var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, accessor.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + accessor.bufferView);
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
</s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts | |
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, accessor.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + accessor.bufferView);
| <mask>
<mask> private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
<mask> byteOffset += (bufferView.byteOffset || 0);
<mask>
<mask> var buffer = this._getArrayItem(this._gltf.buffers, bufferView.buffer, "Buffer");
<mask> if (!buffer) {
<mask> return;
<mask> }
<mask>
<mask> this._loadBufferAsync(buffer, bufferData => {
<mask> if (byteOffset + byteLength > bufferData.byteLength) {
<mask> this._onError("Buffer access is out of range");
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove }
private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
byteOffset += (bufferView.byteOffset || 0);
</s> add </s> remove this._loadBufferAsync(buffer, bufferData => {
if (byteOffset + byteLength > bufferData.byteLength) {
this._onError("Buffer access is out of range");
return;
</s> add this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, bufferViewData => {
var numComponents = this._getNumComponentsOfType(accessor.type);
if (numComponents === 0) {
throw new Error(context + ": Invalid type (" + accessor.type + ")");
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
</s> remove private _buildInt8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int8Array {
if (!byteStride) {
return new Int8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int8Array(buffer, byteOffset);
let targetBuffer = new Int8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildUint8ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint8Array {
if (!byteStride) {
return new Uint8Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint8Array(buffer, byteOffset);
let targetBuffer = new Uint8Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride, targetBuffer.length);
return targetBuffer;
}
private _buildInt16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Int16Array {
if (!byteStride) {
return new Int16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Int16Array(buffer, byteOffset);
let targetBuffer = new Int16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint16ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint16Array {
if (!byteStride) {
return new Uint16Array(buffer, byteOffset, byteLength);
}
let sourceBuffer = new Uint16Array(buffer, byteOffset);
let targetBuffer = new Uint16Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 2, targetBuffer.length);
return targetBuffer;
}
private _buildUint32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Uint32Array {
if (!byteStride) {
return new Uint32Array(buffer, byteOffset, byteLength);
</s> add private _loadBufferViewAsync(context: string, bufferView: IGLTFBufferView, onSuccess: (data: ArrayBufferView) => void): void {
var buffer = GLTFUtils.GetArrayItem(this._gltf.buffers, bufferView.buffer);
if (!buffer) {
throw new Error(context + ": Failed to find buffer " + bufferView.buffer);
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, bufferViewData => {
var numComponents = this._getNumComponentsOfType(accessor.type);
if (numComponents === 0) {
throw new Error(context + ": Invalid type (" + accessor.type + ")");
| <mask> if (!buffer) {
<mask> return;
<mask> }
<mask>
<mask> this._loadBufferAsync(buffer, bufferData => {
<mask> if (byteOffset + byteLength > bufferData.byteLength) {
<mask> this._onError("Buffer access is out of range");
<mask> return;
<mask> }
<mask>
<mask> var buffer = bufferData.buffer;
<mask> byteOffset += bufferData.byteOffset;
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove var buffer = this._getArrayItem(this._gltf.buffers, bufferView.buffer, "Buffer");
if (!buffer) {
return;
</s> add var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, accessor.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + accessor.bufferView);
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
</s> remove }
private _loadBufferViewAsync(bufferView: IGLTFBufferView, byteOffset: number, byteLength: number, bytePerComponent: number, componentType: EComponentType, onSuccess: (data: ArrayBufferView) => void): void {
byteOffset += (bufferView.byteOffset || 0);
</s> add </s> remove let sourceBuffer = new Uint32Array(buffer, byteOffset);
let targetBuffer = new Uint32Array(byteLength);
</s> add this._loadBufferAsync("buffers[" + buffer.index + "]", buffer, bufferData => {
if (this._disposed) {
return;
}
</s> remove else if (this._validateUri(buffer.uri)) {
</s> add else {
if (!buffer.uri) {
throw new Error(context + ": Uri is missing");
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var data: ArrayBufferView;
switch (accessor.componentType) {
| <mask> this._onError("Buffer access is out of range");
<mask> return;
<mask> }
<mask>
<mask> var buffer = bufferData.buffer;
<mask> byteOffset += bufferData.byteOffset;
<mask>
<mask> var bufferViewData;
<mask> switch (componentType) {
<mask> case EComponentType.BYTE:
<mask> bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_BYTE:
<mask> bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask>
<mask> var bufferViewData;
<mask> switch (componentType) {
<mask> case EComponentType.BYTE:
<mask> bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_BYTE:
<mask> bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.SHORT:
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
</s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask> case EComponentType.BYTE:
<mask> bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_BYTE:
<mask> bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.SHORT:
<mask> bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_SHORT:
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask> case EComponentType.UNSIGNED_BYTE:
<mask> bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.SHORT:
<mask> bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_SHORT:
<mask> bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_INT:
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask> case EComponentType.SHORT:
<mask> bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_SHORT:
<mask> bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_INT:
<mask> bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.FLOAT:
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask> case EComponentType.UNSIGNED_SHORT:
<mask> bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.UNSIGNED_INT:
<mask> bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.FLOAT:
<mask> bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> default:
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| <mask> case EComponentType.UNSIGNED_INT:
<mask> bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> case EComponentType.FLOAT:
<mask> bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> default:
<mask> this._onError("Invalid component type (" + componentType + ")");
<mask> return;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove this._onError("Invalid component type (" + componentType + ")");
return;
</s> add throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildInt16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Int16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
| <mask> case EComponentType.FLOAT:
<mask> bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
<mask> break;
<mask> default:
<mask> this._onError("Invalid component type (" + componentType + ")");
<mask> return;
<mask> }
<mask>
<mask> onSuccess(bufferViewData);
<mask> });
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove bufferViewData = this._buildUint16ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint16Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove onSuccess(bufferViewData);
</s> add onSuccess(data);
</s> remove bufferViewData = this._buildUint8ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Uint8Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
onSuccess(data);
| <mask> this._onError("Invalid component type (" + componentType + ")");
<mask> return;
<mask> }
<mask>
<mask> onSuccess(bufferViewData);
<mask> });
<mask> }
<mask>
<mask> private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
<mask> var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove this._onError("Invalid component type (" + componentType + ")");
return;
</s> add throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove private _validateUri(uri: string): boolean {
if (!uri) {
this._onError("Uri is missing");
return false;
}
return true;
}
private _loadBufferAsync(buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> add private _loadBufferAsync(context: string, buffer: IGLTFBuffer, onSuccess: (data: ArrayBufferView) => void): void {
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _getNumComponentsOfType(type: string): number {
switch (type) {
| <mask> onSuccess(bufferViewData);
<mask> });
<mask> }
<mask>
<mask> private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
<mask> var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
<mask> if (!bufferView) {
<mask> return;
<mask> }
<mask>
<mask> var byteOffset = accessor.byteOffset || 0;
<mask> let bytePerComponent = this._getByteStrideFromType(accessor);
<mask> var byteLength = accessor.count * bytePerComponent;
<mask> this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
<mask> }
<mask>
<mask> private _getByteStrideFromType(accessor: IGLTFAccessor): number {
<mask> switch (accessor.type) {
<mask> case "SCALAR": return 1;
<mask> case "VEC2": return 2;
<mask> case "VEC3": return 3;
<mask> case "VEC4": return 4;
<mask> case "MAT2": return 4;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove onSuccess(bufferViewData);
</s> add onSuccess(data);
</s> remove default:
this._onError("Invalid accessor type (" + accessor.type + ")");
return 0;
</s> add }
return 0;
}
private _buildArrayBuffer<T extends ArrayBufferView>(typedArray: TypedArrayConstructor<T>, context: string, data: ArrayBufferView, byteOffset: number, count: number, numComponents: number, byteStride: number): T {
try {
var byteOffset = data.byteOffset + (byteOffset || 0);
var targetLength = count * numComponents;
if (byteStride == null || byteStride === numComponents * typedArray.BYTES_PER_ELEMENT) {
return new typedArray(data.buffer, byteOffset, targetLength);
}
var elementStride = byteStride / typedArray.BYTES_PER_ELEMENT;
var sourceBuffer = new typedArray(data.buffer, byteOffset, elementStride * count);
var targetBuffer = new typedArray(targetLength);
var sourceIndex = 0;
var targetIndex = 0;
while (targetIndex < targetLength) {
for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {
targetBuffer[targetIndex] = sourceBuffer[sourceIndex + componentIndex];
targetIndex++;
}
sourceIndex += elementStride;
}
return targetBuffer;
}
catch (e) {
throw new Error(context + ": " + e);
</s> remove let sourceBuffer = new Float32Array(buffer, byteOffset);
let targetBuffer = new Float32Array(byteLength);
this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
return targetBuffer;
}
private _extractInterleavedData(sourceBuffer: ArrayBufferView, targetBuffer: ArrayBufferView, bytePerComponent: number, stride: number, length: number): void {
let tempIndex = 0;
let sourceIndex = 0;
let storageSize = bytePerComponent;
while (tempIndex < length) {
for (var cursor = 0; cursor < storageSize; cursor++) {
targetBuffer[tempIndex] = sourceBuffer[sourceIndex + cursor]
tempIndex++;
}
sourceIndex += stride;
</s> add if (accessor.normalized) {
throw new Error(context + ": Normalized accessors are not currently supported");
</s> remove var buffer = bufferData.buffer;
byteOffset += bufferData.byteOffset;
var bufferViewData;
switch (componentType) {
</s> add var data: ArrayBufferView;
switch (accessor.componentType) {
</s> remove private _buildFloat32ArrayBuffer(buffer: ArrayBuffer, byteOffset: number, byteLength: number, byteStride: number, bytePerComponent: number): Float32Array {
if (!byteStride) {
return new Float32Array(buffer, byteOffset, byteLength);
</s> add private _loadAccessorAsync(context: string, accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
if (accessor.sparse) {
throw new Error(context + ": Sparse accessors are not currently supported");
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
}
return 0;
}
private _buildArrayBuffer<T extends ArrayBufferView>(typedArray: TypedArrayConstructor<T>, context: string, data: ArrayBufferView, byteOffset: number, count: number, numComponents: number, byteStride: number): T {
try {
var byteOffset = data.byteOffset + (byteOffset || 0);
var targetLength = count * numComponents;
if (byteStride == null || byteStride === numComponents * typedArray.BYTES_PER_ELEMENT) {
return new typedArray(data.buffer, byteOffset, targetLength);
}
var elementStride = byteStride / typedArray.BYTES_PER_ELEMENT;
var sourceBuffer = new typedArray(data.buffer, byteOffset, elementStride * count);
var targetBuffer = new typedArray(targetLength);
var sourceIndex = 0;
var targetIndex = 0;
while (targetIndex < targetLength) {
for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {
targetBuffer[targetIndex] = sourceBuffer[sourceIndex + componentIndex];
targetIndex++;
}
sourceIndex += elementStride;
}
return targetBuffer;
}
catch (e) {
throw new Error(context + ": " + e);
| <mask> case "VEC4": return 4;
<mask> case "MAT2": return 4;
<mask> case "MAT3": return 9;
<mask> case "MAT4": return 16;
<mask> default:
<mask> this._onError("Invalid accessor type (" + accessor.type + ")");
<mask> return 0;
<mask> }
<mask> }
<mask>
<mask> public _addPendingData(data: any): void {
<mask> if (!this._renderReady) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _loadAccessorAsync(accessor: IGLTFAccessor, onSuccess: (data: ArrayBufferView) => void): void {
var bufferView = this._getArrayItem(this._gltf.bufferViews, accessor.bufferView, "Buffer view");
if (!bufferView) {
return;
}
var byteOffset = accessor.byteOffset || 0;
let bytePerComponent = this._getByteStrideFromType(accessor);
var byteLength = accessor.count * bytePerComponent;
this._loadBufferViewAsync(bufferView, byteOffset, byteLength, bytePerComponent, accessor.componentType, onSuccess);
}
private _getByteStrideFromType(accessor: IGLTFAccessor): number {
switch (accessor.type) {
</s> add private _getNumComponentsOfType(type: string): number {
switch (type) {
</s> remove this._onError("Invalid component type (" + componentType + ")");
return;
</s> add throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove this._rootNode = { name: "__root__" };
</s> add this._loadScene("scenes[" + scene.index + "]", scene, nodeNames);
}
private _loadScene(context: string, scene: IGLTFScene, nodeNames: any): void {
this._rootNode = { babylonMesh: new Mesh("__root__", this._babylonScene) };
</s> remove onSuccess(bufferViewData);
</s> add onSuccess(data);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadMaterialMetallicRoughnessProperties(context: string, material: IGLTFMaterial): void {
| <mask>
<mask> return this._defaultMaterial;
<mask> }
<mask>
<mask> private _loadMaterialMetallicRoughnessProperties(material: IGLTFMaterial): void {
<mask> var babylonMaterial = material.babylonMaterial as PBRMaterial;
<mask>
<mask> // Ensure metallic workflow
<mask> babylonMaterial.metallic = 1;
<mask> babylonMaterial.roughness = 1;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
</s> add public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
</s> remove public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
</s> add public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
</s> remove private _loadSpecularGlossinessProperties(loader: GLTFLoader, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void {
</s> add private _loadSpecularGlossinessProperties(loader: GLTFLoader, context: string, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void { </s> remove babylonMaterial.emissiveTexture = this._loadTexture(material.emissiveTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.emissiveTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find emissive texture " + material.emissiveTexture.index);
}
babylonMaterial.emissiveTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.emissiveTexture.texCoord);
</s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.baseColorTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find base color texture " + properties.baseColorTexture.index);
}
babylonMaterial.albedoTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.baseColorTexture.texCoord);
| <mask> babylonMaterial.metallic = properties.metallicFactor == null ? 1 : properties.metallicFactor;
<mask> babylonMaterial.roughness = properties.roughnessFactor == null ? 1 : properties.roughnessFactor;
<mask>
<mask> if (properties.baseColorTexture) {
<mask> babylonMaterial.albedoTexture = this._loadTexture(properties.baseColorTexture);
<mask> }
<mask>
<mask> if (properties.metallicRoughnessTexture) {
<mask> babylonMaterial.metallicTexture = this._loadTexture(properties.metallicRoughnessTexture);
<mask> babylonMaterial.useMetallnessFromMetallicTextureBlue = true;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; </s> remove babylonMaterial.metallicTexture = this._loadTexture(properties.metallicRoughnessTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.metallicRoughnessTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find metallic roughness texture " + properties.metallicRoughnessTexture.index);
}
babylonMaterial.metallicTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.metallicRoughnessTexture.texCoord);
</s> remove babylonMaterial.albedoTexture = loader._loadTexture(properties.diffuseTexture);
</s> add var texture = GLTFUtils.GetArrayItem(loader._gltf.textures, properties.diffuseTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find diffuse texture " + properties.diffuseTexture.index);
}
babylonMaterial.albedoTexture = loader._loadTexture("textures[" + texture.index + "]", texture, properties.diffuseTexture.texCoord); </s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove return;
</s> add throw new Error(context + ": Failed to find sampler " + texture.sampler);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.metallicRoughnessTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find metallic roughness texture " + properties.metallicRoughnessTexture.index);
}
babylonMaterial.metallicTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.metallicRoughnessTexture.texCoord);
| <mask> babylonMaterial.albedoTexture = this._loadTexture(properties.baseColorTexture);
<mask> }
<mask>
<mask> if (properties.metallicRoughnessTexture) {
<mask> babylonMaterial.metallicTexture = this._loadTexture(properties.metallicRoughnessTexture);
<mask> babylonMaterial.useMetallnessFromMetallicTextureBlue = true;
<mask> babylonMaterial.useRoughnessFromMetallicTextureGreen = true;
<mask> babylonMaterial.useRoughnessFromMetallicTextureAlpha = false;
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonMaterial.albedoTexture = this._loadTexture(properties.baseColorTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.baseColorTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find base color texture " + properties.baseColorTexture.index);
}
babylonMaterial.albedoTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.baseColorTexture.texCoord);
</s> remove this._loadMaterialAlphaProperties(material, properties.baseColorFactor);
</s> add this._loadMaterialAlphaProperties(context, material, properties.baseColorFactor);
</s> remove babylonMaterial.reflectivityTexture = loader._loadTexture(properties.specularGlossinessTexture);
</s> add var texture = GLTFUtils.GetArrayItem(loader._gltf.textures, properties.specularGlossinessTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find diffuse texture " + properties.specularGlossinessTexture.index);
}
babylonMaterial.reflectivityTexture = loader._loadTexture("textures[" + texture.index + "]", texture, properties.specularGlossinessTexture.texCoord); </s> remove babylonMaterial.albedoTexture = loader._loadTexture(properties.diffuseTexture);
</s> add var texture = GLTFUtils.GetArrayItem(loader._gltf.textures, properties.diffuseTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find diffuse texture " + properties.diffuseTexture.index);
}
babylonMaterial.albedoTexture = loader._loadTexture("textures[" + texture.index + "]", texture, properties.diffuseTexture.texCoord); </s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadMaterialAlphaProperties(context, material, properties.baseColorFactor);
| <mask> babylonMaterial.useRoughnessFromMetallicTextureGreen = true;
<mask> babylonMaterial.useRoughnessFromMetallicTextureAlpha = false;
<mask> }
<mask>
<mask> this._loadMaterialAlphaProperties(material, properties.baseColorFactor);
<mask> }
<mask>
<mask> public _loadMaterial(material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
<mask> if (material.babylonMaterial) {
<mask> assign(material.babylonMaterial, false);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadMaterial(material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
</s> add public _loadMaterial(context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { </s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> remove public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
</s> add public static LoadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, context, material, assign));
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _loadMaterial(context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
| <mask>
<mask> this._loadMaterialAlphaProperties(material, properties.baseColorFactor);
<mask> }
<mask>
<mask> public _loadMaterial(material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
<mask> if (material.babylonMaterial) {
<mask> assign(material.babylonMaterial, false);
<mask> return;
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadMaterialAlphaProperties(material, properties.baseColorFactor);
</s> add this._loadMaterialAlphaProperties(context, material, properties.baseColorFactor);
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { </s> remove public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
</s> add public static LoadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, context, material, assign));
</s> remove loader._loadMaterialBaseProperties(material);
this._loadSpecularGlossinessProperties(loader, material, extension);
</s> add loader._loadMaterialBaseProperties(context, material);
this._loadSpecularGlossinessProperties(loader, context, material, extension); </s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (GLTFLoaderExtension.LoadMaterial(this, context, material, assign)) {
| <mask> assign(material.babylonMaterial, false);
<mask> return;
<mask> }
<mask>
<mask> if (GLTFLoaderExtension.LoadMaterial(this, material, assign)) {
<mask> return;
<mask> }
<mask>
<mask> this._createPbrMaterial(material);
<mask> this._loadMaterialBaseProperties(material);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._loadMaterialBaseProperties(material);
this._loadMaterialMetallicRoughnessProperties(material);
</s> add this._loadMaterialBaseProperties(context, material);
this._loadMaterialMetallicRoughnessProperties(context, material);
</s> remove this._loadMaterialAlphaProperties(material, properties.baseColorFactor);
</s> add this._loadMaterialAlphaProperties(context, material, properties.baseColorFactor);
</s> remove public _loadMaterial(material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
</s> add public _loadMaterial(context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): void {
</s> remove loader._loadMaterialBaseProperties(material);
this._loadSpecularGlossinessProperties(loader, material, extension);
</s> add loader._loadMaterialBaseProperties(context, material);
this._loadSpecularGlossinessProperties(loader, context, material, extension); </s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadMaterialBaseProperties(context, material);
this._loadMaterialMetallicRoughnessProperties(context, material);
| <mask> return;
<mask> }
<mask>
<mask> this._createPbrMaterial(material);
<mask> this._loadMaterialBaseProperties(material);
<mask> this._loadMaterialMetallicRoughnessProperties(material);
<mask> assign(material.babylonMaterial, true);
<mask> }
<mask>
<mask> public _createPbrMaterial(material: IGLTFMaterial): void {
<mask> var babylonMaterial = new PBRMaterial(material.name || "mat" + material.index, this._babylonScene);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (GLTFLoaderExtension.LoadMaterial(this, material, assign)) {
</s> add if (GLTFLoaderExtension.LoadMaterial(this, context, material, assign)) {
</s> remove public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
</s> add public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadMaterialMetallicRoughnessProperties(material: IGLTFMaterial): void {
</s> add private _loadMaterialMetallicRoughnessProperties(context: string, material: IGLTFMaterial): void {
</s> remove public _loadNode(node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, node)) {
</s> add public _loadNode(context: string, node: IGLTFNode): void {
if (GLTFLoaderExtension.LoadNode(this, context, node)) {
</s> remove public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
</s> add public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
| <mask> babylonMaterial.sideOrientation = Material.CounterClockWiseSideOrientation;
<mask> material.babylonMaterial = babylonMaterial;
<mask> }
<mask>
<mask> public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
<mask> var babylonMaterial = material.babylonMaterial as PBRMaterial;
<mask>
<mask> babylonMaterial.emissiveColor = material.emissiveFactor ? Color3.FromArray(material.emissiveFactor) : new Color3(0, 0, 0);
<mask> if (material.doubleSided) {
<mask> babylonMaterial.backFaceCulling = false;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove private _loadMaterialMetallicRoughnessProperties(material: IGLTFMaterial): void {
</s> add private _loadMaterialMetallicRoughnessProperties(context: string, material: IGLTFMaterial): void {
</s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; </s> remove private _loadSpecularGlossinessProperties(loader: GLTFLoader, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void {
</s> add private _loadSpecularGlossinessProperties(loader: GLTFLoader, context: string, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void { </s> remove public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
</s> add public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
</s> remove babylonMaterial.emissiveTexture = this._loadTexture(material.emissiveTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.emissiveTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find emissive texture " + material.emissiveTexture.index);
}
babylonMaterial.emissiveTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.emissiveTexture.texCoord);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.normalTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find normal texture " + material.normalTexture.index);
}
babylonMaterial.bumpTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.normalTexture.texCoord);
| <mask> babylonMaterial.twoSidedLighting = true;
<mask> }
<mask>
<mask> if (material.normalTexture) {
<mask> babylonMaterial.bumpTexture = this._loadTexture(material.normalTexture);
<mask> babylonMaterial.invertNormalMapX = !this._babylonScene.useRightHandedSystem;
<mask> babylonMaterial.invertNormalMapY = this._babylonScene.useRightHandedSystem;
<mask> if (material.normalTexture.scale !== undefined) {
<mask> babylonMaterial.bumpTexture.level = material.normalTexture.scale;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.occlusionTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find occlusion texture " + material.occlusionTexture.index);
}
babylonMaterial.ambientTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.occlusionTexture.texCoord);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (material.normalTexture.scale != null) {
| <mask> if (material.normalTexture) {
<mask> babylonMaterial.bumpTexture = this._loadTexture(material.normalTexture);
<mask> babylonMaterial.invertNormalMapX = !this._babylonScene.useRightHandedSystem;
<mask> babylonMaterial.invertNormalMapY = this._babylonScene.useRightHandedSystem;
<mask> if (material.normalTexture.scale !== undefined) {
<mask> babylonMaterial.bumpTexture.level = material.normalTexture.scale;
<mask> }
<mask> }
<mask>
<mask> if (material.occlusionTexture) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonMaterial.bumpTexture = this._loadTexture(material.normalTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.normalTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find normal texture " + material.normalTexture.index);
}
babylonMaterial.bumpTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.normalTexture.texCoord);
</s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.occlusionTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find occlusion texture " + material.occlusionTexture.index);
}
babylonMaterial.ambientTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.occlusionTexture.texCoord);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.occlusionTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find occlusion texture " + material.occlusionTexture.index);
}
babylonMaterial.ambientTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.occlusionTexture.texCoord);
| <mask> }
<mask> }
<mask>
<mask> if (material.occlusionTexture) {
<mask> babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
<mask> babylonMaterial.useAmbientInGrayScale = true;
<mask> if (material.occlusionTexture.strength !== undefined) {
<mask> babylonMaterial.ambientTextureStrength = material.occlusionTexture.strength;
<mask> }
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (material.occlusionTexture.strength !== undefined) {
</s> add if (material.occlusionTexture.strength != null) {
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove babylonMaterial.bumpTexture = this._loadTexture(material.normalTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.normalTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find normal texture " + material.normalTexture.index);
}
babylonMaterial.bumpTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.normalTexture.texCoord);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove return;
</s> add throw new Error(context + ": Failed to find skin " + node.skin);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
if (material.occlusionTexture.strength != null) {
| <mask>
<mask> if (material.occlusionTexture) {
<mask> babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
<mask> babylonMaterial.useAmbientInGrayScale = true;
<mask> if (material.occlusionTexture.strength !== undefined) {
<mask> babylonMaterial.ambientTextureStrength = material.occlusionTexture.strength;
<mask> }
<mask> }
<mask>
<mask> if (material.emissiveTexture) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonMaterial.ambientTexture = this._loadTexture(material.occlusionTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.occlusionTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find occlusion texture " + material.occlusionTexture.index);
}
babylonMaterial.ambientTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.occlusionTexture.texCoord);
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
</s> remove babylonMaterial.bumpTexture = this._loadTexture(material.normalTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.normalTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find normal texture " + material.normalTexture.index);
}
babylonMaterial.bumpTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.normalTexture.texCoord);
</s> remove node.babylonMesh.skeleton = this._loadSkin(skin);
</s> add node.babylonMesh.skeleton = this._loadSkin("skins[" + node.skin + "]", skin);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.emissiveTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find emissive texture " + material.emissiveTexture.index);
}
babylonMaterial.emissiveTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.emissiveTexture.texCoord);
| <mask> }
<mask> }
<mask>
<mask> if (material.emissiveTexture) {
<mask> babylonMaterial.emissiveTexture = this._loadTexture(material.emissiveTexture);
<mask> }
<mask> }
<mask>
<mask> public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
<mask> var babylonMaterial = material.babylonMaterial as PBRMaterial;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
</s> add public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
</s> remove public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
</s> add public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadMaterialMetallicRoughnessProperties(material: IGLTFMaterial): void {
</s> add private _loadMaterialMetallicRoughnessProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadSpecularGlossinessProperties(loader: GLTFLoader, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void {
</s> add private _loadSpecularGlossinessProperties(loader: GLTFLoader, context: string, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void { </s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _loadMaterialAlphaProperties(context: string, material: IGLTFMaterial, colorFactor: number[]): void {
| <mask> babylonMaterial.emissiveTexture = this._loadTexture(material.emissiveTexture);
<mask> }
<mask> }
<mask>
<mask> public _loadMaterialAlphaProperties(material: IGLTFMaterial, colorFactor?: number[]): void {
<mask> var babylonMaterial = material.babylonMaterial as PBRMaterial;
<mask>
<mask> var alphaMode = material.alphaMode || "OPAQUE";
<mask> switch (alphaMode) {
<mask> case "OPAQUE":
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonMaterial.emissiveTexture = this._loadTexture(material.emissiveTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, material.emissiveTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find emissive texture " + material.emissiveTexture.index);
}
babylonMaterial.emissiveTexture = this._loadTexture("textures[" + texture.index + "]", texture, material.emissiveTexture.texCoord);
</s> remove public _loadMaterialBaseProperties(material: IGLTFMaterial): void {
</s> add public _loadMaterialBaseProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadMaterialMetallicRoughnessProperties(material: IGLTFMaterial): void {
</s> add private _loadMaterialMetallicRoughnessProperties(context: string, material: IGLTFMaterial): void {
</s> remove private _loadSpecularGlossinessProperties(loader: GLTFLoader, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void {
</s> add private _loadSpecularGlossinessProperties(loader: GLTFLoader, context: string, material: IGLTFMaterial, properties: IKHRMaterialsPbrSpecularGlossiness): void { </s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Invalid alpha mode '" + material.alphaMode + "'");
| <mask> babylonMaterial.useAlphaFromAlbedoTexture = true;
<mask> }
<mask> break;
<mask> default:
<mask> this._onError("Invalid alpha mode '" + material.alphaMode + "'");
<mask> return;
<mask> }
<mask> }
<mask>
<mask> public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
<mask> var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove bufferViewData = this._buildFloat32ArrayBuffer(buffer, byteOffset, byteLength, bufferView.byteStride, bytePerComponent);
</s> add data = this._buildArrayBuffer(Float32Array, context, bufferViewData, accessor.byteOffset, accessor.count, numComponents, bufferView.byteStride);
</s> remove this._onError("Invalid component type (" + componentType + ")");
return;
</s> add throw new Error(context + ": Invalid component type (" + accessor.componentType + ")");
</s> remove if (!this._disposed) {
</s> add this._tryCatchOnError(() => {
</s> remove babylonMaterial.reflectivityTexture = loader._loadTexture(properties.specularGlossinessTexture);
</s> add var texture = GLTFUtils.GetArrayItem(loader._gltf.textures, properties.specularGlossinessTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find diffuse texture " + properties.specularGlossinessTexture.index);
}
babylonMaterial.reflectivityTexture = loader._loadTexture("textures[" + texture.index + "]", texture, properties.specularGlossinessTexture.texCoord); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
| <mask> return;
<mask> }
<mask> }
<mask>
<mask> public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
<mask> var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
<mask> if (!texture) {
<mask> return null;
<mask> }
<mask>
<mask> var texCoord = textureInfo.texCoord || 0;
<mask>
<mask> var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
<mask> if (!source) {
<mask> return null;
<mask> }
<mask>
<mask> var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
<mask> if (!sampler) {
<mask> return;
<mask> }
<mask>
<mask> var noMipMaps = (sampler.minFilter === ETextureMinFilter.NEAREST || sampler.minFilter === ETextureMinFilter.LINEAR);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return;
</s> add throw new Error(context + ": Failed to find sampler " + texture.sampler);
</s> remove this._onError("Invalid alpha mode '" + material.alphaMode + "'");
return;
</s> add throw new Error(context + ": Invalid alpha mode '" + material.alphaMode + "'");
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove babylonMaterial.albedoTexture = this._loadTexture(properties.baseColorTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.baseColorTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find base color texture " + properties.baseColorTexture.index);
}
babylonMaterial.albedoTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.baseColorTexture.texCoord);
</s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
throw new Error(context + ": Failed to find sampler " + texture.sampler);
| <mask> }
<mask>
<mask> var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
<mask> if (!sampler) {
<mask> return;
<mask> }
<mask>
<mask> var noMipMaps = (sampler.minFilter === ETextureMinFilter.NEAREST || sampler.minFilter === ETextureMinFilter.LINEAR);
<mask> var samplingMode = GLTFUtils.GetTextureSamplingMode(sampler.magFilter, sampler.minFilter);
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove babylonMaterial.microSurface = properties.glossinessFactor === undefined ? 1 : properties.glossinessFactor;
</s> add babylonMaterial.microSurface = properties.glossinessFactor == null ? 1 : properties.glossinessFactor; </s> remove babylonMaterial.albedoTexture = this._loadTexture(properties.baseColorTexture);
</s> add var texture = GLTFUtils.GetArrayItem(this._gltf.textures, properties.baseColorTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find base color texture " + properties.baseColorTexture.index);
}
babylonMaterial.albedoTexture = this._loadTexture("textures[" + texture.index + "]", texture, properties.baseColorTexture.texCoord);
</s> remove if (!this._disposed) {
</s> add this._tryCatchOnError(() => {
</s> remove babylonMaterial.albedoTexture = loader._loadTexture(properties.diffuseTexture);
</s> add var texture = GLTFUtils.GetArrayItem(loader._gltf.textures, properties.diffuseTexture.index);
if (!texture) {
throw new Error(context + ": Failed to find diffuse texture " + properties.diffuseTexture.index);
}
babylonMaterial.albedoTexture = loader._loadTexture("textures[" + texture.index + "]", texture, properties.diffuseTexture.texCoord); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._tryCatchOnError(() => {
| <mask> var samplingMode = GLTFUtils.GetTextureSamplingMode(sampler.magFilter, sampler.minFilter);
<mask>
<mask> this._addPendingData(texture);
<mask> var babylonTexture = new Texture(null, this._babylonScene, noMipMaps, false, samplingMode, () => {
<mask> if (!this._disposed) {
<mask> this._removePendingData(texture);
<mask> }
<mask> }, () => {
<mask> if (!this._disposed) {
<mask> this._onError("Failed to load texture '" + source.uri + "'");
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove }
}, () => {
if (!this._disposed) {
this._onError("Failed to load texture '" + source.uri + "'");
this._removePendingData(texture);
}
</s> add });
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove this._onProgress(event);
</s> add this._tryCatchOnError(() => {
this._onProgress(event);
});
</s> remove return;
</s> add throw new Error(context + ": Failed to find sampler " + texture.sampler);
</s> remove this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
</s> add this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
});
}, message => {
this._tryCatchOnError(() => {
throw new Error(context + ": " + message);
});
| <mask> this._addPendingData(texture);
<mask> var babylonTexture = new Texture(null, this._babylonScene, noMipMaps, false, samplingMode, () => {
<mask> if (!this._disposed) {
<mask> this._removePendingData(texture);
<mask> }
<mask> }, () => {
<mask> if (!this._disposed) {
<mask> this._onError("Failed to load texture '" + source.uri + "'");
<mask> this._removePendingData(texture);
<mask> }
<mask> });
<mask>
<mask> if (texture.url) {
<mask> babylonTexture.updateURL(texture.url);
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove if (!this._disposed) {
</s> add this._tryCatchOnError(() => {
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove this._onProgress(event);
</s> add this._tryCatchOnError(() => {
this._onProgress(event);
});
</s> remove this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
</s> add this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
| <mask> texture.dataReadyObservable.add(texture => {
<mask> babylonTexture.updateURL(texture.url);
<mask> });
<mask>
<mask> var setTextureData = data => {
<mask> texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
<mask> texture.dataReadyObservable.notifyObservers(texture);
<mask> };
<mask>
<mask> if (!source.uri) {
<mask> var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
<mask> if (!bufferView) {
<mask> return;
<mask> }
<mask>
<mask> this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
<mask> }
<mask> else if (GLTFUtils.IsBase64(source.uri)) {
<mask> setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
<mask> }
<mask> else {
<mask> Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
<mask> this._onProgress(event);
<mask> }, this._babylonScene.database, true, request => {
<mask> this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
<mask> });
<mask> }
<mask> }
<mask>
<mask> babylonTexture.coordinatesIndex = texCoord;
<mask> babylonTexture.wrapU = GLTFUtils.GetTextureWrapMode(sampler.wrapS);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove this._onProgress(event);
</s> add this._tryCatchOnError(() => {
this._onProgress(event);
});
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
</s> add this._tryCatchOnError(() => {
buffer.loadedData = new Uint8Array(data);
buffer.loadedObservable.notifyObservers(buffer);
buffer.loadedObservable = null;
});
</s> remove this._onError("Failed to load file '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
</s> add this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + buffer.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
this._loadImage("images[" + image.index + "]", image, data => {
texture.url = URL.createObjectURL(new Blob([data], { type: image.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
});
| <mask> if (!image) {
<mask> throw new Error(context + ": Failed to find source " + texture.source);
<mask> }
<mask> }
<mask>
<mask> babylonTexture.coordinatesIndex = coordinatesIndex || 0;
<mask> babylonTexture.wrapU = GLTFUtils.GetTextureWrapMode(sampler.wrapS);
<mask> babylonTexture.wrapV = GLTFUtils.GetTextureWrapMode(sampler.wrapT);
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonTexture.coordinatesIndex = texCoord;
</s> add babylonTexture.coordinatesIndex = coordinatesIndex || 0;
</s> remove babylonTexture.name = texture.name || "texture" + textureInfo.index;
</s> add babylonTexture.name = texture.name || "texture" + texture.index;
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove return;
</s> add throw new Error(context + ": Failed to find node " + nodeIndices[i]);
</s> remove return;
</s> add throw new Error(context + ": Failed to find skin " + node.skin);
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
babylonTexture.coordinatesIndex = coordinatesIndex || 0;
| <mask> });
<mask> }
<mask> }
<mask>
<mask> babylonTexture.coordinatesIndex = texCoord;
<mask> babylonTexture.wrapU = GLTFUtils.GetTextureWrapMode(sampler.wrapS);
<mask> babylonTexture.wrapV = GLTFUtils.GetTextureWrapMode(sampler.wrapT);
<mask> babylonTexture.name = texture.name || "texture" + textureInfo.index;
<mask>
<mask> if (this._parent.onTextureLoaded) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonTexture.name = texture.name || "texture" + textureInfo.index;
</s> add babylonTexture.name = texture.name || "texture" + texture.index;
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove if (material.normalTexture.scale !== undefined) {
</s> add if (material.normalTexture.scale != null) {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
babylonTexture.name = texture.name || "texture" + texture.index;
| <mask>
<mask> babylonTexture.coordinatesIndex = texCoord;
<mask> babylonTexture.wrapU = GLTFUtils.GetTextureWrapMode(sampler.wrapS);
<mask> babylonTexture.wrapV = GLTFUtils.GetTextureWrapMode(sampler.wrapT);
<mask> babylonTexture.name = texture.name || "texture" + textureInfo.index;
<mask>
<mask> if (this._parent.onTextureLoaded) {
<mask> this._parent.onTextureLoaded(babylonTexture);
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove babylonTexture.coordinatesIndex = texCoord;
</s> add babylonTexture.coordinatesIndex = coordinatesIndex || 0;
</s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove if (node.skin !== undefined) {
var skin = this._getArrayItem(this._gltf.skins, node.skin, "Skin");
</s> add if (node.skin != null) {
var skin = GLTFUtils.GetArrayItem(this._gltf.skins, node.skin);
</s> remove if (node.mesh !== undefined) {
var mesh = this._getArrayItem(this._gltf.meshes, node.mesh, "Mesh");
</s> add if (node.mesh != null) {
var mesh = GLTFUtils.GetArrayItem(this._gltf.meshes, node.mesh);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
| <mask>
<mask> return babylonTexture;
<mask> }
<mask>
<mask> public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
<mask> if (!array || !array[index]) {
<mask> this._onError(name + " index (" + index + ") was not found");
<mask> return null;
<mask> }
<mask>
<mask> return array[index];
<mask> }
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
</s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove default:
this._onError("Invalid accessor type (" + accessor.type + ")");
return 0;
</s> add }
return 0;
}
private _buildArrayBuffer<T extends ArrayBufferView>(typedArray: TypedArrayConstructor<T>, context: string, data: ArrayBufferView, byteOffset: number, count: number, numComponents: number, byteStride: number): T {
try {
var byteOffset = data.byteOffset + (byteOffset || 0);
var targetLength = count * numComponents;
if (byteStride == null || byteStride === numComponents * typedArray.BYTES_PER_ELEMENT) {
return new typedArray(data.buffer, byteOffset, targetLength);
}
var elementStride = byteStride / typedArray.BYTES_PER_ELEMENT;
var sourceBuffer = new typedArray(data.buffer, byteOffset, elementStride * count);
var targetBuffer = new typedArray(targetLength);
var sourceIndex = 0;
var targetIndex = 0;
while (targetIndex < targetLength) {
for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {
targetBuffer[targetIndex] = sourceBuffer[sourceIndex + componentIndex];
targetIndex++;
}
sourceIndex += elementStride;
}
return targetBuffer;
}
catch (e) {
throw new Error(context + ": " + e);
</s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
</s> remove public _onError(message: string): void {
</s> add private _onError(message: string): void {
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
}
| <mask> this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
<mask> }
<mask>
<mask> public _tryCatchOnError(handler: () => void) {
<mask> try {
<mask> handler();
<mask> }
<mask> catch (e) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove return array[index];
</s> add public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
</s> remove this._loadBufferAsync(buffer, bufferData => {
if (byteOffset + byteLength > bufferData.byteLength) {
this._onError("Buffer access is out of range");
return;
</s> add this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, bufferViewData => {
var numComponents = this._getNumComponentsOfType(accessor.type);
if (numComponents === 0) {
throw new Error(context + ": Invalid type (" + accessor.type + ")");
</s> remove }
catch (e) {
this._onError(e.message);
}
</s> add });
</s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove this._extractInterleavedData(sourceBuffer, targetBuffer, bytePerComponent, byteStride / 4, targetBuffer.length);
</s> add try {
var data = new Uint8Array(bufferData.buffer, bufferData.byteOffset + (bufferView.byteOffset || 0), bufferView.byteLength);
}
catch (e) {
throw new Error(context + ": " + e.message);
}
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
public _tryCatchOnError(handler: () => void) {
try {
handler();
}
catch (e) {
this._onError(e.message);
}
| <mask> this._onError(name + " index (" + index + ") was not found");
<mask> return null;
<mask> }
<mask>
<mask> return array[index];
<mask> }
<mask> }
<mask>
<mask> BABYLON.GLTFFileLoader.CreateGLTFLoaderV2 = parent => new GLTFLoader(parent);
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public _getArrayItem<T>(array: ArrayLike<T>, index: number, name: string): T {
if (!array || !array[index]) {
this._onError(name + " index (" + index + ") was not found");
return null;
</s> add private _loadImage(context: string, image: IGLTFImage, onSuccess: (data: ArrayBufferView) => void): void {
if (image.uri) {
if (!GLTFUtils.ValidateUri(image.uri)) {
throw new Error(context + ": Uri '" + image.uri + "' is invalid");
}
if (GLTFUtils.IsBase64(image.uri)) {
onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(image.uri)));
}
else {
Tools.LoadFile(this._rootUrl + image.uri, data => {
this._tryCatchOnError(() => {
onSuccess(data);
});
}, event => {
this._tryCatchOnError(() => {
this._onProgress(event);
});
}, this._babylonScene.database, true, request => {
this._tryCatchOnError(() => {
throw new Error(context + ": Failed to load '" + image.uri + "'" + (request ? ": " + request.status + " " + request.statusText : ""));
});
});
}
}
else {
var bufferView = GLTFUtils.GetArrayItem(this._gltf.bufferViews, image.bufferView);
if (!bufferView) {
throw new Error(context + ": Failed to find buffer view " + image.bufferView);
}
this._loadBufferViewAsync("bufferViews[" + bufferView.index + "]", bufferView, onSuccess);
</s> remove public _loadTexture(textureInfo: IGLTFTextureInfo): Texture {
var texture = this._getArrayItem(this._gltf.textures, textureInfo.index, "Texture");
if (!texture) {
return null;
}
var texCoord = textureInfo.texCoord || 0;
var source = this._getArrayItem(this._gltf.images, texture.source, "Texture (" + textureInfo.index + ") source");
if (!source) {
return null;
}
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : this._getArrayItem(this._gltf.samplers, texture.sampler, "Texture (" + textureInfo.index + ") sampler"));
</s> add public _loadTexture(context: string, texture: IGLTFTexture, coordinatesIndex: number): Texture {
var sampler = (texture.sampler == null ? <IGLTFSampler>{} : GLTFUtils.GetArrayItem(this._gltf.samplers, texture.sampler));
</s> remove this._loadNodeLOD(loader, nodes, index - 1, onComplete);
</s> add this._loadNodeLOD(loader, context, nodes, index - 1, onComplete); </s> remove var setTextureData = data => {
texture.url = URL.createObjectURL(new Blob([data], { type: source.mimeType }));
texture.dataReadyObservable.notifyObservers(texture);
};
if (!source.uri) {
var bufferView = this._getArrayItem(this._gltf.bufferViews, source.bufferView, "Texture (" + textureInfo.index + ") source (" + texture.source + ") buffer view");
if (!bufferView) {
return;
}
this._loadBufferViewAsync(bufferView, 0, bufferView.byteLength, 1, EComponentType.UNSIGNED_BYTE, setTextureData);
}
else if (GLTFUtils.IsBase64(source.uri)) {
setTextureData(new Uint8Array(GLTFUtils.DecodeBase64(source.uri)));
}
else {
Tools.LoadFile(this._rootUrl + source.uri, setTextureData, event => {
this._onProgress(event);
}, this._babylonScene.database, true, request => {
this._onError("Failed to load file '" + source.uri + "': " + request.status + " " + request.statusText);
});
</s> add var image = GLTFUtils.GetArrayItem(this._gltf.images, texture.source);
if (!image) {
throw new Error(context + ": Failed to find source " + texture.source);
</s> remove return;
</s> add throw new Error(context + ": Failed to find sampler " + texture.sampler);
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoader.ts |
protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
| <mask> public enabled: boolean = true;
<mask>
<mask> public abstract get name(): string;
<mask>
<mask> protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, node));
</s> add public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
</s> remove public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
</s> add public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
| <mask> public abstract get name(): string;
<mask>
<mask> protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
<mask>
<mask> protected _loadExtension<T>(property: IGLTFProperty, action: (extension: T, onComplete: () => void) => void): boolean {
<mask> if (!property.extensions) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, node));
</s> add public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
</s> remove public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
</s> add public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
| <mask> protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
<mask>
<mask> protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
<mask>
<mask> protected _loadExtension<T>(property: IGLTFProperty, action: (extension: T, onComplete: () => void) => void): boolean {
<mask> if (!property.extensions) {
<mask> return false;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, node));
</s> add public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
</s> remove public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
</s> add public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
| <mask> //
<mask>
<mask> public static _Extensions: GLTFLoaderExtension[] = [];
<mask>
<mask> public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
<mask> return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
<mask> }
<mask>
<mask> public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
<mask> return this._ApplyExtensions(extension => extension._loadNode(loader, node));
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, node));
</s> add public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
var node = loader._getArrayItem(loader._gltf.nodes, index, "Node");
if (!node) {
return true;
}
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { </s> remove public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
</s> add public static LoadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, context, material, assign));
</s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
| <mask> public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
<mask> return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
<mask> }
<mask>
<mask> public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
<mask> return this._ApplyExtensions(extension => extension._loadNode(loader, node));
<mask> }
<mask>
<mask> public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
<mask> return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
</s> add public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
</s> remove public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
</s> add public static LoadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, context, material, assign));
</s> remove protected _traverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> add protected _traverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean { return false; }
</s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
public static LoadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
return this._ApplyExtensions(extension => extension._loadMaterial(loader, context, material, assign));
| <mask> public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
<mask> return this._ApplyExtensions(extension => extension._loadNode(loader, node));
<mask> }
<mask>
<mask> public static LoadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
<mask> return this._ApplyExtensions(extension => extension._loadMaterial(loader, material, assign));
<mask> }
<mask>
<mask> private static _ApplyExtensions(action: (extension: GLTFLoaderExtension) => boolean) {
<mask> var extensions = GLTFLoaderExtension._Extensions;
<mask> if (!extensions) {
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove public static LoadNode(loader: GLTFLoader, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, node));
</s> add public static LoadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._loadNode(loader, context, node));
</s> remove public static TraverseNode(loader: GLTFLoader, index: number, action: (node: IGLTFNode, index: number, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, index, action, parentNode));
</s> add public static TraverseNode(loader: GLTFLoader, context: string, node: IGLTFNode, action: (node: IGLTFNode, parentNode: IGLTFNode) => boolean, parentNode: IGLTFNode): boolean {
return this._ApplyExtensions(extension => extension._traverseNode(loader, context, node, action, parentNode));
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { return false; }
</s> remove protected _loadMaterial(loader: GLTFLoader, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean {
</s> add protected _loadMaterial(loader: GLTFLoader, context: string, material: IGLTFMaterial, assign: (babylonMaterial: Material, isNew: boolean) => void): boolean { </s> remove protected _loadNode(loader: GLTFLoader, node: IGLTFNode): boolean { return false; }
</s> add protected _loadNode(loader: GLTFLoader, context: string, node: IGLTFNode): boolean { return false; }
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts |
// Runtime values
index?: number;
| <mask> max: number[];
<mask> min: number[];
<mask> sparse?: IGLTFAccessorSparse;
<mask> }
<mask>
<mask> export interface IGLTFAnimationChannel extends IGLTFProperty {
<mask> sampler: number;
<mask> target: IGLTFAnimationChannelTarget;
<mask> }
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
index?: number;
| <mask> channels: IGLTFAnimationChannel[];
<mask> samplers: IGLTFAnimationSampler[];
<mask>
<mask> // Runtime values
<mask> targets?: any[];
<mask> }
<mask>
<mask> export interface IGLTFAsset extends IGLTFChildRootProperty {
<mask> copyright?: string;
<mask> generator?: string;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| <mask> uri?: string;
<mask> byteLength: number;
<mask>
<mask> // Runtime values
<mask> loadedData: ArrayBufferView;
<mask> loadedObservable: Observable<IGLTFBuffer>;
<mask> }
<mask>
<mask> export interface IGLTFBufferView extends IGLTFChildRootProperty {
<mask> buffer: number;
<mask> byteOffset?: number;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
// Runtime values
index?: number;
| <mask> byteLength: number;
<mask> byteStride?: number;
<mask> }
<mask>
<mask> export interface IGLTFCameraOrthographic extends IGLTFProperty {
<mask> xmag: number;
<mask> ymag: number;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
// Runtime values
index?: number;
| <mask> export interface IGLTFImage extends IGLTFChildRootProperty {
<mask> uri?: string;
<mask> mimeType?: string;
<mask> bufferView?: number;
<mask> }
<mask>
<mask> export interface IGLTFMaterialNormalTextureInfo extends IGLTFTextureInfo {
<mask> scale: number;
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
// Runtime values
index?: number;
| <mask>
<mask> export interface IGLTFMesh extends IGLTFChildRootProperty {
<mask> primitives: IGLTFMeshPrimitive[];
<mask> weights?: number[];
<mask> }
<mask>
<mask> export interface IGLTFNode extends IGLTFChildRootProperty {
<mask> camera?: number;
<mask> children?: number[];
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
// Runtime values
index?: number;
| <mask>
<mask> export interface IGLTFScene extends IGLTFChildRootProperty {
<mask> nodes: number[];
<mask> }
<mask>
<mask> export interface IGLTFSkin extends IGLTFChildRootProperty {
<mask> inverseBindMatrices?: number;
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
index?: number;
| <mask> source: number;
<mask>
<mask> // Runtime values
<mask> url?: string;
<mask> dataReadyObservable?: Observable<IGLTFTexture>;
<mask> }
<mask>
</s> More glTF loader error handling
Former-commit-id: c89907a7e7bc41621a54cc66c25e45060661cd2c </s> remove loadedData: ArrayBufferView;
loadedObservable: Observable<IGLTFBuffer>;
</s> add index?: number;
loadedData?: ArrayBufferView;
loadedObservable?: Observable<IGLTFBuffer>;
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f12fd170c590220f40d077bc7b48be242371065c | loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts |
z-index: 10;
| <mask> transition: all 0.2s ease;
<mask> height: calc(100% - 90px);
<mask>
<mask> &.visible {
<mask> transform: translateX(0);
<mask> opacity: 1;
</s> Fix inspector css
Former-commit-id: bef6cba1322e25a57f23164834c6eec6b39f8887 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/BabylonJS/Babylon.js/commit/f2ffe166fc5b3ecc93c80729c623f1339cf8420f | Playground/src/scss/examples.scss |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.