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

Cleaner way maybe

Browse source
This commit is contained in:
Sam Gateau 2019-09-13 18:45:16 -07:00
parent f76b6da96e
commit 3ec812d5c3
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
View file

@ -59,8 +59,7 @@ scriptable::ScriptableMaterial::ScriptableMaterial(const graphics::MaterialPoint
model = material->getModel().c_str(); model = material->getModel().c_str();
opacity = material->getOpacity(); opacity = material->getOpacity();
opacityMode = (opacity < 1.0f ? "opacityVarAlpha" : "opaque"); opacityMode = QString(graphics::MaterialKey::getAlphaMapModeName(material->getAlphaMapMode()).c_str());
roughness = material->getRoughness(); roughness = material->getRoughness();
metallic = material->getMetallic(); metallic = material->getMetallic();
scattering = material->getScattering(); scattering = material->getScattering();
@ -82,8 +81,6 @@ scriptable::ScriptableMaterial::ScriptableMaterial(const graphics::MaterialPoint
albedoMap = map->getTextureSource()->getUrl().toString(); albedoMap = map->getTextureSource()->getUrl().toString();
if (map->useAlphaChannel()) { if (map->useAlphaChannel()) {
opacityMap = albedoMap; opacityMap = albedoMap;
//opacityMode = (material->getKey().isOpacityMaskMap() ? "opacityMapAlphaMask" : "opacityMapAlphaBlend");
opacityMode = (material->getKey().isOpacityMaskMap() ? "opacityMapAlphaMask" : "opacityMapAlphaBlend");
} }
} }

6
libraries/graphics/src/graphics/Material.cpp
View file

@ -25,6 +25,12 @@ const float Material::DEFAULT_ROUGHNESS { 1.0f };
const float Material::DEFAULT_SCATTERING{ 0.0f }; const float Material::DEFAULT_SCATTERING{ 0.0f };
const float Material::DEFAULT_ALPHA_CUTOFF { 0.5f }; const float Material::DEFAULT_ALPHA_CUTOFF { 0.5f };
std::string MaterialKey::getAlphaMapModeName(AlphaMapMode mode) {
const std::string names[3] = { "ALPHA_MAP_OPAQUE", "ALPHA_MAP_MASK", "ALPHA_MAP_BLEND" };
return names[mode];
}
Material::Material() { Material::Material() {
for (int i = 0; i < NUM_TOTAL_FLAGS; i++) { for (int i = 0; i < NUM_TOTAL_FLAGS; i++) {
_propertyFallthroughs[i] = false; _propertyFallthroughs[i] = false;

2
libraries/graphics/src/graphics/Material.h
View file

@ -77,6 +77,7 @@ public:
ALPHA_MAP_MASK, ALPHA_MAP_MASK,
ALPHA_MAP_BLEND, ALPHA_MAP_BLEND,
}; };
static std::string getAlphaMapModeName(AlphaMapMode mode);
// The signature is the Flags // The signature is the Flags
Flags _flags; Flags _flags;
@ -211,7 +212,6 @@ public:
} }
AlphaMapMode getAlphaMapMode() const { return (_flags[OPACITY_MASK_MAP_BIT] ? ALPHA_MAP_MASK : (_flags[OPACITY_TRANSLUCENT_MAP_BIT] ? ALPHA_MAP_BLEND : ALPHA_MAP_OPAQUE)); } AlphaMapMode getAlphaMapMode() const { return (_flags[OPACITY_MASK_MAP_BIT] ? ALPHA_MAP_MASK : (_flags[OPACITY_TRANSLUCENT_MAP_BIT] ? ALPHA_MAP_BLEND : ALPHA_MAP_OPAQUE)); }
bool isTranslucent() const { return isTranslucentFactor() || isTranslucentMap(); } bool isTranslucent() const { return isTranslucentFactor() || isTranslucentMap(); }
bool isOpaque() const { return !isTranslucent(); } bool isOpaque() const { return !isTranslucent(); }
bool isSurfaceOpaque() const { return isOpaque() && !isOpacityMaskMap(); } bool isSurfaceOpaque() const { return isOpaque() && !isOpacityMaskMap(); }