Add AMD MaterialX material library

FireRender.Maya.Src/CMakeLists.txt

@@ -38,6 +38,8 @@ set(Commands
     "RenderCacheWarningDialog.h"
     "RenderProgressBars.cpp"
     "RenderProgressBars.h"
+    "FireRenderImportMaterialX.h"
+    "FireRenderImportMaterialX.cpp"
 )
 source_group("Commands" FILES ${Commands})
 
@@ -214,6 +216,8 @@ set(Materials
     "FireRenderVoronoi.h"
     "SubsurfaceMaterial.cpp"
     "SubsurfaceMaterial.h"
+    "FireRenderMaterialXMaterial.cpp"
+    "FireRenderMaterialXMaterial.h"
 )
 source_group("Materials" FILES ${Materials})
 

FireRender.Maya.Src/Context/HybridProContext.cpp

@@ -12,6 +12,7 @@ limitations under the License.
 ********************************************************************/
 #include "HybridProContext.h"
 #include "RadeonProRender_Baikal.h"
+#include "RadeonProRender_MaterialX.h"
 #include "ContextCreator.h"
 #include "../VulcanUtils.h"
 
@@ -20,6 +21,7 @@ limitations under the License.
 #include "../FireRenderDoublesided.h"
 #include "../FireRenderPBRMaterial.h"
 #include "../FireRenderShadowCatcherMaterial.h"
+#include "../FireRenderMaterialXMaterial.h"
 
 rpr_int HybridProContext::m_gHybridProPluginID = INCORRECT_PLUGIN_ID;
 
@@ -142,6 +144,10 @@ void HybridProContext::setupContextPostSceneCreation(const FireRenderGlobalsData
 #ifdef FORCE_ENABLE_VOLUMES
 	rprContextSetParameterByKey1u(frcontext, (rpr_context_info)RPR_CONTEXT_ENABLE_VOLUMES, RPR_TRUE);
 #endif
+
+	// set dependency for materialX standard surface (could be missing from *.mtlx files)
+	frstatus = rprMaterialXAddDependencyMtlx(frcontext, "scripts/standard_surface.mtlx");
+	checkStatus(frstatus);
 }
 
 bool HybridProContext::IsAOVSupported(int aov) const
@@ -191,6 +197,12 @@ bool HybridProContext::IsShaderNodeSupported(FireMaya::ShaderNode* shaderNode) c
 		return true;
 	}
 
+	FireMaya::MaterialXMaterial* pMaterialX = dynamic_cast<FireMaya::MaterialXMaterial*> (shaderNode);
+	if (pMaterialX != nullptr)
+	{
+		return true;
+	}
+
 	return false;
 }
 

FireRender.Maya.Src/Context/TahoeContext.cpp

@@ -11,6 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ********************************************************************/
 #include "TahoeContext.h"
+#include "RadeonProRender_MaterialX.h"
 
 #include "maya/MColorManagementUtilities.h"
 #include "maya/MFileObject.h"
