Merge pull request #232 from AnimalLogic/AL_1013

Improvements to USDGeomScope Functionality
Autodesk · Feb 4, 2020 · 31e6f34 · 31e6f34
2 parents 699a354 + 5b9f537
commit 31e6f34
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h
@@ -21,7 +21,7 @@
 #define stringify(a) #a
 
 #define AL_USDMAYA_VERSION_MAJOR 0
-#define AL_USDMAYA_VERSION_MINOR 36
+#define AL_USDMAYA_VERSION_MINOR 39
 #define AL_USDMAYA_VERSION_PATCH 0
 
 #define AL_USDMAYA_VERSION_STR xstr(AL_USDMAYA_VERSION_MAJOR) "." \

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp
@@ -75,8 +75,13 @@ NodeFactory::~NodeFactory()
 //----------------------------------------------------------------------------------------------------------------------
 MObject NodeFactory::createNode(const UsdPrim& from, const char* const nodeType, MObject parent, bool parentUnmerged)
 {
+  TF_DEBUG(ALUSDMAYA_TRANSLATORS).Msg(" NodeFactory::createNode: %s of type %s\n", from.GetPrimPath().GetText(), nodeType);
   std::unordered_map<std::string, translators::DgNodeTranslator*>::iterator it = m_builders.find(nodeType);
-  if(it == m_builders.end()) return MObject::kNullObj;
+  if(it == m_builders.end())
+  {
+    //If we can't find a specific translator, use the DagNodeTranslator
+    it = m_builders.find("dagNode");
+  }
   MObject obj = it->second->createNode(from, parent, nodeType, *m_params);
   setupNode(from, obj, parent, parentUnmerged);
   return obj;

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp
@@ -41,7 +41,7 @@ MObject DagNodeTranslator::m_initialShadingGroup = MObject::kNullObj;
 //----------------------------------------------------------------------------------------------------------------------
 MStatus DagNodeTranslator::registerType()
 {
-  const char* const errorString = "Unable to extract attribute for DagNodeTranslator";
+  const char* const errorString = "DagNodeTranslator::Unable to extract attribute for DagNodeTranslator";
   MNodeClass fn("transform");
   MStatus status;
 
@@ -67,11 +67,20 @@ void DagNodeTranslator::initialiseDefaultShadingGroup(MObject& target)
 //----------------------------------------------------------------------------------------------------------------------
 MObject DagNodeTranslator::createNode(const UsdPrim& from, MObject parent, const char* nodeType, const ImporterParams& params)
 {
+  std::string xformError = std::string("DagNodeTranslator::createNode error creating node of type ") + nodeType
+      + ". Create transform instead";
+  MStatus status;
   MFnDagNode fn;
-  MObject to = fn.create(nodeType);
 
-  MStatus status = copyAttributes(from, to, params);
-  AL_MAYA_CHECK_ERROR_RETURN_NULL_MOBJECT(status, "Dag node translator: unable t/o get attributes");
+  MObject to = fn.create(nodeType, parent, &status);
+  AL_MAYA_CHECK_ERROR2(status, xformError.c_str());
+  if (status!= MS::kSuccess) {
+    to = fn.create("transform", parent, &status);
+  }
+  AL_MAYA_CHECK_ERROR2(status, "DagNodeTranslator::createNode error creating node of type transform");
+
+  status = copyAttributes(from, to, params);
+  AL_MAYA_CHECK_ERROR_RETURN_NULL_MOBJECT(status, "DagNodeTranslator::createNode unable to copy attributes");
 
   return to;
 }
@@ -90,7 +99,7 @@ MStatus DagNodeTranslator::applyDefaultMaterialOnShape(MObject shape)
 {
   MStatus status;
   MFnSet fn(m_initialShadingGroup, &status);
-  AL_MAYA_CHECK_ERROR(status, "Unable to attach MfnSet to initialShadingGroup");
+  AL_MAYA_CHECK_ERROR(status, "DagNodeTranslator::Unable to attach MfnSet to initialShadingGroup");
   return fn.addMember(shape);
 }
 

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/BasicTransformationMatrix.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/BasicTransformationMatrix.h
@@ -84,9 +84,10 @@ class BasicTransformationMatrix
   AL_USDMAYA_PUBLIC
   static MPxTransformationMatrix* creator();
 
-private:
-
+protected:
   UsdPrim m_prim;
+
+private:
   UsdGeomScope m_scope;
   MObjectHandle m_transformNode;
 

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp
@@ -46,7 +46,6 @@ MPxTransformationMatrix* TransformationMatrix::creator()
 //----------------------------------------------------------------------------------------------------------------------
 TransformationMatrix::TransformationMatrix()
   : BasicTransformationMatrix(),
-    m_prim(),
     m_xform(),
     m_time(UsdTimeCode::Default()),
     m_scaleTweak(0, 0, 0),
@@ -75,8 +74,7 @@ TransformationMatrix::TransformationMatrix()
 
 //----------------------------------------------------------------------------------------------------------------------
 TransformationMatrix::TransformationMatrix(const UsdPrim& prim)
-  : BasicTransformationMatrix(),
-    m_prim(prim),
+  : BasicTransformationMatrix(prim),
     m_xform(prim),
     m_time(UsdTimeCode::Default()),
     m_scaleTweak(0, 0, 0),

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h
@@ -46,7 +46,6 @@ class TransformationMatrix
 
   friend class Transform;
 
-  UsdPrim m_prim;
   UsdGeomXformable m_xform;
   UsdTimeCode m_time;
   std::vector<UsdGeomXformOp> m_xformops;