[mtoh] Add camera adapter to support physical camera parameters and configurable motion blur and depth-of-field.

lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp

@@ -49,7 +49,8 @@ TF_DEFINE_PRIVATE_TOKENS(
     (mtohWireframeSelectionHighlight)
     (mtohColorQuantization)
     (mtohSelectionOutline)
-    (mtohEnableMotionSamples)
+    (mtohMotionSampleStart)
+    (mtohMotionSampleEnd)
 );
 // clang-format on
 
@@ -73,7 +74,8 @@ global proc mtohRenderOverride_AddAttribute(string $renderer, string $label, str
     }
 }
 global proc mtohRenderOverride_AddMTOHAttributes(int $fromAE) {
-    mtohRenderOverride_AddAttribute("mtoh", "Enable Motion Samples", "mtohEnableMotionSamples", $fromAE);
+    mtohRenderOverride_AddAttribute("mtoh", "Motion Sample Start", "mtohMotionSampleStart", $fromAE);
+    mtohRenderOverride_AddAttribute("mtoh", "Motion Samples End", "mtohMotionSampleEnd", $fromAE);
     mtohRenderOverride_AddAttribute("mtoh", "Texture Memory Per Texture (KB)", "mtohTextureMemoryPerTexture", $fromAE);
     mtohRenderOverride_AddAttribute("mtoh", "Show Wireframe on Selected Objects", "mtohWireframeSelectionHighlight", $fromAE);
     mtohRenderOverride_AddAttribute("mtoh", "Highlight Selected Objects", "mtohColorSelectionHighlight", $fromAE);
@@ -796,9 +798,16 @@ MObject MtohRenderGlobals::CreateAttributes(const GlobalParams& params)
     MtohSettingFilter filter(params);
     const bool        userDefaults = params.fallbackToUserDefaults;
 
-    if (filter(_tokens->mtohEnableMotionSamples)) {
-        _CreateBoolAttribute(
-            node, filter.mayaString(), defGlobals.delegateParams.enableMotionSamples, userDefaults);
+    if (filter(_tokens->mtohMotionSampleStart)) {
+        _CreateFloatAttribute(
+            node, filter.mayaString(), defGlobals.delegateParams.motionSampleStart, userDefaults);
+        if (filter.attributeFilter()) {
+            return mayaObject;
+        }
+    }
+    if (filter(_tokens->mtohMotionSampleEnd)) {
+        _CreateFloatAttribute(
+            node, filter.mayaString(), defGlobals.delegateParams.motionSampleEnd, userDefaults);
         if (filter.attributeFilter()) {
             return mayaObject;
         }
@@ -974,12 +983,16 @@ MtohRenderGlobals::GetInstance(const GlobalParams& params, bool storeUserSetting
             return globals;
         }
     }
-    if (filter(_tokens->mtohEnableMotionSamples)) {
+    if (filter(_tokens->mtohMotionSampleStart)) {
         _GetAttribute(
-            node,
-            filter.mayaString(),
-            globals.delegateParams.enableMotionSamples,
-            storeUserSetting);
+            node, filter.mayaString(), globals.delegateParams.motionSampleStart, storeUserSetting);
+        if (filter.attributeFilter()) {
+            return globals;
+        }
+    }
+    if (filter(_tokens->mtohMotionSampleEnd)) {
+        _GetAttribute(
+            node, filter.mayaString(), globals.delegateParams.motionSampleEnd, storeUserSetting);
         if (filter.attributeFilter()) {
             return globals;
         }

lib/mayaUsd/render/mayaToHydra/renderOverride.cpp

@@ -30,6 +30,7 @@
 #include <pxr/base/tf/instantiateSingleton.h>
 #include <pxr/base/vt/value.h>
 #include <pxr/imaging/glf/contextCaps.h>
+#include <pxr/imaging/hd/camera.h>
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
 #include <pxr/imaging/hd/rprim.h>
 #include <pxr/imaging/hdx/pickTask.h>
@@ -468,18 +469,6 @@ MStatus MtohRenderOverride::Render(const MHWRender::MDrawContext& drawContext)
     // }
     TF_DEBUG(HDMAYA_RENDEROVERRIDE_RENDER).Msg("MtohRenderOverride::Render()\n");
     auto renderFrame = [&](bool markTime = false) {
-        const auto originX = 0;
-        const auto originY = 0;
-        int        width = 0;
-        int        height = 0;
-        drawContext.getRenderTargetSize(width, height);
-
-        GfVec4d viewport(originX, originY, width, height);
-        _taskController->SetFreeCameraMatrices(
-            GetGfMatrixFromMaya(drawContext.getMatrix(MHWRender::MFrameContext::kViewMtx)),
-            GetGfMatrixFromMaya(drawContext.getMatrix(MHWRender::MFrameContext::kProjectionMtx)));
-        _taskController->SetRenderViewport(viewport);
-
         HdTaskSharedPtrVector tasks = _taskController->GetRenderingTasks();
 
         // For playblasting, a glReadPixels is going to occur sometime after we return.
@@ -583,7 +572,52 @@ MStatus MtohRenderOverride::Render(const MHWRender::MDrawContext& drawContext)
 
     params.cullStyle = HdCullStyleBackUnlessDoubleSided;
 
+    int width = 0;
+    int height = 0;
+    drawContext.getRenderTargetSize(width, height);
+
+    bool vpDirty;
+    if ((vpDirty = (width != _viewport[2] || height != _viewport[3]))) {
+        _viewport = GfVec4d(0, 0, width, height);
+        _taskController->SetRenderViewport(_viewport);
+    }
+
+    _taskController->SetFreeCameraMatrices(
+        GetGfMatrixFromMaya(drawContext.getMatrix(MHWRender::MFrameContext::kViewMtx)),
+        GetGfMatrixFromMaya(drawContext.getMatrix(MHWRender::MFrameContext::kProjectionMtx)));
+
+    if (delegateParams.motionSamplesEnabled()) {
+        MStatus  status;
+        MDagPath camPath = getFrameContext()->getCurrentCameraPath(&status);
+        if (status == MStatus::kSuccess) {
+            // FIXME: This is what a USD camera selected in the viewport returns.
+            static const MString defaultUfeProxyCameraShape(
+                "|defaultUfeProxyCameraTransformParent|defaultUfeProxyCameraTransform|"
+                "defaultUfeProxyCameraShape");
+            if (defaultUfeProxyCameraShape != camPath.fullPathName()) {
+                for (auto& delegate : _delegates) {
+                    if (HdMayaSceneDelegate* mayaScene
+                        = dynamic_cast<HdMayaSceneDelegate*>(delegate.get())) {
+                        params.camera = mayaScene->SetCameraViewport(camPath, _viewport);
+                        if (vpDirty)
+                            mayaScene->GetChangeTracker().MarkSprimDirty(
+                                params.camera, HdCamera::DirtyParams | HdCamera::DirtyProjMatrix);
+                        break;
+                    }
+                }
+            }
+        } else {
+            TF_WARN(
+                "MFrameContext::getCurrentCameraPath failure (%d): '%s'"
+                "\nUsing viewport matrices.",
+                int(status.statusCode()),
+                status.errorString().asChar());
+        }
+    }
+
     _taskController->SetRenderParams(params);
+    if (!params.camera.IsEmpty())
+        _taskController->SetCameraPath(params.camera);
 
     // Default color in usdview.
     _taskController->SetSelectionColor(_globals.colorSelectionHighlightColor);
@@ -787,6 +821,7 @@ void MtohRenderOverride::ClearHydraResources()
         _rendererPlugin = nullptr;
     }
 
+    _viewport = GfVec4d(0, 0, 0, 0);
     _initializationSucceeded = false;
     _initializationAttempted = false;
     SelectionChanged();

lib/mayaUsd/render/mayaToHydra/renderOverride.h

@@ -203,6 +203,8 @@ class MtohRenderOverride : public MHWRender::MRenderOverride
 
     SdfPath _ID;
 
+    GfVec4d _viewport;
+
     int _currentOperation = -1;
 
     const bool _isUsingHdSt = false;

lib/usd/hdMaya/adapters/CMakeLists.txt

@@ -8,6 +8,7 @@ target_sources(${TARGET_NAME}
         adapterRegistry.cpp
         aiSkydomeLightAdapter.cpp
         areaLightAdapter.cpp
+        cameraAdapter.cpp
         dagAdapter.cpp
         directionalLightAdapter.cpp
         lightAdapter.cpp
@@ -27,6 +28,7 @@ set(HEADERS
     adapter.h
     adapterDebugCodes.h
     adapterRegistry.h
+    cameraAdapter.h
     constantShadowMatrix.h
     dagAdapter.h
     lightAdapter.h

lib/usd/hdMaya/adapters/adapterRegistry.cpp

@@ -75,6 +75,20 @@ HdMayaAdapterRegistry::GetLightAdapterCreator(const MDagPath& dag)
     return ret;
 }
 
+void HdMayaAdapterRegistry::RegisterCameraAdapter(const TfToken& type, CameraAdapterCreator creator)
+{
+    GetInstance()._cameraAdapters.insert({ type, creator });
+}
+
+HdMayaAdapterRegistry::CameraAdapterCreator
+HdMayaAdapterRegistry::GetCameraAdapterCreator(const MDagPath& dag)
+{
+    MFnDependencyNode    depNode(dag.node());
+    CameraAdapterCreator ret = nullptr;
+    TfMapLookup(GetInstance()._cameraAdapters, TfToken(depNode.typeName().asChar()), &ret);
+    return ret;
+}
+
 void HdMayaAdapterRegistry::RegisterMaterialAdapter(
     const TfToken&         type,
     MaterialAdapterCreator creator)

lib/usd/hdMaya/adapters/adapterRegistry.h

@@ -16,6 +16,7 @@
 #ifndef HDMAYA_ADAPTER_REGISTRY_H
 #define HDMAYA_ADAPTER_REGISTRY_H
 
+#include <hdMaya/adapters/cameraAdapter.h>
 #include <hdMaya/adapters/lightAdapter.h>
 #include <hdMaya/adapters/materialAdapter.h>
 #include <hdMaya/adapters/shapeAdapter.h>
@@ -63,6 +64,14 @@ class HdMayaAdapterRegistry : public TfSingleton<HdMayaAdapterRegistry>
     HDMAYA_API
     static MaterialAdapterCreator GetMaterialAdapterCreator(const MObject& node);
 
+    using CameraAdapterCreator
+        = std::function<HdMayaCameraAdapterPtr(HdMayaDelegateCtx*, const MDagPath&)>;
+    HDMAYA_API
+    static void RegisterCameraAdapter(const TfToken& type, CameraAdapterCreator creator);
+
+    HDMAYA_API
+    static CameraAdapterCreator GetCameraAdapterCreator(const MDagPath& dag);
+
     // Find all HdMayaAdapter plugins, and load them all
     HDMAYA_API
     static void LoadAllPlugin();
@@ -71,6 +80,7 @@ class HdMayaAdapterRegistry : public TfSingleton<HdMayaAdapterRegistry>
     std::unordered_map<TfToken, ShapeAdapterCreator, TfToken::HashFunctor>    _dagAdapters;
     std::unordered_map<TfToken, LightAdapterCreator, TfToken::HashFunctor>    _lightAdapters;
     std::unordered_map<TfToken, MaterialAdapterCreator, TfToken::HashFunctor> _materialAdapters;
+    std::unordered_map<TfToken, CameraAdapterCreator, TfToken::HashFunctor>   _cameraAdapters;
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE