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

Corrects loading of texture and default visibility.

Browse source
This commit is contained in:
NissimHadar 2018-07-25 13:28:23 -07:00
parent 89e7e3b938
commit 630df7c233
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -27,10 +27,6 @@ ModelOverlay::ModelOverlay()
{ {
_model->setLoadingPriority(_loadPriority); _model->setLoadingPriority(_loadPriority);
_isLoaded = false; _isLoaded = false;
// Don't show overlay until textures have loaded
_visible = false;
render::ScenePointer scene = qApp->getMain3DScene(); render::ScenePointer scene = qApp->getMain3DScene();
_model->setVisibleInScene(false, scene); _model->setVisibleInScene(false, scene);
} }
@ -136,6 +132,11 @@ void ModelOverlay::update(float deltatime) {
} }
scene->enqueueTransaction(transaction); scene->enqueueTransaction(transaction);
if (_texturesDirty && !_modelTextures.isEmpty()) {
_texturesDirty = false;
_model->setTextures(_modelTextures);
}
if (!_texturesLoaded && _model->getGeometry() && _model->getGeometry()->areTexturesLoaded()) { if (!_texturesLoaded && _model->getGeometry() && _model->getGeometry()->areTexturesLoaded()) {
_texturesLoaded = true; _texturesLoaded = true;
if (!_modelTextures.isEmpty()) { if (!_modelTextures.isEmpty()) {
@ -242,6 +243,7 @@ void ModelOverlay::setProperties(const QVariantMap& properties) {
_texturesLoaded = false; _texturesLoaded = false;
QVariantMap textureMap = texturesValue.toMap(); QVariantMap textureMap = texturesValue.toMap();
_modelTextures = textureMap; _modelTextures = textureMap;
_texturesDirty = true;
} }
auto groupCulledValue = properties["isGroupCulled"]; auto groupCulledValue = properties["isGroupCulled"];

1
interface/src/ui/overlays/ModelOverlay.h
View file

@ -94,6 +94,7 @@ private:
ModelPointer _model; ModelPointer _model;
QVariantMap _modelTextures; QVariantMap _modelTextures;
bool _texturesLoaded { false }; bool _texturesLoaded { false };
bool _texturesDirty{ false };
render::ItemIDs _subRenderItemIDs; render::ItemIDs _subRenderItemIDs;