Merge pull request #8353 from birarda/fake-atp-url

fix for disabled physics with unloadable entity

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -916,6 +916,16 @@ bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
     return false;
 }
 
+bool RenderableModelEntityItem::shouldBePhysical() const {
+    // If we have a model, make sure it hasn't failed to download.
+    // If it has, we'll report back that we shouldn't be physical so that physics aren't held waiting for us to be ready.
+    if (_model && _model->didGeometryRequestFail()) {
+        return false;
+    } else {
+        return ModelEntityItem::shouldBePhysical();
+    }
+}
+
 glm::quat RenderableModelEntityItem::getAbsoluteJointRotationInObjectFrame(int index) const {
     if (_model) {
         glm::quat result;

libraries/entities-renderer/src/RenderableModelEntityItem.h

@@ -65,6 +65,8 @@ public:
 
     virtual bool contains(const glm::vec3& point) const override;
 
+    virtual bool shouldBePhysical() const override;
+
     // these are in the frame of this object (model space)
     virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
     virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;

libraries/model-networking/src/model-networking/ModelCache.cpp

@@ -403,6 +403,8 @@ void GeometryResourceWatcher::setResource(GeometryResource::Pointer resource) {
 void GeometryResourceWatcher::resourceFinished(bool success) {
     if (success) {
         _geometryRef = std::make_shared<Geometry>(*_resource);
+    } else {
+        emit resourceFailed();
     }
 }
 

libraries/model-networking/src/model-networking/ModelCache.h

@@ -111,6 +111,9 @@ public:
 
     QUrl getURL() const { return (bool)_resource ? _resource->getURL() : QUrl(); }
 
+signals:
+    void resourceFailed();
+
 private:
     void startWatching();
     void stopWatching();

libraries/render-utils/src/Model.cpp

@@ -102,13 +102,17 @@ Model::Model(RigPointer rig, QObject* parent) :
     _calculatedMeshTrianglesValid(false),
     _meshGroupsKnown(false),
     _isWireframe(false),
-    _rig(rig) {
+    _rig(rig)
+{
     // we may have been created in the network thread, but we live in the main thread
     if (_viewState) {
         moveToThread(_viewState->getMainThread());
     }
 
     setSnapModelToRegistrationPoint(true, glm::vec3(0.5f));
+
+    // handle download failure reported by the GeometryResourceWatcher
+    connect(&_renderWatcher, &GeometryResourceWatcher::resourceFailed, this, &Model::handleGeometryResourceFailure);
 }
 
 Model::~Model() {
@@ -818,6 +822,7 @@ void Model::setURL(const QUrl& url) {
     _needsReload = true;
     _needsUpdateTextures = true;
     _meshGroupsKnown = false;
+    _geometryRequestFailed = false;
     invalidCalculatedMeshBoxes();
     deleteGeometry();
 

libraries/render-utils/src/Model.h

@@ -147,8 +147,9 @@ public:
     Q_INVOKABLE void setCollisionModelURL(const QUrl& url);
     const QUrl& getCollisionURL() const { return _collisionUrl; }
 
-
     bool isActive() const { return isLoaded(); }
+    
+    bool didGeometryRequestFail() const { return _geometryRequestFailed; }
 
     bool convexHullContains(glm::vec3 point);
 
@@ -392,6 +393,11 @@ protected:
     RigPointer _rig;
 
     uint32_t _deleteGeometryCounter { 0 };
+
+    bool _geometryRequestFailed { false };
+
+private slots:
+    void handleGeometryResourceFailure() { _geometryRequestFailed = true; }
 };
 
 Q_DECLARE_METATYPE(ModelPointer)