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

Merge pull request #7102 from zzmp/fix/model-tex-revert

Browse source 
Revert model texs when unset
This commit is contained in:
Andrew Meadows 2016-02-16 09:25:40 -08:00
commit 492c026f78
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,8 +101,9 @@ int RenderableModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned c
} }
QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) { QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) {
// If textures are unset, revert to original textures
if (textures == "") { if (textures == "") {
return QVariantMap(); return _originalTexturesMap;
} }
QString jsonTextures = "{\"" + textures.replace(":\"", "\":\"").replace(",\n", ",\"") + "}"; QString jsonTextures = "{\"" + textures.replace(":\"", "\":\"").replace(",\n", ",\"") + "}";
@ -128,6 +129,7 @@ void RenderableModelEntityItem::remapTextures() {
const QSharedPointer<NetworkGeometry>& networkGeometry = _model->getGeometry(); const QSharedPointer<NetworkGeometry>& networkGeometry = _model->getGeometry();
if (networkGeometry) { if (networkGeometry) {
_originalTextures = networkGeometry->getTextureNames(); _originalTextures = networkGeometry->getTextureNames();
_originalTexturesMap = parseTexturesToMap(_originalTextures.join(",\n"));
_originalTexturesRead = true; _originalTexturesRead = true;
} }
} }

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

@ -92,6 +92,7 @@ private:
EntityTreeRenderer* _myRenderer = nullptr; EntityTreeRenderer* _myRenderer = nullptr;
QString _currentTextures; QString _currentTextures;
QStringList _originalTextures; QStringList _originalTextures;
QVariantMap _originalTexturesMap;
bool _originalTexturesRead = false; bool _originalTexturesRead = false;
QVector<QVector<glm::vec3>> _points; QVector<QVector<glm::vec3>> _points;
bool _dimensionsInitialized = true; bool _dimensionsInitialized = true;