MAYA-104984 MAYA-104641 - Material export via registry

lib/mayaUsd/fileio/shading/CMakeLists.txt

@@ -3,6 +3,7 @@
 # -----------------------------------------------------------------------------
 target_sources(${PROJECT_NAME} 
     PRIVATE
+        listShadingModesCommand.cpp
         shadingModeDisplayColor.cpp
         shadingModeExporter.cpp
         shadingModeExporterContext.cpp
@@ -13,6 +14,7 @@ target_sources(${PROJECT_NAME}
 )
 
 set(headers
+    listShadingModesCommand.h
     shadingModeExporter.h
     shadingModeExporterContext.h
     shadingModeImporter.h

plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.cpp → lib/mayaUsd/fileio/shading/listShadingModesCommand.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "usdMaya/listShadingModesCommand.h"
+#include "listShadingModesCommand.h"
 
 #include <mayaUsd/fileio/registryHelper.h>
 #include <mayaUsd/fileio/shading/shadingModeRegistry.h>

plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.h → lib/mayaUsd/fileio/shading/listShadingModesCommand.h

@@ -16,9 +16,9 @@
 #ifndef PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H
 #define PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H
 
-/// \file usdMaya/listShadingModesCommand.h
+/// \file listShadingModesCommand.h
 
-#include "usdMaya/api.h"
+#include <mayaUsd/base/api.h>
 
 #include <pxr/pxr.h>
 
@@ -29,18 +29,18 @@ PXR_NAMESPACE_OPEN_SCOPE
 class UsdMayaListShadingModesCommand : public MPxCommand
 {
 public:
-    PXRUSDMAYA_API
+    MAYAUSD_CORE_PUBLIC
     UsdMayaListShadingModesCommand();
-    PXRUSDMAYA_API
+    MAYAUSD_CORE_PUBLIC
     ~UsdMayaListShadingModesCommand() override;
 
-    PXRUSDMAYA_API
+    MAYAUSD_CORE_PUBLIC
     MStatus doIt(const MArgList& args) override;
     bool  isUndoable () const override { return false; };
 
-    PXRUSDMAYA_API
+    MAYAUSD_CORE_PUBLIC
     static MSyntax  createSyntax();
-    PXRUSDMAYA_API
+    MAYAUSD_CORE_PUBLIC
     static void* creator();
 };
 

lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h

@@ -18,6 +18,8 @@
 
 #include <pxr/pxr.h>
 
+#include <mayaUsd/base/api.h>
+
 #include <maya/MStatus.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -29,6 +31,7 @@ class HdVP2ShaderFragments
 {
 public:
     //! Register all HdVP2 fragments
+    MAYAUSD_CORE_PUBLIC
     static MStatus registerFragments();
 
     //! Deregister all HdVP2 fragments

lib/usd/CMakeLists.txt

@@ -2,6 +2,7 @@ if(BUILD_HDMAYA)
     add_subdirectory(hdMaya)
 endif()
 
+add_subdirectory(pxrUsdPreviewSurface)
 add_subdirectory(translators)
 add_subdirectory(schemas)
 

lib/usd/pxrUsdPreviewSurface/CMakeLists.txt

@@ -0,0 +1,145 @@
+#
+# Copyright 2020 Autodesk
+#
+# 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.
+#
+set(TARGET_NAME mayaUsdPreviewSurface)
+
+set(install_destination 
+    ${CMAKE_INSTALL_PREFIX}/lib/usd
+)
+
+set(resources_install_path
+    ${CMAKE_INSTALL_PREFIX}/lib/usd/${TARGET_NAME}/resources
+)
+
+set(library_install_path
+    ${CMAKE_INSTALL_PREFIX}/lib
+)
+
+add_library(${TARGET_NAME} SHARED)
+
+# -----------------------------------------------------------------------------
+# sources
+# -----------------------------------------------------------------------------
+target_sources(${TARGET_NAME} 
+    PRIVATE
+        usdPreviewSurface.cpp
+        usdPreviewSurfaceShadingNodeOverride.cpp
+        usdPreviewSurfaceWriter.cpp
+)
+
+# -----------------------------------------------------------------------------
+# compiler configuration
+# -----------------------------------------------------------------------------
+target_compile_definitions(${TARGET_NAME} 
+    PRIVATE
+        PXRUSDPREVIEWSURFACE_EXPORTS
+        $<$<BOOL:${IS_MACOSX}>:OSMac_>
+)
+
+mayaUsd_compile_config(${TARGET_NAME})
+
+mayaUsd_promoteHeaderList( 
+    HEADERS
+        usdPreviewSurface.h
+        usdPreviewSurfaceShadingNodeOverride.h
+    BASEDIR
+        ${TARGET_NAME}
+)
+
+# -----------------------------------------------------------------------------
+# include directories
+# -----------------------------------------------------------------------------
+target_include_directories(${TARGET_NAME}
+    PRIVATE
+        ${MAYA_INCLUDE_DIRS}
+        ${CMAKE_BINARY_DIR}
+)
+
+# -----------------------------------------------------------------------------
+# link libraries
+# -----------------------------------------------------------------------------
+target_link_libraries(${TARGET_NAME} 
+    PRIVATE
+        arch
+        gf
+        plug
+        sdf
+        tf
+        vt
+        usdShade
+        ${MAYA_LIBRARIES}
+        mayaUsd
+        mayaUsd_Schemas
+)
+
+# -----------------------------------------------------------------------------
+# run-time search paths
+# -----------------------------------------------------------------------------
+if(IS_MACOSX OR IS_LINUX)
+    mayaUsd_init_rpath(rpath "lib")
+    mayaUsd_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
+    if(DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
+        mayaUsd_add_rpath(rpath "../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib")
+    elseif(DEFINED PXR_USD_LOCATION)
+        mayaUsd_add_rpath(rpath "${PXR_USD_LOCATION}/lib")
+    endif()
+    if(IS_LINUX AND DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
+        mayaUsd_add_rpath(rpath "../${MAYAUSD_TO_USD_RELATIVE_PATH}/lib64")
+    endif()
+    if(IS_MACOSX AND DEFINED MAYAUSD_TO_USD_RELATIVE_PATH)
+        mayaUsd_add_rpath(rpath "../../../Maya.app/Contents/MacOS")
+    endif()
+    mayaUsd_install_rpath(rpath ${TARGET_NAME})
+endif()
+
+#------------------------------------------------------------------------------
+# install
+#------------------------------------------------------------------------------
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/plugInfo.json"
+               "${CMAKE_CURRENT_BINARY_DIR}/plugInfo.json"
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plugInfo.json
+    DESTINATION ${resources_install_path}
+)
+
+#install top level plugInfo.json that includes the configured plugInfo.json
+install(CODE
+    "file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/lib/usd/plugInfo.json\" \"{\n    \\\"Includes\\\": [ \\\"*/resources/\\\" ]\n}\")"
+)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/usd/plugInfo.json
+    DESTINATION ${install_destination}
+)
+
+install(
+    TARGETS ${TARGET_NAME}
+    LIBRARY
+    DESTINATION ${library_install_path}
+    ARCHIVE
+    DESTINATION ${library_install_path}
+    RUNTIME
+    DESTINATION ${library_install_path}
+)
+
+if(IS_WINDOWS)
+    install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> 
+        DESTINATION ${library_install_path} OPTIONAL
+    )
+endif()
+
+install(
+    FILES AEpxrUsdPreviewSurfaceTemplate.mel
+    DESTINATION plugin/adsk/scripts
+)

lib/usd/pxrUsdPreviewSurface/api.h

@@ -0,0 +1,39 @@
+//
+// Copyright 2018 Pixar
+//
+// 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.
+//
+#ifndef PXRUSDPREVIEWSURFACE_API_H
+#define PXRUSDPREVIEWSURFACE_API_H
+
+#include <pxr/base/arch/export.h>
+
+#if defined(PXR_STATIC)
+#   define PXRUSDPREVIEWSURFACE_API
+#   define PXRUSDPREVIEWSURFACE_API_TEMPLATE_CLASS(...)
+#   define PXRUSDPREVIEWSURFACE_API_TEMPLATE_STRUCT(...)
+#   define PXRUSDPREVIEWSURFACE_LOCAL
+#else
+#   if defined(PXRUSDPREVIEWSURFACE_EXPORTS)
+#       define PXRUSDPREVIEWSURFACE_API ARCH_EXPORT
+#       define PXRUSDPREVIEWSURFACE_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__)
+#       define PXRUSDPREVIEWSURFACE_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__)
+#   else
+#       define PXRUSDPREVIEWSURFACE_API ARCH_IMPORT
+#       define PXRUSDPREVIEWSURFACE_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__)
+#       define PXRUSDPREVIEWSURFACE_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__)
+#   endif
+#   define PXRUSDPREVIEWSURFACE_LOCAL ARCH_HIDDEN
+#endif
+
+#endif

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp → lib/usd/pxrUsdPreviewSurface/usdPreviewSurface.cpp

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include <pxrUsdPreviewSurface/usdPreviewSurface.h>
+#include "usdPreviewSurface.h"
 
 #include <pxr/pxr.h>
 

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h → lib/usd/pxrUsdPreviewSurface/usdPreviewSurface.h

@@ -16,10 +16,11 @@
 #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_H
 #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_H
 
-/// \file pxrUsdPreviewSurface/usdPreviewSurface.h
+/// \file usdPreviewSurface.h
+
+#include "api.h"
 
 #include <pxr/pxr.h>
-#include <pxrUsdPreviewSurface/api.h>
 
 #include <pxr/base/tf/staticTokens.h>
 

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp → lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp

@@ -13,12 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include <pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h>
+#include "usdPreviewSurfaceShadingNodeOverride.h"
 
 #include <pxr/pxr.h>
 
 #include <pxr/base/tf/staticTokens.h>
 
+#include <mayaUsd/render/vp2ShaderFragments/shaderFragments.h>
+
 #include <maya/MObject.h>
 #include <maya/MPxSurfaceShadingNodeOverride.h>
 #include <maya/MString.h>
@@ -37,6 +39,11 @@ TF_DEFINE_PUBLIC_TOKENS(
 MHWRender::MPxSurfaceShadingNodeOverride*
 PxrMayaUsdPreviewSurfaceShadingNodeOverride::creator(const MObject& obj)
 {
+    // Shader fragments can only be registered after VP2 initialization, thus the function cannot
+    // be called when loading plugin (which can happen before VP2 initialization in the case of
+    // command-line rendering). The fragments will be deregistered when plugin is unloaded.
+    HdVP2ShaderFragments::registerFragments();
+
     return new PxrMayaUsdPreviewSurfaceShadingNodeOverride(obj);
 }
 

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h → lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h

@@ -16,10 +16,10 @@
 #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_SHADING_NODE_OVERRIDE_H
 #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_SHADING_NODE_OVERRIDE_H
 
-/// \file pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h
+/// \file usdPreviewSurfaceShadingNodeOverride.h
+#include "api.h"
 
 #include <pxr/pxr.h>
-#include <pxrUsdPreviewSurface/api.h>
 
 #include <pxr/base/tf/staticTokens.h>
 
@@ -38,9 +38,9 @@ PXR_NAMESPACE_OPEN_SCOPE
     ((Float4ToFloatZFragmentName, "float4ToFloatZ")) \
     ((Float4ToFloatWFragmentName, "float4ToFloatW")) \
     ((LightingStructFragmentName, "lightingContributions")) \
-    ((LightingFragmentName, "usdPreviewSurfaceLighting")) \
-    ((CombinerFragmentName, "usdPreviewSurfaceCombiner")) \
-    ((SurfaceFragmentGraphName, "usdPreviewSurface"))
+    ((LightingFragmentName, "UsdPreviewSurfaceLighting")) \
+    ((CombinerFragmentName, "UsdPreviewSurfaceCombiner")) \
+    ((SurfaceFragmentGraphName, "UsdPreviewSurface"))
 
 TF_DECLARE_PUBLIC_TOKENS(
     PxrMayaUsdPreviewSurfaceShadingNodeTokens,

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp → lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp

@@ -13,16 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include <pxr/pxr.h>
-#include <pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h>
+#include "usdPreviewSurfaceWriter.h"
+#include "usdPreviewSurface.h"
 
-#include <pxrUsdPreviewSurface/usdPreviewSurface.h>
 #include <mayaUsd/fileio/primWriterRegistry.h>
 #include <mayaUsd/fileio/shaderWriter.h>
-#include <mayaUsd/utils/util.h>
-#include <mayaUsd/fileio/writeJobContext.h>
 #include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
+#include <pxr/pxr.h>
 #include <pxr/base/tf/diagnostic.h>
 #include <pxr/base/tf/staticTokens.h>
 #include <pxr/base/tf/token.h>

plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h → lib/usd/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h

@@ -16,13 +16,12 @@
 #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_WRITER_H
 #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_WRITER_H
 
-/// \file pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h
+/// \file usdPreviewSurfaceWriter.h
 
-#include <pxr/pxr.h>
 #include <mayaUsd/fileio/shaderWriter.h>
-
 #include <mayaUsd/fileio/writeJobContext.h>
 
+#include <pxr/pxr.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/usd/timeCode.h>

lib/usd/translators/CMakeLists.txt

@@ -28,6 +28,7 @@ target_sources(${TARGET_NAME}
         lightWriter.cpp
         locatorWriter.cpp
         materialReader.cpp
+        materialWriter.cpp
         mayaReferenceReader.cpp
         mayaReferenceUpdater.cpp
         meshReader.cpp