From aefa116207360c48e40b4b907d40d8d7e42cf7de Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 13 Dec 2016 17:55:22 +1300 Subject: [PATCH] Add extra logging for Clara.io asset resizing --- interface/src/Application.cpp | 15 +++++++++++---- .../src/RenderableModelEntityItem.cpp | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ec0665d178..e62a25a53a 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5746,23 +5746,29 @@ void Application::addAssetToWorldCheckModelSize() { while (item != _addAssetToWorldResizeList.end()) { auto entityID = item.key(); + EntityPropertyFlags propertyFlags; + propertyFlags += PROP_NAME; + propertyFlags += PROP_DIMENSIONS; auto entityScriptingInterface = DependencyManager::get(); - auto properties = entityScriptingInterface->getEntityProperties(entityID, EntityPropertyFlags("dimensions")); + auto properties = entityScriptingInterface->getEntityProperties(entityID, propertyFlags); + auto name = properties.getName(); auto dimensions = properties.getDimensions(); + const glm::vec3 DEFAULT_DIMENSIONS = glm::vec3(0.1f, 0.1f, 0.1f); if (dimensions != DEFAULT_DIMENSIONS) { // Entity has been auto-resized; adjust dimensions if it seems too big. const float RESCALE_THRESHOLD = 10.0f; // Resize entities larger than this as the FBX is likely in cm or mm. if (dimensions.x > RESCALE_THRESHOLD || dimensions.y > RESCALE_THRESHOLD || dimensions.z > RESCALE_THRESHOLD) { - dimensions *= 0.01f; + auto dimensionsResized = dimensions * 0.01f; EntityItemProperties properties; - properties.setDimensions(dimensions); + properties.setDimensions(dimensionsResized); properties.setVisible(true); properties.setCollisionless(false); properties.setLastEdited(usecTimestampNow()); entityScriptingInterface->editEntity(entityID, properties); - qInfo(interfaceapp) << "Asset auto-resized"; + qInfo(interfaceapp) << "Asset" << name << "auto-resized from" << dimensions << " to " + << dimensionsResized; } item = _addAssetToWorldResizeList.erase(item); // Finished with this entity. @@ -5781,6 +5787,7 @@ void Application::addAssetToWorldCheckModelSize() { properties.setLastEdited(usecTimestampNow()); entityScriptingInterface->editEntity(entityID, properties); + qInfo(interfaceapp) << "Asset" << name << "auto-resize timed out"; item = _addAssetToWorldResizeList.erase(item); // Finished with this entity. } else { diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index dc5b6cd8d3..e64c89b1ee 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -533,7 +533,8 @@ void RenderableModelEntityItem::update(const quint64& now) { properties.setLastEdited(usecTimestampNow()); // we must set the edit time since we're editing it auto extents = _model->getMeshExtents(); properties.setDimensions(extents.maximum - extents.minimum); - qCDebug(entitiesrenderer) << "Autoresizing:" << (!getName().isEmpty() ? getName() : getModelURL()); + qCDebug(entitiesrenderer) << "Autoresizing" << (!getName().isEmpty() ? getName() : getModelURL()) + << "from mesh extents"; QMetaObject::invokeMethod(DependencyManager::get().data(), "editEntity", Qt::QueuedConnection, Q_ARG(QUuid, getEntityItemID()),