Now deals with pivot point when computing skin binding matrix, fixes …

…complex1 anim
iimachines · May 1, 2018 · eb00c1a · eb00c1a
1 parent a84246a
commit eb00c1a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 23 deletions.
diff --git a/maya/scripts/maya2glTF_UI.mel b/maya/scripts/maya2glTF_UI.mel
@@ -1,4 +1,4 @@
-proc string _quoted(string $text)
+proc string _quoted(string $text)
 {
 	string $quote = "\"";
 	return $quote+$text+$quote;
@@ -251,7 +251,7 @@ global proc maya2glTF_UI()
 	global string $gMainProgressBar;  
 
     // This is auto-updated by msbuild 
-	string $maya2glTF_version = "v0.9.3-beta 9d6c7ad";
+	string $maya2glTF_version = "v0.9.3-beta a84246a";
 
 	if (`window -exists maya2glTF_exporter_window`)
 		deleteUI maya2glTF_exporter_window;

diff --git a/src/ExportableMesh.cpp b/src/ExportableMesh.cpp
@@ -23,7 +23,7 @@ ExportableMesh::ExportableMesh(
 	auto& resources = scene.resources();
 	auto& args = resources.arguments();
 
-	const auto mayaMesh = std::make_unique<Mesh>(scene, shapeDagPath, node.pivotPoint);
+	const auto mayaMesh = std::make_unique<Mesh>(scene, shapeDagPath, node);
 
 	if (args.dumpMaya)
 	{

diff --git a/src/Mesh.cpp b/src/Mesh.cpp
@@ -7,7 +7,7 @@
 #include "DagHelper.h"
 #include "ExportableScene.h"
 
-Mesh::Mesh(ExportableScene& scene, MDagPath dagPath, const MPoint& pivotPoint)
+Mesh::Mesh(ExportableScene& scene, MDagPath dagPath, const ExportableNode& node)
 {
 	MStatus status = dagPath.extendToShape();
 	THROW_ON_FAILURE(status);
@@ -24,7 +24,7 @@ Mesh::Mesh(ExportableScene& scene, MDagPath dagPath, const MPoint& pivotPoint)
 	if (blendShapeDeformer.isNull())
 	{
 		// Single shape
-		m_mainShape = std::make_unique<MainShape>(scene, fnMesh, pivotPoint, ShapeIndex::main());
+		m_mainShape = std::make_unique<MainShape>(scene, fnMesh, node, ShapeIndex::main());
 		m_allShapes.emplace_back(m_mainShape.get());
 	}
 	else
@@ -57,7 +57,7 @@ Mesh::Mesh(ExportableScene& scene, MDagPath dagPath, const MPoint& pivotPoint)
 		weightPlugs.clearWeightsExceptFor(-1);
 
 		// Reconstruct base mesh
-		m_mainShape = std::make_unique<MainShape>(scene, fnMesh, pivotPoint, ShapeIndex::main());
+		m_mainShape = std::make_unique<MainShape>(scene, fnMesh, node, ShapeIndex::main());
 		m_allShapes.emplace_back(m_mainShape.get());
 
 		const auto numWeights = weightPlugs.numWeights();
@@ -68,7 +68,7 @@ Mesh::Mesh(ExportableScene& scene, MDagPath dagPath, const MPoint& pivotPoint)
 			auto weightPlug = weightPlugs.getWeightPlug(targetIndex);
 			auto initialWeight = static_cast<float>(weightPlugs.getOriginalWeight(targetIndex));
 			auto blendShape = std::make_unique<MeshShape>(m_mainShape->indices(), 
-				fnMesh, pivotPoint, 
+				fnMesh, node, 
 				args, ShapeIndex::target(targetIndex), 
 				weightPlug, initialWeight);
 			m_allShapes.emplace_back(blendShape.get());

diff --git a/src/Mesh.h b/src/Mesh.h
@@ -10,7 +10,7 @@ typedef std::vector<MeshShape*> MeshShapes;
 class Mesh
 {
 public:
-	Mesh(ExportableScene& scene, MDagPath dagPath, const MPoint& pivotPoint);
+	Mesh(ExportableScene& scene, MDagPath dagPath, const ExportableNode& node);
 	~Mesh();
 
 	void dump(IndentableStream& out, const std::string& name) const;

diff --git a/src/MeshShape.cpp b/src/MeshShape.cpp
@@ -11,7 +11,14 @@ MeshShape::MeshShape(ShapeIndex shapeIndex)
 {
 }
 
-MeshShape::MeshShape(const MeshIndices& mainIndices, const MFnMesh& fnMesh, const MPoint& pivotPoint, const Arguments& args, ShapeIndex shapeIndex, const MPlug& weightPlug, const float initialWeight)
+MeshShape::MeshShape(
+	const MeshIndices& mainIndices, 
+	const MFnMesh& fnMesh, 
+	const ExportableNode& node, 
+	const Arguments& args, 
+	ShapeIndex shapeIndex, 
+	const MPlug& weightPlug, 
+	const float initialWeight)
 	: shapeIndex(shapeIndex)
 	, weightPlug(weightPlug)
 	, initialWeight(initialWeight)
@@ -21,7 +28,7 @@ MeshShape::MeshShape(const MeshIndices& mainIndices, const MFnMesh& fnMesh, cons
 	THROW_ON_FAILURE(status);
 
 	m_semantics = std::make_unique<MeshSemantics>(fnMesh, nullptr, args.blendPrimitiveAttributes);
-	m_vertices = std::make_unique<MeshVertices>(mainIndices, nullptr, fnMesh, shapeIndex, pivotPoint, args);
+	m_vertices = std::make_unique<MeshVertices>(mainIndices, nullptr, fnMesh, shapeIndex, node, args);
 }
 
 MeshShape::~MeshShape() = default;
@@ -45,18 +52,18 @@ void MeshShape::dump(IndentableStream& out, const std::string& name) const
 	out << endl << undent << '}' << endl;
 }
 
-MainShape::MainShape(ExportableScene& scene, const MFnMesh& fnMesh, const MPoint& pivotPoint, ShapeIndex shapeIndex) : MeshShape(shapeIndex)
+MainShape::MainShape(ExportableScene& scene, const MFnMesh& fnMesh, const ExportableNode& node, ShapeIndex shapeIndex) : MeshShape(shapeIndex)
 {
 	MStatus status;
 	m_dagPath = fnMesh.dagPath(&status);
 	THROW_ON_FAILURE(status);
 
 	auto& args = scene.arguments();
 
-	m_skeleton = std::make_unique<MeshSkeleton>(scene, fnMesh);
+	m_skeleton = std::make_unique<MeshSkeleton>(scene, node, fnMesh);
 	m_semantics = std::make_unique<MeshSemantics>(fnMesh, m_skeleton.get(), args.meshPrimitiveAttributes);
 	m_indices = std::make_unique<MeshIndices>(m_semantics.get(), fnMesh);
-	m_vertices = std::make_unique<MeshVertices>(*m_indices, m_skeleton.get(), fnMesh, shapeIndex, pivotPoint, scene.arguments());
+	m_vertices = std::make_unique<MeshVertices>(*m_indices, m_skeleton.get(), fnMesh, shapeIndex, node, scene.arguments());
 }
 
 MainShape::~MainShape() = default;

diff --git a/src/MeshShape.h b/src/MeshShape.h
@@ -11,7 +11,7 @@ class ExportableScene;
 class MeshShape
 {
 public:
-	MeshShape(const MeshIndices& mainIndices, const MFnMesh& fnMesh, const MPoint& pivotPoint, const Arguments& args, ShapeIndex shapeIndex, const MPlug& weightPlug, float initialWeight);
+	MeshShape(const MeshIndices& mainIndices, const MFnMesh& fnMesh, const ExportableNode& node, const Arguments& args, ShapeIndex shapeIndex, const MPlug& weightPlug, float initialWeight);
 	virtual ~MeshShape();
 
 	virtual void dump(class IndentableStream& out, const std::string& name) const;
@@ -40,7 +40,7 @@ class MeshShape
 class MainShape : public MeshShape
 {
 public:
-	MainShape(ExportableScene& scene, const MFnMesh& fnMesh, const MPoint& pivotPoint, ShapeIndex shapeIndex);
+	MainShape(ExportableScene& scene, const MFnMesh& fnMesh, const ExportableNode& node, ShapeIndex shapeIndex);
 	virtual ~MainShape();
 
 	const MeshIndices& indices() const { return *m_indices; }

diff --git a/src/MeshSkeleton.cpp b/src/MeshSkeleton.cpp
@@ -22,7 +22,8 @@ struct VertexJointAssignmentSlice
 };
 
 MeshSkeleton::MeshSkeleton(
-	ExportableScene& scene,
+	ExportableScene& scene, 
+	const ExportableNode& node,
 	const MFnMesh& mesh)
 	: m_maxVertexJointAssignmentCount(0)
 {
@@ -49,7 +50,7 @@ MeshSkeleton::MeshSkeleton(
 		const auto shapeDagPath = mesh.dagPath(&status);
 		THROW_ON_FAILURE(status);
 
-		const auto meshMatrix = shapeDagPath.inclusiveMatrix(&status);
+		const auto meshMatrix = node.pivotTransform * shapeDagPath.inclusiveMatrix(&status);
 		THROW_ON_FAILURE(status);
 
 		for (size_t index = 0; index < jointCount; ++index)

diff --git a/src/MeshSkeleton.h b/src/MeshSkeleton.h
@@ -53,7 +53,7 @@ typedef std::vector<MeshJoint> MeshJoints;
 class MeshSkeleton
 {
 public:
-	MeshSkeleton(ExportableScene& scene, const MFnMesh& mesh);
+	MeshSkeleton(ExportableScene& scene, const ExportableNode& node, const MFnMesh& mesh);
 	virtual ~MeshSkeleton();
 
 	void dump(class IndentableStream& out, const std::string& name) const;

diff --git a/src/MeshVertices.cpp b/src/MeshVertices.cpp
@@ -187,8 +187,8 @@ MeshVertices::MeshVertices(
 	const MeshIndices& meshIndices,
 	const MeshSkeleton* meshSkeleton,
 	const MFnMesh& mesh,
-	ShapeIndex shapeIndex,
-	const MPoint& pivotPoint,
+	ShapeIndex shapeIndex, 
+	const ExportableNode& node,
 	const Arguments& args)
 	:shapeIndex(shapeIndex)
 {
@@ -203,7 +203,7 @@ MeshVertices::MeshVertices(
 	m_positions.reserve(numPoints);
 
 	const auto positionScale = args.scaleFactor;
-
+	const MPoint pivotPoint = node.pivotPoint;
 	for (int i = 0; i < numPoints; ++i)
 	{
 		const auto p = (mPoints[i] - pivotPoint) * positionScale;

diff --git a/src/MeshVertices.h b/src/MeshVertices.h
@@ -83,11 +83,12 @@ inline VertexComponents componentsAt(const VertexComponents& elements, const siz
 
 class Arguments;
 class MeshIndices;
+class ExportableNode;
 
 class MeshVertices
 {
 public:
-	MeshVertices(const MeshIndices& meshIndices, const MeshSkeleton* meshSkeleton, const MFnMesh& mesh, ShapeIndex shapeIndex, const MPoint& pivotPoint, const Arguments& args);
+	MeshVertices(const MeshIndices& meshIndices, const MeshSkeleton* meshSkeleton, const MFnMesh& mesh, ShapeIndex shapeIndex, const ExportableNode& node, const Arguments& args);
 	virtual ~MeshVertices();
 
 	const ShapeIndex shapeIndex;

diff --git a/src/version.cpp b/src/version.cpp
@@ -1,3 +1,3 @@
 #include "externals.h"
 
-const char* version = "v0.9.3-beta 9d6c7ad";
+const char* version = "v0.9.3-beta a84246a";