Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify constructors

Browse source
This commit is contained in:
HifiExperiments 2024-04-19 16:05:59 -07:00
parent 8f27a4bf2b
commit 74002b4738
2 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
View file

@ -826,9 +826,9 @@ NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
Material(m), Material(m),
_textures(m._textures), _textures(m._textures),
_albedoTransform(m._albedoTransform), _albedoTransform(m._albedoTransform),
_isOriginal(m._isOriginal),
_lightmapTransform(m._lightmapTransform), _lightmapTransform(m._lightmapTransform),
_lightmapParams(m._lightmapParams), _lightmapParams(m._lightmapParams)
_isOriginal(m._isOriginal)
{} {}
const QString NetworkMaterial::NO_TEXTURE = QString(); const QString NetworkMaterial::NO_TEXTURE = QString();
@ -1135,37 +1135,9 @@ bool NetworkMaterial::checkResetOpacityMap() {
} }
NetworkMToonMaterial::NetworkMToonMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl) : NetworkMToonMaterial::NetworkMToonMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl) :
NetworkMaterial(*material._material) NetworkMaterial(material, textureBaseUrl) // handles _name, albedoMap, normalMap, and emissiveMap
{ {
_name = material.name.toStdString(); _model = VRM_MTOON;
if (!material.albedoTexture.filename.isEmpty()) {
auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
if (map) {
_albedoTransform = material.albedoTexture.transform;
map->setTextureTransform(_albedoTransform);
if (!material.opacityTexture.filename.isEmpty()) {
if (material.albedoTexture.filename == material.opacityTexture.filename) {
// Best case scenario, just indicating that the albedo map contains transparency
// TODO: Different albedo/opacity maps are not currently supported
map->setUseAlphaChannel(true);
}
}
}
setTextureMap(MapChannel::ALBEDO_MAP, map);
}
if (!material.normalTexture.filename.isEmpty()) {
auto type = (material.normalTexture.isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE);
auto map = fetchTextureMap(textureBaseUrl, material.normalTexture, type, MapChannel::NORMAL_MAP);
setTextureMap(MapChannel::NORMAL_MAP, map);
}
if (!material.emissiveTexture.filename.isEmpty()) {
auto map = fetchTextureMap(textureBaseUrl, material.emissiveTexture, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
setTextureMap(MapChannel::EMISSIVE_MAP, map);
}
if (!material.shadeTexture.filename.isEmpty()) { if (!material.shadeTexture.filename.isEmpty()) {
auto map = fetchTextureMap(textureBaseUrl, material.shadeTexture, image::TextureUsage::ALBEDO_TEXTURE, (MapChannel)MToonMapChannel::SHADE_MAP); auto map = fetchTextureMap(textureBaseUrl, material.shadeTexture, image::TextureUsage::ALBEDO_TEXTURE, (MapChannel)MToonMapChannel::SHADE_MAP);

3
libraries/procedural/src/procedural/ProceduralMaterialCache.h
View file

@ -26,7 +26,6 @@ public:
NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {} NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl); NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl);
NetworkMaterial(const NetworkMaterial& material); NetworkMaterial(const NetworkMaterial& material);
NetworkMaterial(const graphics::Material material) : graphics::Material(material) {}
void setAlbedoMap(const QUrl& url, bool useAlphaChannel); void setAlbedoMap(const QUrl& url, bool useAlphaChannel);
void setNormalMap(const QUrl& url, bool isBumpmap); void setNormalMap(const QUrl& url, bool isBumpmap);
@ -71,7 +70,7 @@ protected:
Transform _albedoTransform; Transform _albedoTransform;
bool _isOriginal{ true }; bool _isOriginal { true };
private: private:
// Helpers for the ctors // Helpers for the ctors