@@ -338,6 +339,10 @@ void NorthStarContext::setupContextPostSceneCreation(const FireRenderGlobalsData
 	frstatus = rprContextSetParameterByKeyString(frcontext, RPR_CONTEXT_TEXTURE_CACHE_PATH, fireRenderGlobalsData.textureCachePath.asChar());
 	checkStatus(frstatus);
 
+	// set dependency for materialX standard surface (could be missing from *.mtlx files)
+	frstatus = rprMaterialXAddDependencyMtlx(frcontext, "scripts/standard_surface.mtlx");
+	checkStatus(frstatus);
+
 	// SC and RC
 	// we should disable built-in shadow catcher composite
 	frstatus = rprContextSetParameterByKey1u(frcontext, RPR_CONTEXT_SHADOW_CATCHER_BAKING, fireRenderGlobalsData.shadowCatcherEnabled ? 0 : 1);

FireRender.Maya.Src/FireMaya.h

@@ -97,6 +97,7 @@ namespace FireMaya
 			FireRenderRamp,
 			FireRenderDoubleSided,
 			FireRenderBevel,
+			FireRenderMaterialXMaterial,
 
 			// ^ always add new ids to end of list (max 128 entries here)
 			FireRenderNodeIdEndCurrent, // <- this value is allowed to change, it marks the end of current list

FireRender.Maya.Src/FireRender.vcxproj

@@ -195,6 +195,7 @@
     <ClCompile Include="FireRenderImageUtil.cpp" />
     <ClCompile Include="FireRenderImportCmd.cpp" />
     <ClCompile Include="FireRenderImportExportXML.cpp" />
+    <ClCompile Include="FireRenderImportMaterialX.cpp" />
     <ClCompile Include="FireRenderImportXML.cpp" />
     <ClCompile Include="FireRenderIpr.cpp" />
     <ClCompile Include="FireRenderLayeredTextureUtils.cpp" />
@@ -203,6 +204,7 @@
     <ClCompile Include="FireRenderMaterialSwatchRender.cpp" />
     <ClCompile Include="FireMaterialViewRenderer.cpp" />
     <ClCompile Include="FireRenderBlendMaterial.cpp" />
+    <ClCompile Include="FireRenderMaterialXMaterial.cpp" />
     <ClCompile Include="FireRenderMeshMASH.cpp" />
     <ClCompile Include="FireRenderNoise.cpp" />
     <ClCompile Include="FireRenderNormal.cpp" />
@@ -358,6 +360,7 @@
     <ClInclude Include="FireRenderImageUtil.h" />
     <ClInclude Include="FireRenderImportCmd.h" />
     <ClInclude Include="FireRenderImportExportXML.h" />
+    <ClInclude Include="FireRenderImportMaterialX.h" />
     <ClInclude Include="FireRenderIpr.h" />
     <ClInclude Include="FireRenderLayeredTextureUtils.h" />
     <ClInclude Include="FireRenderLocationCmd.h" />
@@ -367,6 +370,7 @@
     <ClInclude Include="FireMaterialViewRenderer.h" />
     <ClInclude Include="FireRenderBlendMaterial.h" />
     <ClInclude Include="FireRenderCmd.h" />
+    <ClInclude Include="FireRenderMaterialXMaterial.h" />
     <ClInclude Include="FireRenderMath.h" />
     <ClInclude Include="FireRenderMeshMASH.h" />
     <ClInclude Include="FireRenderNoise.h" />

FireRender.Maya.Src/FireRender.vcxproj.filters

@@ -704,6 +704,12 @@
     <ClCompile Include="FireRenderDoublesided.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="FireRenderMaterialXMaterial.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FireRenderImportMaterialX.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FireRenderMaterialSwatchRender.h">
@@ -1216,6 +1222,18 @@
     <ClInclude Include="FireRenderBevel.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="FireRenderMaterialXMaterial.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FireRenderImportMaterialX.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FireRenderMaterialXMaterial.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FireRenderImportMaterialX.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="VulcanUtils.h">
       <Filter>Utils</Filter>
     </ClInclude>

FireRender.Maya.Src/FireRenderImportMaterialX.cpp

@@ -0,0 +1,145 @@
+/**********************************************************************
+Copyright 2020 Advanced Micro Devices, Inc
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+********************************************************************/
+#include "FireRenderImportMaterialX.h"
+
+#include <maya/MArgDatabase.h>
+#include <maya/MItDag.h>
+#include <maya/MDagPath.h>
+#include <maya/MGlobal.h>
+#include <maya/MSelectionList.h>
+#include <maya/MObjectArray.h>
+#include <maya/MArgList.h>
+#include <maya/MStatus.h>
+#include <maya/MDagPathArray.h>
+#include <maya/MFileObject.h>
+#include <maya/MCommonSystemUtils.h>
+
+#include "Context/TahoeContext.h"
+#include "FireRenderUtils.h"
+#include "FileSystemUtils.h"
+
+
+FireRenderMaterialXImportCmd::FireRenderMaterialXImportCmd()
+{
+}
+
+FireRenderMaterialXImportCmd::~FireRenderMaterialXImportCmd()
+{
+}
+
+void* FireRenderMaterialXImportCmd::creator()
+{
+	return new FireRenderMaterialXImportCmd;
+}
+
+MSyntax FireRenderMaterialXImportCmd::newSyntax()
+{
+	MSyntax syntax;
+
+	CHECK_MSTATUS(syntax.addFlag(kMaterialFilePathFlag, kMaterialFilePathFlagLong, MSyntax::kString));
+	CHECK_MSTATUS(syntax.addFlag(kMaterialNameFlag, kMaterialNameFlagLong, MSyntax::kString));
+
+	return syntax;
+}
+
+std::tuple<MStatus, MString> GetFilePath(const MArgDatabase& argData)
+{
+	// back-off
+	if (!argData.isFlagSet(kMaterialFilePathFlag))
+	{
+		MGlobal::displayError("File path is missing, use -file flag");
+		return std::make_tuple(MS::kFailure, MString());
+	}
+
+	MString filePath;
+	argData.getFlagArgument(kMaterialFilePathFlag, 0, filePath);
+
+	return std::make_tuple(MS::kSuccess, filePath);
+}
+
+std::tuple<MStatus, MString> GetName(const MArgDatabase& argData)
+{
+	// back-off
+	if (!argData.isFlagSet(kMaterialNameFlag))
+	{
+		MGlobal::displayError("Material name is missing, use -name flag");
+		return std::make_tuple(MS::kFailure, MString());
+	}
+
+	MString materialName;
+	argData.getFlagArgument(kMaterialNameFlag, 0, materialName);
+
+	return std::make_tuple(MS::kSuccess, materialName);
+}
+
+MStatus FireRenderMaterialXImportCmd::doIt(const MArgList& args)
+{
+	MStatus result = MS::kSuccess;
+	MArgDatabase argData(syntax(), args);
+
+	// Get material name
+	MString materialName;
+	std::tie(result, materialName) = GetName(argData);
+	if (MS::kSuccess != result)
+		return result;
+
+	// create node
+	MString executeCommand = "shadingNode -name \"" + materialName + "\" -asShader RPRMaterialXMaterial";
+
+	MString shaderName = MGlobal::executeCommandStringResult(executeCommand);
+	MSelectionList sList;
+	sList.add(shaderName);
+	MObject shaderNode;
+	sList.getDependNode(0, shaderNode);
+	if (shaderNode.isNull())
+	{
+		MGlobal::displayError("Unable to create shader!");
+		return MS::kFailure;
+	}
+
+	// create shading groupand connect it with shader node
+	MString sgCommand = "sets -renderable true -noSurfaceShader true -empty -name " + shaderName + "SG";
+	MString sgName = MGlobal::executeCommandStringResult(sgCommand);
+	MString connectCommand = "connectAttr -f " + shaderName + ".outColor " + sgName + ".surfaceShader";
+	MGlobal::executeCommandStringResult(connectCommand);
+
+	// Get path to file describing material
+	MString filePath;
+	std::tie(result, filePath) = GetFilePath(argData);
+	if (MS::kSuccess != result)
+		return result;
+
+	// Get directory name
+	std::string directory = getDirectory(filePath.asChar());
+
+	// write data into created shader node
+	MFnDependencyNode nodeFn(shaderNode);
+	MStatus status;
+	MPlug filePlug = nodeFn.findPlug("filename", false, &status);
+	assert(status == MStatus::kSuccess);
+	if (MS::kSuccess != status)
+	{
+		return status;
+	}
+
+	status = filePlug.setString(filePath);
+	assert(status == MStatus::kSuccess);
+	if (MS::kSuccess != status)
+	{
+		return status;
+	}
+
+	// Success!
+	return MS::kSuccess;
+}
+

FireRender.Maya.Src/FireRenderImportMaterialX.h

@@ -0,0 +1,40 @@
+/**********************************************************************
+Copyright 2020 Advanced Micro Devices, Inc
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+********************************************************************/
+#pragma once
+
+#include <maya/MPxCommand.h>
+#include <maya/MSyntax.h>
+#include <maya/MArgDatabase.h>
+#include <maya/MObject.h>
+#include <maya/MStatus.h>
+#include <maya/MString.h>
+
+#define kMaterialFilePathFlag "-f"
+#define kMaterialFilePathFlagLong "-file"
+#define kMaterialNameFlag "-n"
+#define kMaterialNameFlagLong "-name"
+
+class FireRenderMaterialXImportCmd : public MPxCommand
+{
+public:
+
+	FireRenderMaterialXImportCmd();
+
+	virtual ~FireRenderMaterialXImportCmd();
+
+	static void* creator();
+
+	static MSyntax  newSyntax();
+
+	MStatus doIt(const MArgList& args);
+};