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

Persist material transform/params

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-24 19:18:38 -07:00
parent eeeb175bb8
commit c625d36bd8
2 changed files with 16 additions and 10 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

@ -355,8 +355,9 @@ model::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, Textu
} }
NetworkMaterial::NetworkMaterial(const NetworkMaterial& material, const QVariantMap& textureMap) : NetworkMaterial::NetworkMaterial(const NetworkMaterial& material, const QVariantMap& textureMap) :
_textures(material._textures), _isOriginal(false) NetworkMaterial(material)
{ {
_isOriginal = false;
setTextures(textureMap); setTextures(textureMap);
} }
@ -366,7 +367,8 @@ NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textur
_textures = Textures(MapChannel::NUM_MAP_CHANNELS); _textures = Textures(MapChannel::NUM_MAP_CHANNELS);
if (!material.albedoTexture.filename.isEmpty()) { if (!material.albedoTexture.filename.isEmpty()) {
auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, DEFAULT_TEXTURE, MapChannel::ALBEDO_MAP); auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, DEFAULT_TEXTURE, MapChannel::ALBEDO_MAP);
map->setTextureTransform(material.albedoTexture.transform); _albedoTransform = material.albedoTexture.transform;
map->setTextureTransform(_albedoTransform);
if (!material.opacityTexture.filename.isEmpty()) { if (!material.opacityTexture.filename.isEmpty()) {
if (material.albedoTexture.filename == material.opacityTexture.filename) { if (material.albedoTexture.filename == material.opacityTexture.filename) {
@ -414,8 +416,10 @@ NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textur
if (!material.lightmapTexture.filename.isEmpty()) { if (!material.lightmapTexture.filename.isEmpty()) {
auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP); auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
map->setTextureTransform(material.lightmapTexture.transform); _lightmapTransform = material.lightmapTexture.transform;
map->setLightmapOffsetScale(material.lightmapParams.x, material.lightmapParams.y); _lightmapParams = material.lightmapParams;
map->setTextureTransform(_lightmapTransform);
map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
setTextureMap(MapChannel::LIGHTMAP_MAP, map); setTextureMap(MapChannel::LIGHTMAP_MAP, map);
} }
} }
@ -431,7 +435,7 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
if (!albedoName.isEmpty() && textureMap.contains(albedoName)) { if (!albedoName.isEmpty() && textureMap.contains(albedoName)) {
auto map = fetchTextureMap(textureMap[albedoName].toUrl(), DEFAULT_TEXTURE, MapChannel::ALBEDO_MAP); auto map = fetchTextureMap(textureMap[albedoName].toUrl(), DEFAULT_TEXTURE, MapChannel::ALBEDO_MAP);
map->setTextureTransform(getTextureMap(MapChannel::ALBEDO_MAP)->getTextureTransform()); map->setTextureTransform(_albedoTransform);
// when reassigning the albedo texture we also check for the alpha channel used as opacity // when reassigning the albedo texture we also check for the alpha channel used as opacity
map->setUseAlphaChannel(true); map->setUseAlphaChannel(true);
setTextureMap(MapChannel::ALBEDO_MAP, map); setTextureMap(MapChannel::ALBEDO_MAP, map);
@ -466,10 +470,8 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
if (!lightmapName.isEmpty() && textureMap.contains(lightmapName)) { if (!lightmapName.isEmpty() && textureMap.contains(lightmapName)) {
auto map = fetchTextureMap(textureMap[lightmapName].toUrl(), LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP); auto map = fetchTextureMap(textureMap[lightmapName].toUrl(), LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
auto oldMap = getTextureMap(MapChannel::LIGHTMAP_MAP); map->setTextureTransform(_lightmapTransform);
map->setTextureTransform(oldMap->getTextureTransform()); map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
glm::vec2 offsetScale = oldMap->getLightmapOffsetScale();
map->setLightmapOffsetScale(offsetScale.x, offsetScale.y);
setTextureMap(MapChannel::LIGHTMAP_MAP, map); setTextureMap(MapChannel::LIGHTMAP_MAP, map);
} }
} }

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

@ -167,6 +167,10 @@ private:
TextureType type, MapChannel channel); TextureType type, MapChannel channel);
model::TextureMapPointer fetchTextureMap(const QUrl& url, TextureType type, MapChannel channel); model::TextureMapPointer fetchTextureMap(const QUrl& url, TextureType type, MapChannel channel);
Transform _albedoTransform;
Transform _lightmapTransform;
vec2 _lightmapParams;
bool _isOriginal; bool _isOriginal;
}; };