Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 12:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #442 from kasenvr/fix/fix-model-scale-create-app

Browse source 
Fix models not scaling correctly when loading due to timeout.
This commit is contained in:
kasenvr 2020-06-20 17:09:09 -04:00 committed by GitHub
commit 4cc31fc427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/create/edit.js
View file

@ -603,20 +603,28 @@ var toolBar = (function () {
Script.setTimeout(dimensionsCheckFunction, DIMENSIONS_CHECK_INTERVAL); Script.setTimeout(dimensionsCheckFunction, DIMENSIONS_CHECK_INTERVAL);
} }
// Make sure the model entity is loaded before we try to figure out // Make sure the model entity is loaded before we try to figure out
// its dimensions. // its dimensions. We need to give ample time to load the entity.
var MAX_LOADED_CHECKS = 10; var MAX_LOADED_CHECKS = 100; // 100 * 100ms = 10 seconds.
var LOADED_CHECK_INTERVAL = 100; var LOADED_CHECK_INTERVAL = 100;
var isLoadedCheckCount = 0; var isLoadedCheckCount = 0;
var entityIsLoadedCheck = function() { var entityIsLoadedCheck = function() {
isLoadedCheckCount++; isLoadedCheckCount++;
if (isLoadedCheckCount === MAX_LOADED_CHECKS || Entities.isLoaded(entityID)) { if (isLoadedCheckCount === MAX_LOADED_CHECKS || Entities.isLoaded(entityID)) {
var naturalDimensions = Entities.getEntityProperties(entityID, "naturalDimensions").naturalDimensions; var naturalDimensions = Entities.getEntityProperties(entityID, "naturalDimensions").naturalDimensions;
if (isLoadedCheckCount === MAX_LOADED_CHECKS) {
console.log("Model entity failed to load in time: " + (MAX_LOADED_CHECKS * LOADED_CHECK_INTERVAL) + " ... setting dimensions to: " + JSON.stringify(naturalDimensions))
}
Entities.editEntity(entityID, { Entities.editEntity(entityID, {
visible: true, visible: true,
dimensions: naturalDimensions dimensions: naturalDimensions
}) })
dimensionsCheckCallback(); dimensionsCheckCallback();
// We want to update the selection manager again since the script has moved on without us.
selectionManager.clearSelections(this);
entityListTool.sendUpdate();
selectionManager.setSelections([entityID], this);
return; return;
} }
Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL); Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);