Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 21:18:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Require model fixup if tex is transparent

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-11 14:25:39 -08:00
parent 3b62e203f7
commit a89a76dc4b
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/render-utils/src/Model.cpp
View file

@ -74,6 +74,21 @@ Model::~Model() {
AbstractViewStateInterface* Model::_viewState = NULL; AbstractViewStateInterface* Model::_viewState = NULL;
bool Model::needsFixupInScene() {
if (readyToAddToScene()) {
// Once textures are loaded, fixup if they are now transparent
if (!_needsReload && _needsUpdateTransparentTextures && _geometry->isLoadedWithTextures()) {
_needsUpdateTransparentTextures = false;
if (_hasTransparentTextures != _geometry->hasTransparentTextures()) {
return true;
}
}
if (!_readyWhenAdded) {
return true;
}
}
return false;
}
void Model::setTranslation(const glm::vec3& translation) { void Model::setTranslation(const glm::vec3& translation) {
_translation = translation; _translation = translation;
@ -728,6 +743,8 @@ void Model::setURL(const QUrl& url) {
} }
_needsReload = true; _needsReload = true;
_needsUpdateTransparentTextures = true;
_hasTransparentTextures = false;
_meshGroupsKnown = false; _meshGroupsKnown = false;
invalidCalculatedMeshBoxes(); invalidCalculatedMeshBoxes();
deleteGeometry(); deleteGeometry();

12
libraries/render-utils/src/Model.h
View file

@ -70,7 +70,7 @@ public:
// new Scene/Engine rendering support // new Scene/Engine rendering support
void setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene); void setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene);
bool needsFixupInScene() { return !_readyWhenAdded && readyToAddToScene(); } bool needsFixupInScene();
bool readyToAddToScene(RenderArgs* renderArgs = nullptr) { bool readyToAddToScene(RenderArgs* renderArgs = nullptr) {
return !_needsReload && isRenderable() && isActive() && isLoaded(); return !_needsReload && isRenderable() && isActive() && isLoaded();
} }
@ -365,10 +365,12 @@ protected:
QSet<std::shared_ptr<MeshPartPayload>> _renderItemsSet; QSet<std::shared_ptr<MeshPartPayload>> _renderItemsSet;
QMap<render::ItemID, render::PayloadPointer> _renderItems; QMap<render::ItemID, render::PayloadPointer> _renderItems;
bool _readyWhenAdded = false; bool _readyWhenAdded { false };
bool _needsReload = true; bool _needsReload { true };
bool _needsUpdateClusterMatrices = true; bool _needsUpdateClusterMatrices { true };
bool _showCollisionHull = false; bool _needsUpdateTransparentTextures { true };
bool _hasTransparentTextures { false };
bool _showCollisionHull { false };
friend class ModelMeshPartPayload; friend class ModelMeshPartPayload;
RigPointer _rig; RigPointer _rig;