History

include urls with texture names, make sure to wait till default textures loaded before setting new textures

ZappoMan committed 12 years ago

Commit fdc5aa11 parent 7b40a7c5 files · +14 −6Browse files

Showing the changes to interface/src/renderer/GeometryCache.cpp (1 of 5 files). Show all

Unified · Split

interface/src/renderer/GeometryCache.cpp+6−3
@@ -742,15 +742,18 @@ QStringList NetworkGeometry::getTextureNames() const { · 741 unmodified lines
742 const NetworkMeshPart& part = mesh.parts[j];742 const NetworkMeshPart& part = mesh.parts[j];
743 743
744 if (!part.diffuseTextureName.isEmpty()) {744 if (!part.diffuseTextureName.isEmpty()) {
745 result << part.diffuseTextureName;745 QString textureURL = part.diffuseTexture->getURL().toString();
746 result << part.diffuseTextureName + ":" + textureURL;
746 }747 }
747 748
748 if (!part.normalTextureName.isEmpty()) {749 if (!part.normalTextureName.isEmpty()) {
749 result << part.normalTextureName;750 QString textureURL = part.normalTexture->getURL().toString();
751 result << part.normalTextureName + ":" + textureURL;
750 }752 }
751 753
752 if (!part.specularTextureName.isEmpty()) {754 if (!part.specularTextureName.isEmpty()) {
753 result << part.specularTextureName;755 QString textureURL = part.specularTexture->getURL().toString();
756 result << part.specularTextureName + ":" + textureURL;
754 }757 }
755 }758 }
756 }759 }