Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 20:56:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Mind differently tex'ed instances

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-25 11:47:33 -07:00
parent af55547766
commit a262d9960c
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -250,12 +250,11 @@ void Geometry::setTextures(const QVariantMap& textureMap) {
[&textureMap](const NetworkMaterial::Textures::value_type& it) { return it.texture && textureMap.contains(it.name); })) {
if (material->isOriginal()) {
// On first mutation, copy the material to avoid altering the cache
material = std::make_shared<NetworkMaterial>(*material, textureMap);
} else {
// On later mutations, we can mutate in-place
material->setTextures(textureMap);
// Copy the material to avoid mutating the cached version
material = std::make_shared<NetworkMaterial>(*material);
}
material->setTextures(textureMap);
_areTexturesLoaded = false;
}
}
@ -359,15 +358,8 @@ model::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, Textu
return map;
}
NetworkMaterial::NetworkMaterial(const NetworkMaterial& material, const QVariantMap& textureMap) :
NetworkMaterial(material)
{
_isOriginal = false;
setTextures(textureMap);
}
NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl) :
model::Material(*material._material), _isOriginal(true)
model::Material(*material._material)
{
_textures = Textures(MapChannel::NUM_MAP_CHANNELS);
if (!material.albedoTexture.filename.isEmpty()) {
@ -430,6 +422,8 @@ NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textur
}
void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
_isOriginal = false;
const auto& albedoName = getTextureName(MapChannel::ALBEDO_MAP);
const auto& normalName = getTextureName(MapChannel::NORMAL_MAP);
const auto& roughnessName = getTextureName(MapChannel::ROUGHNESS_MAP);

3
libraries/model-networking/src/model-networking/ModelCache.h
View file

@ -139,7 +139,6 @@ public:
using MapChannel = model::Material::MapChannel;
NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl);
NetworkMaterial(const NetworkMaterial& material, const QVariantMap& textureMap);
protected:
friend class Geometry;
@ -171,7 +170,7 @@ private:
Transform _lightmapTransform;
vec2 _lightmapParams;
bool _isOriginal;
bool _isOriginal { true };
};
class NetworkShape {