diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp index 1eedf6e4d..910864fb2 100644 --- a/lib/mayaUsd/fileio/transformWriter.cpp +++ b/lib/mayaUsd/fileio/transformWriter.cpp @@ -126,7 +126,7 @@ void UsdMayaTransformWriter::_ComputeXformOps( const TfToken& lookupName = animChannel.opName.IsEmpty() ? UsdGeomXformOp::GetOpTypeToken(animChannel.usdOpType) : animChannel.opName; - auto findResult = previousRotates->find(lookupName); + auto findResult = previousRotates->find(lookupName); if (findResult == previousRotates->end()) { MEulerRotation::RotationOrder rotOrder = UsdMayaXformStack::RotateOrderFromOpType( diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp index 39b6c3ed0..3640ad292 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp @@ -592,7 +592,7 @@ void ProxyRenderDelegate::_Execute(const MHWRender::MFrameContext& frameContext) } #endif // defined(WANT_UFE_BUILD) -#else // !defined(MAYA_ENABLE_UPDATE_FOR_SELECTION) +#else // !defined(MAYA_ENABLE_UPDATE_FOR_SELECTION) HdReprSelector reprSelector = kPointsReprSelector; constexpr bool inSelectionPass = false; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h index c86e65f98..725f3979f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h @@ -155,8 +155,8 @@ private: _resourceRegistry; //!< Shared and unused by VP2 resource registry std::unique_ptr - _renderParam; //!< Render param used to provided access to VP2 during prim synchronization - SdfPath _id; //!< Render delegate IDs + _renderParam; //!< Render param used to provided access to VP2 during prim synchronization + SdfPath _id; //!< Render delegate IDs HdVP2ResourceRegistry _resourceRegistryVP2; //!< VP2 resource registry used for enqueue and execution of commits }; diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h index 7da672085..84f14bfb8 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h +++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h @@ -61,7 +61,7 @@ public: protected: ProxyRenderDelegate& - _drawScene; //!< Subscene override used as integration interface for HdVP2RenderDelegate + _drawScene; //!< Subscene override used as integration interface for HdVP2RenderDelegate MSubSceneContainer* _container { nullptr }; //!< Container to all render items, only valid between begin and end update of subscene diff --git a/lib/mayaUsd/ufe/UsdAttributes.cpp b/lib/mayaUsd/ufe/UsdAttributes.cpp index 5c85e0a58..2a109260c 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.cpp +++ b/lib/mayaUsd/ufe/UsdAttributes.cpp @@ -126,89 +126,88 @@ Ufe::Attribute::Type UsdAttributes::getUfeTypeForAttribute(const PXR_NS::UsdAttribute& usdAttr) const { // Map the USD type into UFE type. - static const std:: - unordered_map - sUsdTypeToUfe { - { SdfValueTypeNames->Bool.GetHash(), Ufe::Attribute::kBool }, // bool - // {SdfValueTypeNames->UChar.GetHash(), Ufe::Attribute::kUnknown}, - //// uint8_t - { SdfValueTypeNames->Int.GetHash(), Ufe::Attribute::kInt }, // int32_t - // {SdfValueTypeNames->UInt.GetHash(), Ufe::Attribute::kUnknown}, - //// uint32_t - // {SdfValueTypeNames->Int64.GetHash(), Ufe::Attribute::kInt}, - //// int64_t {SdfValueTypeNames->UInt64.GetHash(), Ufe::Attribute::kUnknown}, - //// uint64_t - // {SdfValueTypeNames->Half.GetHash(), Ufe::Attribute::kUnknown}, - //// GfHalf - { SdfValueTypeNames->Float.GetHash(), Ufe::Attribute::kFloat }, // float - { SdfValueTypeNames->Double.GetHash(), Ufe::Attribute::kDouble }, // double - { SdfValueTypeNames->String.GetHash(), Ufe::Attribute::kString }, // std::string - { SdfValueTypeNames->Token.GetHash(), Ufe::Attribute::kEnumString }, // TfToken - // {SdfValueTypeNames->Asset.GetHash(), Ufe::Attribute::kUnknown}, - //// SdfAssetPath {SdfValueTypeNames->Int2.GetHash(), Ufe::Attribute::kInt2}, - //// GfVec2i {SdfValueTypeNames->Half2.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec2h {SdfValueTypeNames->Float2.GetHash(), Ufe::Attribute::kFloat2}, - //// GfVec2f {SdfValueTypeNames->Double2.GetHash(), Ufe::Attribute::kDouble2}, - //// GfVec2d - { SdfValueTypeNames->Int3.GetHash(), Ufe::Attribute::kInt3 }, // GfVec3i - // {SdfValueTypeNames->Half3.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h - { SdfValueTypeNames->Float3.GetHash(), Ufe::Attribute::kFloat3 }, // GfVec3f - { SdfValueTypeNames->Double3.GetHash(), Ufe::Attribute::kDouble3 }, // GfVec3d - // {SdfValueTypeNames->Int4.GetHash(), Ufe::Attribute::kInt4}, - //// GfVec4i {SdfValueTypeNames->Half4.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec4h {SdfValueTypeNames->Float4.GetHash(), Ufe::Attribute::kFloat4}, - //// GfVec4f {SdfValueTypeNames->Double4.GetHash(), Ufe::Attribute::kDouble4}, - //// GfVec4d {SdfValueTypeNames->Point3h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h {SdfValueTypeNames->Point3f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3f {SdfValueTypeNames->Point3d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3d {SdfValueTypeNames->Vector3h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h {SdfValueTypeNames->Vector3f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3f {SdfValueTypeNames->Vector3d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3d {SdfValueTypeNames->Normal3h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h {SdfValueTypeNames->Normal3f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3f {SdfValueTypeNames->Normal3d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3d {SdfValueTypeNames->Color3h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h - { SdfValueTypeNames->Color3f.GetHash(), Ufe::Attribute::kColorFloat3 }, // GfVec3f - { SdfValueTypeNames->Color3d.GetHash(), Ufe::Attribute::kColorFloat3 }, // GfVec3d - // {SdfValueTypeNames->Color4h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec4h {SdfValueTypeNames->Color4f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec4f {SdfValueTypeNames->Color4d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec4d {SdfValueTypeNames->Quath.GetHash(), Ufe::Attribute::kUnknown}, - //// GfQuath {SdfValueTypeNames->Quatf.GetHash(), Ufe::Attribute::kUnknown}, - //// GfQuatf {SdfValueTypeNames->Quatd.GetHash(), Ufe::Attribute::kUnknown}, - //// GfQuatd {SdfValueTypeNames->Matrix2d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfMatrix2d {SdfValueTypeNames->Matrix3d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfMatrix3d {SdfValueTypeNames->Matrix4d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfMatrix4d {SdfValueTypeNames->Frame4d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfMatrix4d {SdfValueTypeNames->TexCoord2f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec2f {SdfValueTypeNames->TexCoord2d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec2d {SdfValueTypeNames->TexCoord2h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec2h {SdfValueTypeNames->TexCoord3f.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3f {SdfValueTypeNames->TexCoord3d.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3d {SdfValueTypeNames->TexCoord3h.GetHash(), Ufe::Attribute::kUnknown}, - //// GfVec3h - // To add? - // SdfValueTypeName BoolArray; - // SdfValueTypeName UCharArray, IntArray, UIntArray, Int64Array, UInt64Array; - // SdfValueTypeName HalfArray, FloatArray, DoubleArray; - // SdfValueTypeName StringArray, TokenArray, AssetArray; - // SdfValueTypeName Int2Array, Int3Array, Int4Array; - // SdfValueTypeName Half2Array, Half3Array, Half4Array; - // SdfValueTypeName Float2Array, Float3Array, Float4Array; - // SdfValueTypeName Double2Array, Double3Array, Double4Array; - // SdfValueTypeName Point3hArray, Point3fArray, Point3dArray; - // SdfValueTypeName Vector3hArray, Vector3fArray, Vector3dArray; - // SdfValueTypeName Normal3hArray, Normal3fArray, Normal3dArray; - // SdfValueTypeName Color3hArray, Color3fArray, Color3dArray; - // SdfValueTypeName Color4hArray, Color4fArray, Color4dArray; - // SdfValueTypeName QuathArray, QuatfArray, QuatdArray; - // SdfValueTypeName Matrix2dArray, Matrix3dArray, Matrix4dArray; - // SdfValueTypeName Frame4dArray; - // SdfValueTypeName TexCoord2hArray, TexCoord2fArray, TexCoord2dArray; - // SdfValueTypeName TexCoord3hArray, TexCoord3fArray, TexCoord3dArray; - }; + static const std::unordered_map + sUsdTypeToUfe { + { SdfValueTypeNames->Bool.GetHash(), Ufe::Attribute::kBool }, // bool + // {SdfValueTypeNames->UChar.GetHash(), Ufe::Attribute::kUnknown}, + //// uint8_t + { SdfValueTypeNames->Int.GetHash(), Ufe::Attribute::kInt }, // int32_t + // {SdfValueTypeNames->UInt.GetHash(), Ufe::Attribute::kUnknown}, + //// uint32_t + // {SdfValueTypeNames->Int64.GetHash(), Ufe::Attribute::kInt}, + //// int64_t {SdfValueTypeNames->UInt64.GetHash(), + ///Ufe::Attribute::kUnknown}, / uint64_t + // {SdfValueTypeNames->Half.GetHash(), Ufe::Attribute::kUnknown}, + //// GfHalf + { SdfValueTypeNames->Float.GetHash(), Ufe::Attribute::kFloat }, // float + { SdfValueTypeNames->Double.GetHash(), Ufe::Attribute::kDouble }, // double + { SdfValueTypeNames->String.GetHash(), Ufe::Attribute::kString }, // std::string + { SdfValueTypeNames->Token.GetHash(), Ufe::Attribute::kEnumString }, // TfToken + // {SdfValueTypeNames->Asset.GetHash(), Ufe::Attribute::kUnknown}, + //// SdfAssetPath {SdfValueTypeNames->Int2.GetHash(), Ufe::Attribute::kInt2}, + //// GfVec2i {SdfValueTypeNames->Half2.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec2h {SdfValueTypeNames->Float2.GetHash(), + ///Ufe::Attribute::kFloat2}, / GfVec2f {SdfValueTypeNames->Double2.GetHash(), + ///Ufe::Attribute::kDouble2}, / GfVec2d + { SdfValueTypeNames->Int3.GetHash(), Ufe::Attribute::kInt3 }, // GfVec3i + // {SdfValueTypeNames->Half3.GetHash(), Ufe::Attribute::kUnknown}, + //// GfVec3h + { SdfValueTypeNames->Float3.GetHash(), Ufe::Attribute::kFloat3 }, // GfVec3f + { SdfValueTypeNames->Double3.GetHash(), Ufe::Attribute::kDouble3 }, // GfVec3d + // {SdfValueTypeNames->Int4.GetHash(), Ufe::Attribute::kInt4}, + //// GfVec4i {SdfValueTypeNames->Half4.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec4h {SdfValueTypeNames->Float4.GetHash(), + ///Ufe::Attribute::kFloat4}, / GfVec4f {SdfValueTypeNames->Double4.GetHash(), + ///Ufe::Attribute::kDouble4}, / GfVec4d {SdfValueTypeNames->Point3h.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec3h {SdfValueTypeNames->Point3f.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec3f {SdfValueTypeNames->Point3d.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec3d + ///{SdfValueTypeNames->Vector3h.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3h + ///{SdfValueTypeNames->Vector3f.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3f + ///{SdfValueTypeNames->Vector3d.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3d + ///{SdfValueTypeNames->Normal3h.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3h + ///{SdfValueTypeNames->Normal3f.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3f + ///{SdfValueTypeNames->Normal3d.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3d + ///{SdfValueTypeNames->Color3h.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3h + { SdfValueTypeNames->Color3f.GetHash(), Ufe::Attribute::kColorFloat3 }, // GfVec3f + { SdfValueTypeNames->Color3d.GetHash(), Ufe::Attribute::kColorFloat3 }, // GfVec3d + // {SdfValueTypeNames->Color4h.GetHash(), Ufe::Attribute::kUnknown}, + //// GfVec4h {SdfValueTypeNames->Color4f.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec4f {SdfValueTypeNames->Color4d.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfVec4d {SdfValueTypeNames->Quath.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfQuath {SdfValueTypeNames->Quatf.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfQuatf {SdfValueTypeNames->Quatd.GetHash(), + ///Ufe::Attribute::kUnknown}, / GfQuatd + ///{SdfValueTypeNames->Matrix2d.GetHash(), Ufe::Attribute::kUnknown}, / GfMatrix2d + ///{SdfValueTypeNames->Matrix3d.GetHash(), Ufe::Attribute::kUnknown}, / GfMatrix3d + ///{SdfValueTypeNames->Matrix4d.GetHash(), Ufe::Attribute::kUnknown}, / GfMatrix4d + ///{SdfValueTypeNames->Frame4d.GetHash(), Ufe::Attribute::kUnknown}, / GfMatrix4d + ///{SdfValueTypeNames->TexCoord2f.GetHash(), Ufe::Attribute::kUnknown}, / GfVec2f + ///{SdfValueTypeNames->TexCoord2d.GetHash(), Ufe::Attribute::kUnknown}, / GfVec2d + ///{SdfValueTypeNames->TexCoord2h.GetHash(), Ufe::Attribute::kUnknown}, / GfVec2h + ///{SdfValueTypeNames->TexCoord3f.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3f + ///{SdfValueTypeNames->TexCoord3d.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3d + ///{SdfValueTypeNames->TexCoord3h.GetHash(), Ufe::Attribute::kUnknown}, / GfVec3h + // To add? + // SdfValueTypeName BoolArray; + // SdfValueTypeName UCharArray, IntArray, UIntArray, Int64Array, UInt64Array; + // SdfValueTypeName HalfArray, FloatArray, DoubleArray; + // SdfValueTypeName StringArray, TokenArray, AssetArray; + // SdfValueTypeName Int2Array, Int3Array, Int4Array; + // SdfValueTypeName Half2Array, Half3Array, Half4Array; + // SdfValueTypeName Float2Array, Float3Array, Float4Array; + // SdfValueTypeName Double2Array, Double3Array, Double4Array; + // SdfValueTypeName Point3hArray, Point3fArray, Point3dArray; + // SdfValueTypeName Vector3hArray, Vector3fArray, Vector3dArray; + // SdfValueTypeName Normal3hArray, Normal3fArray, Normal3dArray; + // SdfValueTypeName Color3hArray, Color3fArray, Color3dArray; + // SdfValueTypeName Color4hArray, Color4fArray, Color4dArray; + // SdfValueTypeName QuathArray, QuatfArray, QuatdArray; + // SdfValueTypeName Matrix2dArray, Matrix3dArray, Matrix4dArray; + // SdfValueTypeName Frame4dArray; + // SdfValueTypeName TexCoord2hArray, TexCoord2fArray, TexCoord2dArray; + // SdfValueTypeName TexCoord3hArray, TexCoord3fArray, TexCoord3dArray; + }; if (usdAttr.IsValid()) { const PXR_NS::SdfValueTypeName typeName = usdAttr.GetTypeName(); diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h index adb456a5b..e019973e2 100644 --- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h @@ -61,7 +61,7 @@ public: static UsdRotatePivotTranslateUndoableCommand::Ptr create(const Ufe::Path& path); #else static UsdRotatePivotTranslateUndoableCommand::Ptr - create(const UsdPrim& prim, const Ufe::Path& ufePath, const Ufe::SceneItem::Ptr& item); + create(const UsdPrim& prim, const Ufe::Path& ufePath, const Ufe::SceneItem::Ptr& item); #endif // Ufe::TranslateUndoableCommand overrides diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h index eb4a165e3..b6b903262 100644 --- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h @@ -54,7 +54,7 @@ public: //! Create a UsdRotateUndoableCommand from a UFE scene item. The command is //! not executed. static UsdRotateUndoableCommand::Ptr - create(const UsdSceneItem::Ptr& item, double x, double y, double z); + create(const UsdSceneItem::Ptr& item, double x, double y, double z); #endif // Ufe::RotateUndoableCommand overrides. rotate() sets the command's diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h index 590e71e00..371387c18 100644 --- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h @@ -51,7 +51,7 @@ public: //! Create a UsdScaleUndoableCommand from a UFE scene item. The command is //! not executed. static UsdScaleUndoableCommand::Ptr - create(const UsdSceneItem::Ptr& item, double x, double y, double z); + create(const UsdSceneItem::Ptr& item, double x, double y, double z); #endif // Ufe::ScaleUndoableCommand overrides diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h index 0db39f71a..c7f3d119d 100644 --- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h +++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h @@ -52,7 +52,7 @@ public: //! Create a UsdTranslateUndoableCommand from a UFE scene item. The //! command is not executed. static UsdTranslateUndoableCommand::Ptr - create(const UsdSceneItem::Ptr& item, double x, double y, double z); + create(const UsdSceneItem::Ptr& item, double x, double y, double z); #endif // Ufe::TranslateUndoableCommand overrides. translate() sets the command's diff --git a/lib/usd/translators/nurbsSurfaceWriter.cpp b/lib/usd/translators/nurbsSurfaceWriter.cpp index 52d411449..e5715e2d6 100644 --- a/lib/usd/translators/nurbsSurfaceWriter.cpp +++ b/lib/usd/translators/nurbsSurfaceWriter.cpp @@ -333,7 +333,7 @@ bool PxrUsdTranslators_NurbsSurfaceWriter::writeNurbsSurfaceAttrs( SdfValueTypeName uvValueType = (UsdMayaWriteUtil::WriteUVAsFloat2()) ? (SdfValueTypeNames->Float2Array) : (SdfValueTypeNames->TexCoord2fArray); - UsdGeomPrimvar uvSet = primSchema.CreatePrimvar( + UsdGeomPrimvar uvSet = primSchema.CreatePrimvar( UsdUtilsGetPrimaryUVSetName(), uvValueType, UsdGeomTokens->vertex); UsdMayaWriteUtil::SetAttribute( uvSet.GetAttr(), &stValues, UsdTimeCode::Default(), _GetSparseValueWriter()); diff --git a/lib/usd/utils/SIMD.h b/lib/usd/utils/SIMD.h index 622bc6c9c..ef6b3b7b9 100644 --- a/lib/usd/utils/SIMD.h +++ b/lib/usd/utils/SIMD.h @@ -523,8 +523,8 @@ inline i256 loadmask3i64(const void* const ptr, const size_t count) inline f256 cvtph8(const i128 a) { return _mm256_cvtph_ps(a); } inline i128 cvtph8(const f256 a) { return _mm256_cvtps_ph(a, _MM_FROUND_CUR_DIRECTION); } #else -inline f128 cvtph4(const i128 a) { return _mm_cvtph_ps(a); } -inline i128 cvtph4(const f128 a) { return _mm_cvtps_ph(a, _MM_FROUND_CUR_DIRECTION); } +inline f128 cvtph4(const i128 a) { return _mm_cvtph_ps(a); } +inline i128 cvtph4(const f128 a) { return _mm_cvtps_ph(a, _MM_FROUND_CUR_DIRECTION); } #endif #endif diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h index 595846b76..9db504c02 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h @@ -58,7 +58,7 @@ public: private: static AL::event::CallbackId - m_preSave; ///< callback prior to saving the scene (so we can store the session layer) + m_preSave; ///< callback prior to saving the scene (so we can store the session layer) static AL::event::CallbackId m_postSave; ///< callback after saving static AL::event::CallbackId m_preRead; ///< callback executed before opening a maya file static AL::event::CallbackId m_postRead; ///< callback executed after opening a maya file - @@ -66,7 +66,7 @@ private: static AL::event::CallbackId m_fileNew; ///< callback used to flush the USD caches after a file new static AL::event::CallbackId - m_preExport; ///< callback prior to exporting the scene (so we can store the session layer) + m_preExport; ///< callback prior to exporting the scene (so we can store the session layer) static AL::event::CallbackId m_postExport; ///< callback after exporting #if defined(WANT_UFE_BUILD) diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h index 37af80d1f..0cfd825c5 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h @@ -987,8 +987,8 @@ private: bool isBounded() const override; MPxNode::SchedulingType schedulingType() const override { return kSerial; } MStatus - preEvaluation(const MDGContext& context, const MEvaluationNode& evaluationNode) override; - void CacheEmptyBoundingBox(MBoundingBox&) override; + preEvaluation(const MDGContext& context, const MEvaluationNode& evaluationNode) override; + void CacheEmptyBoundingBox(MBoundingBox&) override; UsdTimeCode GetOutputTime(MDataBlock) const override; void copyInternalData(MPxNode* srcNode) override; diff --git a/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp b/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp index 6e80521a0..b812e44f5 100644 --- a/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp +++ b/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp @@ -878,37 +878,42 @@ void MayaEventHandler::initDagMessage(MayaCallbackInfo& cbi) case DagMessage::kParentAdded: cbi.mayaCallback = MDagMessage::addParentAddedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kParentAddedDagPath: /* cbi.mayaCallback = - MDagMessage::addParentAddedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kParentAddedDagPath: /* cbi.mayaCallback = + MDagMessage::addParentAddedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kParentRemoved: cbi.mayaCallback = MDagMessage::addParentRemovedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kParentRemovedDagPath: /* cbi.mayaCallback = - MDagMessage::addParentRemovedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kParentRemovedDagPath: /* cbi.mayaCallback = + MDagMessage::addParentRemovedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kChildAdded: cbi.mayaCallback = MDagMessage::addChildAddedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kChildAddedDagPath: /* cbi.mayaCallback = - MContainerMessage::addChildAddedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kChildAddedDagPath: /* cbi.mayaCallback = + MContainerMessage::addChildAddedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kChildRemoved: cbi.mayaCallback = MDagMessage::addChildRemovedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kChildRemovedDagPath: /* cbi.mayaCallback = - MDagMessage::addChildRemovedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kChildRemovedDagPath: /* cbi.mayaCallback = + MDagMessage::addChildRemovedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kChildReordered: cbi.mayaCallback = MDagMessage::addChildReorderedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kChildReorderedDagPath: /* cbi.mayaCallback = - MDagMessage::addChildReorderedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kChildReorderedDagPath: /* cbi.mayaCallback = + MDagMessage::addChildReorderedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kDag: /* cbi.mayaCallback = MDagMessage::addDagCallback(bindMessageParentChildFunction, &cbi); */ @@ -921,27 +926,31 @@ void MayaEventHandler::initDagMessage(MayaCallbackInfo& cbi) cbi.mayaCallback = MDagMessage::addAllDagChangesCallback(bindMessageParentChildFunction, &cbi); break; - case DagMessage::kAllDagChangesDagPath: /* cbi.mayaCallback = - MDagMessage::addAllDagChangesDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kAllDagChangesDagPath: /* cbi.mayaCallback = + MDagMessage::addAllDagChangesDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kInstanceAdded: cbi.mayaCallback = MDagMessage::addInstanceAddedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kInstanceAddedDagPath: /* cbi.mayaCallback = - MDagMessage::addInstanceAddedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kInstanceAddedDagPath: /* cbi.mayaCallback = + MDagMessage::addInstanceAddedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; case DagMessage::kInstanceRemoved: cbi.mayaCallback = MDagMessage::addInstanceRemovedCallback(bindParentChildFunction, &cbi); break; - case DagMessage::kInstanceRemovedDagPath: /* cbi.mayaCallback = - MDagMessage::addInstanceRemovedDagPathCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kInstanceRemovedDagPath: /* cbi.mayaCallback = + MDagMessage::addInstanceRemovedDagPathCallback(bindNodeStringBoolFunc, + &cbi); */ break; - case DagMessage::kWorldMatrixModified: /* cbi.mayaCallback = - MDagMessage::addWorldMatrixModifiedCallback(bindNodeStringBoolFunc, - &cbi); */ + case DagMessage:: + kWorldMatrixModified: /* cbi.mayaCallback = + MDagMessage::addWorldMatrixModifiedCallback(bindNodeStringBoolFunc, + &cbi); */ break; default: break; } @@ -1143,13 +1152,15 @@ void MayaEventHandler::initModelMessage(MayaCallbackInfo& cbi) case ModelMessage::kAfterDuplicate: cbi.mayaCallback = MModelMessage::addAfterDuplicateCallback(bindBasicFunction, &cbi); break; - case ModelMessage::kNodeAddedToModel: /* cbi.mayaCallback = - MModelMessage::addNodeAddedToModelCallback(bindTimeFunction, - &cbi); */ + case ModelMessage:: + kNodeAddedToModel: /* cbi.mayaCallback = + MModelMessage::addNodeAddedToModelCallback(bindTimeFunction, + &cbi); */ break; - case ModelMessage::kNodeRemovedFromModel: /* cbi.mayaCallback = - MModelMessage::addNodeRemovedFromModelCallback(bindTimeFunction, - &cbi); */ + case ModelMessage:: + kNodeRemovedFromModel: /* cbi.mayaCallback = + MModelMessage::addNodeRemovedFromModelCallback(bindTimeFunction, + &cbi); */ break; default: break; } diff --git a/plugin/al/mayautils/AL/maya/event/MayaEventManager.h b/plugin/al/mayautils/AL/maya/event/MayaEventManager.h index b08a30619..ba9545fe3 100644 --- a/plugin/al/mayautils/AL/maya/event/MayaEventManager.h +++ b/plugin/al/mayautils/AL/maya/event/MayaEventManager.h @@ -174,8 +174,8 @@ enum class MayaCallbackType ///< referenceNode, MFileObject& file, void* userData); \endcode kRenderTileFunction, ///< \brief describes the maya callback type \b ///< MMessage::MRenderTileFunction \code typedef void - ///< (*MRenderTileFunction) (int originX, int originY, int tileMaxX, int - ///< tileMaxY, void* userData); \endcode + ///< (*MRenderTileFunction) (int originX, int originY, int tileMaxX, int + ///< tileMaxY, void* userData); \endcode kMessageFunction, ///< \brief describes the maya callback type \b MMessage::MMessageFunction ///< \code typedef void (*MMessageFunction) (const MString& message, ///< MCommandMessage::MessageType messageType, void* userData); \endcode @@ -197,8 +197,8 @@ enum class MayaCallbackType kWorldMatrixModifiedFunction ///< \brief describes the maya callback type \b ///< MMessage::MWorldMatrixModifiedFunction \code typedef void ///< (*MWorldMatrixModifiedFunction) (MObject& transformNode, - ///< MDagMessage::MatrixModifiedFlags& modified, void* userData); - ///< \endcode + ///< MDagMessage::MatrixModifiedFlags& modified, void* userData); + ///< \endcode }; //---------------------------------------------------------------------------------------------------------------------- @@ -520,7 +520,7 @@ public: uint32_t refCount; ///< the ref count for this callback MayaMessageType mayaMessageType; ///< the maya MMessage class that defines the message MayaCallbackType - mayaCallbackType; ///< the type of C callback function needed to execute the callback + mayaCallbackType; ///< the type of C callback function needed to execute the callback uint32_t mmessageEnum; ///< the enum value from one of the MSceneMessage / MEventMessage etc ///< classes. MCallbackId mayaCallback; ///< the maya callback ID @@ -620,24 +620,24 @@ private: void registerConditionMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void - registerContainerMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); + registerContainerMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerDagMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerDGMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void - registerEventMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); + registerEventMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerLockMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void - registerModelMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); + registerModelMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerNodeMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerObjectSetMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void - registerPaintMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); + registerPaintMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerPolyMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerSceneMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void - registerTimerMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); + registerTimerMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); void registerUiMessages(AL::event::EventScheduler* scheduler, AL::event::EventType eventType); std::vector m_callbacks; EventToMaya m_eventMapping; diff --git a/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp index d627cbecc..764711d16 100644 --- a/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp +++ b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp @@ -607,7 +607,7 @@ FileTranslatorOptions::generateScript(OptionsParser& optionParser, MString& defa " string $optionBreakDown[];\n" " int $index;\n" " if ($action == \"post\")\n {\n" //< start of the 'post' section of the script (set - //control values from option string) + // control values from option string) " setParent $parent;\n" " columnLayout -adj true;\n" " AL_usdmaya_SyncFileIOGui \"" @@ -650,8 +650,8 @@ FileTranslatorOptions::generateScript(OptionsParser& optionParser, MString& defa + "($optionBreakDown[0], $optionBreakDown[1]);\n }\n" " }\n }\n" " }\n else\n if ($action == \"query\")\n {\n"; //< start of 'query' section - return - //all control values as key-value pairs - //in an option string. + // all control values as key-value + // pairs in an option string. itf = m_frames.begin(); for (; itf != endf; ++itf) { diff --git a/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h index 5ead51131..859aff56c 100644 --- a/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h +++ b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h @@ -355,7 +355,7 @@ protected: void generateFloatGlobals(const MString& niceName, const MString& optionName, float defaultValue); void - generateStringGlobals(const MString& niceName, const MString& optionName, MString defaultValue); + generateStringGlobals(const MString& niceName, const MString& optionName, MString defaultValue); void generateEnumGlobals( const MString& niceName, const MString& optionName, diff --git a/plugin/al/translators/Mesh.cpp b/plugin/al/translators/Mesh.cpp index f0834cd9f..effb5be04 100644 --- a/plugin/al/translators/Mesh.cpp +++ b/plugin/al/translators/Mesh.cpp @@ -70,7 +70,7 @@ MStatus Mesh::import(const UsdPrim& prim, MObject& parent, MObject& createdObj) TranslatorContextPtr ctx = context(); UsdTimeCode timeCode = (ctx && ctx->getForceDefaultRead()) ? UsdTimeCode::Default() - : UsdTimeCode::EarliestTime(); + : UsdTimeCode::EarliestTime(); bool parentUnmerged = false; TfToken val; diff --git a/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp index be86e07f7..b98f1d7f8 100644 --- a/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp +++ b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp @@ -83,7 +83,7 @@ bool UsdMayaUseUsdAssemblyNamespace() { return TfGetEnvSetting(PIXMAYA_USE_USD_A // == Statics == const MTypeId UsdMayaReferenceAssembly::typeId(0x0010A251); const MString - UsdMayaReferenceAssembly::typeName(UsdMayaReferenceAssemblyTokens->MayaTypeName.GetText()); + UsdMayaReferenceAssembly::typeName(UsdMayaReferenceAssemblyTokens->MayaTypeName.GetText()); const MString UsdMayaReferenceAssembly::_classification("drawdb/geometry/transform"); // Attributes