Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAYA-106528 Add mtoh support for standardSurface #749

Merged
merged 1 commit into from
Sep 9, 2020
Merged

MAYA-106528 Add mtoh support for standardSurface #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 123 additions & 7 deletions lib/usd/hdMaya/adapters/materialNetworkConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,37 @@ class HdMayaRemappingMaterialAttrConverter
node, _remappedName.GetText(), type, fallback, outPlug);
}

private:
protected:
const TfToken& _remappedName;
const SdfValueTypeName& _type;
};

class HdMayaScaledRemappingMaterialAttrConverter : public HdMayaRemappingMaterialAttrConverter {
public:
HdMayaScaledRemappingMaterialAttrConverter(
const TfToken& remappedName,
const TfToken& scaleName,
const SdfValueTypeName& type)
: HdMayaRemappingMaterialAttrConverter(remappedName, type)
, _scaleName(scaleName)
{
}

VtValue GetValue(
MFnDependencyNode& node,
const TfToken& paramName,
const SdfValueTypeName& type,
const VtValue* fallback = nullptr,
MPlug* outPlug = nullptr) override
{
return HdMayaMaterialNetworkConverter::ConvertMayaAttrToScaledValue(
node, _remappedName.GetText(), _scaleName.GetText(), type, fallback, outPlug);
}

private:
const TfToken& _scaleName;
};

class HdMayaComputedMaterialAttrConverter : public HdMayaMaterialAttrConverter {
public:
/// Classes which derive from this use some sort of calculation to get
Expand Down Expand Up @@ -337,6 +363,32 @@ class HdMayaCosinePowerMaterialAttrConverter
}
};

class HdMayaTransmissionMaterialAttrConverter
: public HdMayaComputedMaterialAttrConverter {
public:
SdfValueTypeName GetType() override { return SdfValueTypeNames->Float; }

VtValue GetValue(
MFnDependencyNode& node, const TfToken& paramName,
const SdfValueTypeName& type, const VtValue* fallback = nullptr,
MPlug* outPlug = nullptr) override {
VtValue transmission =
HdMayaMaterialNetworkConverter::ConvertMayaAttrToValue(
node, "transmission", type, nullptr);
if (!transmission.IsHolding<float>()) {
if (fallback) { return *fallback; }
TF_DEBUG(HDMAYA_ADAPTER_GET)
.Msg(
"HdMayaTransmissionMaterialAttrConverter::GetValue(): "
"No float plug found with name: transmission and no "
"fallback given");
return VtValue();
} else {
return VtValue(1.0f - transmission.UncheckedGet<float>());
}
}
};

class HdMayaFilenameMaterialAttrConverter
: public HdMayaComputedMaterialAttrConverter {
public:
Expand Down Expand Up @@ -392,17 +444,43 @@ NameToNodeConverterMap _nodeConverters;

/*static*/
void HdMayaMaterialNetworkConverter::initialize() {
auto colorConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->color, SdfValueTypeNames->Vector3f);
auto incandescenceConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->incandescence, SdfValueTypeNames->Vector3f);
auto colorConverter = std::make_shared<HdMayaScaledRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->color, HdMayaAdapterTokens->diffuse, SdfValueTypeNames->Vector3f);
auto incandescenceConverter = std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->incandescence, SdfValueTypeNames->Vector3f);
auto eccentricityConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->eccentricity, SdfValueTypeNames->Float);
auto uvConverter = std::make_shared<HdMayaUvAttrConverter>();

// Standard surface:
auto baseColorConverter = std::make_shared<HdMayaScaledRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->baseColor,
HdMayaAdapterTokens->base,
SdfValueTypeNames->Vector3f);
auto emissionColorConverter = std::make_shared<HdMayaScaledRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->emissionColor,
HdMayaAdapterTokens->emission,
SdfValueTypeNames->Vector3f);
auto specularColorConverter = std::make_shared<HdMayaScaledRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->specularColor,
HdMayaAdapterTokens->specular,
SdfValueTypeNames->Vector3f);
auto specularIORConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->specularIOR, SdfValueTypeNames->Float);
auto specularRoughnessConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->specularRoughness, SdfValueTypeNames->Float);
auto coatConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->coat, SdfValueTypeNames->Float);
auto coatRoughnessConverter =
std::make_shared<HdMayaRemappingMaterialAttrConverter>(
HdMayaAdapterTokens->coatRoughness, SdfValueTypeNames->Float);
auto transmissionToOpacity =
std::make_shared<HdMayaTransmissionMaterialAttrConverter>();

