Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Process model on the loader callback, but wait while all files are loaded.

Browse Source
This commit is contained in:
kovacsv 2021-12-27 20:26:52 +01:00
parent 536a384d4d
commit 9237262ebd
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/core/taskrunner.js
View File

@ -73,3 +73,16 @@ OV.RunTasksBatch = function (count, batchCount, callbacks)
let taskRunner = new OV.TaskRunner ();
taskRunner.RunBatch (count, batchCount, callbacks);
};
OV.WaitWhile = function (expression)
{
function Waiter (expression)
{
if (expression ()) {
setTimeout (() => {
Waiter (expression);
}, 1);
}
}
Waiter (expression);
};

23
source/import/importerthree.js
View File

@ -68,11 +68,9 @@ OV.ImporterThreeBase = class extends OV.ImporterBase
LoadModel (fileContent, onFinish)
{
let loadedObject = null;
let isAllLoadersDone = false;
let loadingManager = new THREE.LoadingManager (() => {
if (loadedObject !== null) {
this.OnThreeObjectsLoaded (loadedObject, onFinish);
}
isAllLoadersDone = true;
});
const mainFileUrl = OV.CreateObjectUrl (fileContent);
@ -101,7 +99,14 @@ OV.ImporterThreeBase = class extends OV.ImporterBase
threeLoader.load (mainFileUrl,
(object) => {
loadedObject = object;
OV.WaitWhile (() => {
console.log ('wait');
if (isAllLoadersDone) {
this.OnThreeObjectsLoaded (object, onFinish);
return false;
}
return true;
});
},
() => {
},
@ -170,7 +175,13 @@ OV.ImporterThreeBase = class extends OV.ImporterBase
}
for (let i = 0; i < threeMesh.geometry.groups.length; i++) {
let group = threeMesh.geometry.groups[i];
for (let j = group.start / 3; j < group.start / 3 + group.count / 3; j++) {
let groupEnd = group.start;
if (group.count === Infinity) {
groupEnd = mesh.TriangleCount ();
} else {
groupEnd = group.start / 3 + group.count / 3;
}
for (let j = group.start / 3; j < groupEnd; j++) {
let triangle = mesh.GetTriangle (j);
triangle.SetMaterial (materialIndices[group.materialIndex]);
}