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

trying to fix problems

Browse source
This commit is contained in:
Dante Ruiz 2018-08-24 17:13:57 -07:00
parent af19849a75
commit 92acaade2b
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/octree/SafeLanding.cpp
View file

@ -174,7 +174,7 @@ bool SafeLanding::entitiesRenderReady() {
for (auto entityMapIter = _trackedEntitiesRenderStatus.begin(); entityMapIter != _trackedEntitiesRenderStatus.end(); ++entityMapIter) { for (auto entityMapIter = _trackedEntitiesRenderStatus.begin(); entityMapIter != _trackedEntitiesRenderStatus.end(); ++entityMapIter) {
auto entity = entityMapIter->second; auto entity = entityMapIter->second;
bool visuallyReady = entity->isVisuallyReady(); bool visuallyReady = entity->isVisuallyReady();
qDebug() << "is entityType: " << EntityTypes::getEntityTypeName(entity->getType()) << " " << visuallyReady; qDebug() << "is entityType: " << EntityTypes::getEntityTypeName(entity->getType()) << " " << visuallyReady << " " << entityMapIter->first;
if (visuallyReady) { if (visuallyReady) {
entityMapIter = _trackedEntitiesRenderStatus.erase(entityMapIter); entityMapIter = _trackedEntitiesRenderStatus.erase(entityMapIter);
if (entityMapIter == _trackedEntitiesRenderStatus.end()) { if (entityMapIter == _trackedEntitiesRenderStatus.end()) {

5
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -1455,12 +1455,9 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
} }
emit requestRenderUpdate(); emit requestRenderUpdate();
} }
}
void ModelEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
withWriteLock([&] { withWriteLock([&] {
bool visuallyReady = (_prevModelLoaded && _texturesLoaded); bool visuallyReady = ((_prevModelLoaded && _texturesLoaded) || model->getURL().isEmpty());
entity->setVisuallyReady(visuallyReady); entity->setVisuallyReady(visuallyReady);
}); });
} }

2
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -164,8 +164,6 @@ protected:
virtual void doRender(RenderArgs* args) override; virtual void doRender(RenderArgs* args) override;
virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override; virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
render::hifi::Tag getTagMask() const override; render::hifi::Tag getTagMask() const override;
void setIsVisibleInSecondaryCamera(bool value) override; void setIsVisibleInSecondaryCamera(bool value) override;

4
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -293,8 +293,8 @@ void ZoneEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scen
uint32_t skyboxMode = entity->getSkyboxMode(); uint32_t skyboxMode = entity->getSkyboxMode();
if (skyboxMode == COMPONENT_MODE_ENABLED) { if (skyboxMode == COMPONENT_MODE_ENABLED) {
bool skyboxLoadedOrFailed = (_skyboxTexture && (_skyboxTexture->isLoaded() || _skyboxTexture->isFailed())); bool skyboxLoadedOrFailed = (_skyboxTexture && (_skyboxTexture->isLoaded() || _skyboxTexture->isFailed()));
qDebug() << "------> " << skyboxLoadedOrFailed; qDebug() << entity->getEntityItemID() << "------> " << _skyboxTexture->isFailed() << _skyboxTexture->isLoaded() << _skyboxTextureURL.isEmpty();
visuallyReady = (!_skyboxTextureURL.isEmpty() || skyboxLoadedOrFailed); visuallyReady = (_skyboxTextureURL.isEmpty() || skyboxLoadedOrFailed);
} }
entity->setVisuallyReady(visuallyReady); entity->setVisuallyReady(visuallyReady);