Skip to content

gltfLoader: fully respect the skipMaterials flag #17199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −25
Draft

gltfLoader: fully respect the skipMaterials flag #17199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions packages/dev/loaders/src/glTF/2.0/glTFLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,16 +433,18 @@ export class GLTFLoader implements IGLTFLoader {

await this._loadExtensionsAsync();

if (this.parent.useOpenPBR) {
const materialAdapterModule = await import("./openPbrMaterialLoadingAdapter");
this._pbrMaterialAdapterClass = materialAdapterModule.OpenPBRMaterialLoadingAdapter;
const materialModule = await import("core/Materials/PBR/openPbrMaterial");
this._pbrMaterialClass = materialModule.OpenPBRMaterial;
} else {
const materialAdapterModule = await import("./pbrMaterialLoadingAdapter");
this._pbrMaterialAdapterClass = materialAdapterModule.PBRMaterialLoadingAdapter;
const materialModule = await import("core/Materials/PBR/pbrMaterial");
this._pbrMaterialClass = materialModule.PBRMaterial;
if (!this.parent.skipMaterials) {
if (this.parent.useOpenPBR) {
const materialAdapterModule = await import("./openPbrMaterialLoadingAdapter");
this._pbrMaterialAdapterClass = materialAdapterModule.OpenPBRMaterialLoadingAdapter;
const materialModule = await import("core/Materials/PBR/openPbrMaterial");
this._pbrMaterialClass = materialModule.OpenPBRMaterial;
} else {
const materialAdapterModule = await import("./pbrMaterialLoadingAdapter");
this._pbrMaterialAdapterClass = materialAdapterModule.PBRMaterialLoadingAdapter;
const materialModule = await import("core/Materials/PBR/pbrMaterial");
this._pbrMaterialClass = materialModule.PBRMaterial;
}
}

const loadingToReadyCounterName = `${GLTFLoaderState[GLTFLoaderState.LOADING]} => ${GLTFLoaderState[GLTFLoaderState.READY]}`;
Expand Down Expand Up @@ -1109,22 +1111,24 @@ export class GLTFLoader implements IGLTFLoader {
})
);

const babylonDrawMode = GLTFLoader._GetDrawMode(context, primitive.mode);
if (primitive.material == undefined) {
let babylonMaterial = this._defaultBabylonMaterialData[babylonDrawMode];
if (!babylonMaterial) {
babylonMaterial = this._createDefaultMaterial("__GLTFLoader._default", babylonDrawMode);
this._parent.onMaterialLoadedObservable.notifyObservers(babylonMaterial);
this._defaultBabylonMaterialData[babylonDrawMode] = babylonMaterial;
if (!this.parent.skipMaterials) {
const babylonDrawMode = GLTFLoader._GetDrawMode(context, primitive.mode);
if (primitive.material == undefined) {
let babylonMaterial = this._defaultBabylonMaterialData[babylonDrawMode];
if (!babylonMaterial) {
babylonMaterial = this._createDefaultMaterial("__GLTFLoader._default", babylonDrawMode);
this._parent.onMaterialLoadedObservable.notifyObservers(babylonMaterial);
this._defaultBabylonMaterialData[babylonDrawMode] = babylonMaterial;
}
babylonMesh.material = babylonMaterial;
} else {
const material = ArrayItem.Get(`${context}/material`, this._gltf.materials, primitive.material);
promises.push(
this._loadMaterialAsync(`/materials/${material.index}`, material, babylonMesh, babylonDrawMode, (babylonMaterial) => {
babylonMesh.material = babylonMaterial;
})
);
}
babylonMesh.material = babylonMaterial;
} else if (!this.parent.skipMaterials) {
const material = ArrayItem.Get(`${context}/material`, this._gltf.materials, primitive.material);
promises.push(
this._loadMaterialAsync(`/materials/${material.index}`, material, babylonMesh, babylonDrawMode, (babylonMaterial) => {
babylonMesh.material = babylonMaterial;
})
);
}

promise = Promise.all(promises);
Expand Down