Skip to content

Revert screen coverage support in MSFT_lod #11840

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

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Revert screen coverage support in MSFT_lod #11840

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion dist/preview release/what's new.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
- Added support for more uv sets to glTF loader. ([bghgary](https://github.com/bghgary))
- Added support for `KHR_materials_volume` for glTF loader. ([MiiBond](https://github.com/MiiBond/))
- Added support for custom timeout in `WebRequest`. ([jamidwyer](https://github.com/jamidwyer/))
- Improved support for `MSFT_lod`, now LOD levels are loaded and accurately displayed according to screen coverage ([CraigFeldspar](https://github.com/CraigFeldspar))
- Added support for direct loading [base64 data URLs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) for all loader ([CoPrez](https://github.com/CoPrez))
- Added `DO_NOT_ALTER_FILE_COORDINATES` flag to STL loader ([AlbertoPa](https://github.com/AlbertoPa))
- Added support for pure geometry files to OBJ loader ([Deltakosh](https://github.com/deltakosh))
Expand Down Expand Up @@ -133,6 +132,7 @@
- Add option to decompose the `newWorldMatrix` when passed into `TransformNode.freezeWorldMatrix`. ([bghgary](https://github.com/bghgary))
- Added `mesh.onMeshReadyObservable` to get notified when a mesh is ready ([RaananW](https://github.com/RaananW))
- Added support for morph targets to the mesh `BoundingInfo` refresh. ([EricBeetsOfficial-Opuscope](https://github.com/EricBeetsOfficial-Opuscope))
- Added support for screen coverage in addition to distance for LOds. ([CraigFeldspar](https://github.com/CraigFeldspar))

### Inspector

Expand Down
102 changes: 26 additions & 76 deletions loaders/src/glTF/2.0/Extensions/MSFT_lod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,6 @@ export class MSFT_lod implements IGLTFLoaderExtension {

const nodeLODs = this._getLODs(extensionContext, node, this._loader.gltf.nodes, extension.ids);
this._loader.logOpen(`${extensionContext}`);
const transformNodes: Nullable<TransformNode>[] = [];

for (let indexLOD = 0; indexLOD < nodeLODs.length; indexLOD++) {
transformNodes.push(null);
}

for (let indexLOD = 0; indexLOD < nodeLODs.length; indexLOD++) {
const nodeLOD = nodeLODs[indexLOD];
Expand All @@ -167,42 +162,13 @@ export class MSFT_lod implements IGLTFLoaderExtension {
this._nodeSignalLODs[indexLOD] = this._nodeSignalLODs[indexLOD] || new Deferred();
}

const assignChild = (babylonTransformNode: TransformNode, index: number) => {
const assignWrap = (babylonTransformNode: TransformNode) => {
assign(babylonTransformNode);
babylonTransformNode.setEnabled(false);
transformNodes[index] = babylonTransformNode;

let fullArray = true;
for (let i = 0; i < transformNodes.length; i++) {
if (!transformNodes[i]) {
fullArray = false;
}
}

const lod0 = transformNodes[transformNodes.length - 1];
if (fullArray && lod0 && this._isMesh(lod0)) {
const screenCoverages = lod0.metadata?.gltf?.extras?.MSFT_screencoverage as number[];

if (screenCoverages && screenCoverages.length) {
screenCoverages.reverse();
lod0.useLODScreenCoverage = true;
for (let i = 0; i < transformNodes.length - 1; i++) {
const transformNode = transformNodes[i];
if (transformNode && this._isMesh(transformNode)) {
lod0.addLODLevel(screenCoverages[i + 1], transformNode);
}
}
if (screenCoverages[0] > 0) {
// Adding empty LOD
lod0.addLODLevel(screenCoverages[0], null);
}
}
}
};

const promise = this._loader.loadNodeAsync(`/nodes/${nodeLOD.index}`, nodeLOD, (node: TransformNode) => assignChild(node, indexLOD)).then((babylonMesh) => {
const screenCoverages = (nodeLODs[nodeLODs.length - 1]._babylonTransformNode as Mesh).metadata?.gltf?.extras?.MSFT_screencoverage;

if (indexLOD !== 0 && !screenCoverages) {
const promise = this._loader.loadNodeAsync(`/nodes/${nodeLOD.index}`, nodeLOD, assignWrap).then((babylonMesh) => {
if (indexLOD !== 0) {
// TODO: should not rely on _babylonTransformNode
const previousNodeLOD = nodeLODs[indexLOD - 1];
if (previousNodeLOD._babylonTransformNode) {
Expand All @@ -211,7 +177,6 @@ export class MSFT_lod implements IGLTFLoaderExtension {
}
}

assign(babylonMesh);
babylonMesh.setEnabled(true);
return babylonMesh;
});
Expand All @@ -232,13 +197,7 @@ export class MSFT_lod implements IGLTFLoaderExtension {
}

/** @hidden */
public _loadMaterialAsync(
context: string,
material: IMaterial,
babylonMesh: Nullable<Mesh>,
babylonDrawMode: number,
assign: (babylonMaterial: Material) => void
): Nullable<Promise<Material>> {
public _loadMaterialAsync(context: string, material: IMaterial, babylonMesh: Nullable<Mesh>, babylonDrawMode: number, assign: (babylonMaterial: Material) => void): Nullable<Promise<Material>> {
// Don't load material LODs if already loading a node LOD.
if (this._nodeIndexLOD) {
return null;
Expand All @@ -257,26 +216,24 @@ export class MSFT_lod implements IGLTFLoaderExtension {
this._materialIndexLOD = indexLOD;
}

const promise = this._loader
._loadMaterialAsync(`/materials/${materialLOD.index}`, materialLOD, babylonMesh, babylonDrawMode, (babylonMaterial) => {
if (indexLOD === 0) {
assign(babylonMaterial);
}
})
.then((babylonMaterial) => {
if (indexLOD !== 0) {
assign(babylonMaterial);

// TODO: should not rely on _data
const previousDataLOD = materialLODs[indexLOD - 1]._data!;
if (previousDataLOD[babylonDrawMode]) {
this._disposeMaterials([previousDataLOD[babylonDrawMode].babylonMaterial]);
delete previousDataLOD[babylonDrawMode];
}
const promise = this._loader._loadMaterialAsync(`/materials/${materialLOD.index}`, materialLOD, babylonMesh, babylonDrawMode, (babylonMaterial) => {
if (indexLOD === 0) {
assign(babylonMaterial);
}
}).then((babylonMaterial) => {
if (indexLOD !== 0) {
assign(babylonMaterial);

// TODO: should not rely on _data
const previousDataLOD = materialLODs[indexLOD - 1]._data!;
if (previousDataLOD[babylonDrawMode]) {
this._disposeMaterials([previousDataLOD[babylonDrawMode].babylonMaterial]);
delete previousDataLOD[babylonDrawMode];
}
}

return babylonMaterial;
});
return babylonMaterial;
});

this._materialPromiseLODs[indexLOD] = this._materialPromiseLODs[indexLOD] || [];

Expand Down Expand Up @@ -353,22 +310,15 @@ export class MSFT_lod implements IGLTFLoaderExtension {
return null;
}

private _isMesh(mesh: TransformNode | Mesh): mesh is Mesh {
return !!(mesh as Mesh).addLODLevel;
}

private _loadBufferLOD(bufferLODs: Array<IBufferInfo>, indexLOD: number): void {
const bufferLOD = bufferLODs[indexLOD];
if (bufferLOD) {
this._loader.log(`Loading buffer range [${bufferLOD.start}-${bufferLOD.end}]`);
this._loader.bin!.readAsync(bufferLOD.start, bufferLOD.end - bufferLOD.start + 1).then(
(data) => {
bufferLOD.loaded.resolve(data);
},
(error) => {
bufferLOD.loaded.reject(error);
}
);
this._loader.bin!.readAsync(bufferLOD.start, bufferLOD.end - bufferLOD.start + 1).then((data) => {
bufferLOD.loaded.resolve(data);
}, (error) => {
bufferLOD.loaded.reject(error);
});
}
}

Expand Down