auto fixedZeroFloat =
std::make_shared<HdMayaFixedMaterialAttrConverter>(0.0f);
auto fixedOneFloat =
Expand Down Expand Up @@ -456,6 +534,20 @@ void HdMayaMaterialNetworkConverter::initialize() {
{HdMayaAdapterTokens->metallic, fixedZeroFloat},
{HdMayaAdapterTokens->useSpecularWorkflow, fixedOneInt},
}}},
{HdMayaAdapterTokens->standardSurface,
{UsdImagingTokens->UsdPreviewSurface,
{
{HdMayaAdapterTokens->diffuseColor, baseColorConverter},
{HdMayaAdapterTokens->emissiveColor, emissionColorConverter},
{HdMayaAdapterTokens->specularColor, specularColorConverter},
{HdMayaAdapterTokens->ior, specularIORConverter},
{HdMayaAdapterTokens->roughness, specularRoughnessConverter},
{HdMayaAdapterTokens->clearcoat, coatConverter},
{HdMayaAdapterTokens->clearcoatRoughness, coatRoughnessConverter},
{HdMayaAdapterTokens->opacity, transmissionToOpacity},
{HdMayaAdapterTokens->metallic, fixedZeroFloat},
{HdMayaAdapterTokens->useSpecularWorkflow, fixedOneInt},
}}},
{HdMayaAdapterTokens->file,
{UsdImagingTokens->UsdUVTexture,
{
Expand Down Expand Up @@ -648,6 +740,30 @@ VtValue HdMayaMaterialNetworkConverter::ConvertMayaAttrToValue(
return val;
}

VtValue HdMayaMaterialNetworkConverter::ConvertMayaAttrToScaledValue(
MFnDependencyNode& node, const MString& plugName, const MString& scaleName,
const SdfValueTypeName& type, const VtValue* fallback, MPlug* outPlug) {
VtValue val = ConvertMayaAttrToValue(node, plugName, type, fallback, outPlug);
MStatus status;
auto p = node.findPlug(scaleName, true, &status);
if (status) {
if (type.GetType() == SdfValueTypeNames->Vector3f.GetType()) {
val = val.UncheckedGet<GfVec3f>() * p.asFloat();
} else if (type == SdfValueTypeNames->Float) {
val = val.UncheckedGet<float>() * p.asFloat();
} else if (type.GetType() == SdfValueTypeNames->Float2.GetType()) {
val = val.UncheckedGet<GfVec2f>() * p.asFloat();
}
} else {
TF_DEBUG(HDMAYA_ADAPTER_GET)
.Msg(
"HdMayaMaterialNetworkConverter::ConvertMayaAttrToScaledValue(): "
"No scaling plug found with name: %s",
scaleName.asChar());
}
return val;
}

VtValue HdMayaMaterialNetworkConverter::ConvertPlugToValue(
const MPlug& plug, const SdfValueTypeName& type, const VtValue* fallback) {
if (type.GetType() == SdfValueTypeNames->Vector3f.GetType()) {
Expand Down
5 changes: 5 additions & 0 deletions lib/usd/hdMaya/adapters/materialNetworkConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ class HdMayaMaterialNetworkConverter {
const SdfValueTypeName& type, const VtValue* fallback = nullptr,
MPlug* outPlug = nullptr);

HDMAYA_API static VtValue ConvertMayaAttrToScaledValue(
MFnDependencyNode& node, const MString& plugName, const MString& scaleName,
const SdfValueTypeName& type, const VtValue* fallback = nullptr,
MPlug* outPlug = nullptr);

HDMAYA_API
static void initialize();

Expand Down
13 changes: 13 additions & 0 deletions lib/usd/hdMaya/adapters/tokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,31 @@ PXR_NAMESPACE_OPEN_SCOPE
(clearcoat) \
(clearcoatRoughness) \
(emissiveColor) \
(specular) \
(specularColor) \
(metallic) \
(useSpecularWorkflow) \
(occlusion) \
(ior) \
(normal) \
(opacity) \
(diffuse) \
(diffuseColor) \
(displacement) \
(base) \
(baseColor) \
(emission) \
(emissionColor) \
(metalness) \
(specularIOR) \
(specularRoughness) \
(coat) \
(coatRoughness) \
(transmission) \
(lambert) \
(blinn) \
(phong) \
(standardSurface) \
(file) \
(place2dTexture) \
(fileTextureName) \
Expand Down