fix matrix transform

Author: zippy84

Contact.cxx

@@ -186,13 +186,23 @@ vtkSmartPointer<vtkPolyData> Contact::GetLines (vtkPolyData *pdA, vtkLinearTrans
         newPdB = pdB;
     }
 
-    if (transA != nullptr || transB != nullptr) {
-        auto tmpMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+    auto matrixA = vtkSmartPointer<vtkMatrix4x4>::New();
 
-        vtkMatrix4x4::Invert(transA->GetMatrix(), tmpMatrix);
-        vtkMatrix4x4::Multiply4x4(tmpMatrix, transB->GetMatrix(), matrix);
+    if (transA != nullptr) {
+        matrixA = transA->GetMatrix();
     }
 
+    auto matrixB = vtkSmartPointer<vtkMatrix4x4>::New();
+
+    if (transB != nullptr) {
+        matrixB = transB->GetMatrix();
+    }
+
+    auto tmpMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+
+    vtkMatrix4x4::Invert(matrixA, tmpMatrix);
+    vtkMatrix4x4::Multiply4x4(tmpMatrix, matrixB, matrix);
+
     sourcesA->Reset();
     sourcesB->Reset();
     contA->Reset();

transform/test.py

@@ -23,30 +23,28 @@
 moveBoxTransform.Translate(20.076142063093318, -8.288617300972092, -53.29349952031101)
 moveBoxMatrix = moveBoxTransform.GetMatrix()
 
-identityMatrix = vtkMatrix4x4()
-
 bf = vtkPolyDataBooleanFilter()
 bf.SetInputData(0, mandibleReader.GetOutput())
 bf.SetInputData(1, boxReader.GetOutput())
 
-bf.SetMatrix(0, identityMatrix)
-bf.SetMatrix(1, moveBoxMatrix)
+# identityMatrix = vtkMatrix4x4()
+# bf.SetMatrix(0, identityMatrix)
 
 for i in range(10):
     moveBoxTransform.Translate(0, -10, 0)
     moveBoxMatrix = moveBoxTransform.GetMatrix()
 
     print(moveBoxMatrix.GetElement(1, 3))
 
-    transformFilter = vtkTransformPolyDataFilter()
-    transformFilter.SetInputData(boxReader.GetOutput())
-    transformFilter.SetTransform(moveBoxTransform)
-    transformFilter.Update()
+    # transformFilter = vtkTransformPolyDataFilter()
+    # transformFilter.SetInputData(boxReader.GetOutput())
+    # transformFilter.SetTransform(moveBoxTransform)
+    # transformFilter.Update()
 
-    _writer = vtkPolyDataWriter()
-    _writer.SetFileName(f'out/pdB_{i}.vtk')
-    _writer.SetInputConnection(transformFilter.GetOutputPort())
-    _writer.Update()
+    # _writer = vtkPolyDataWriter()
+    # _writer.SetFileName(f'out/pdB_{i}.vtk')
+    # _writer.SetInputConnection(transformFilter.GetOutputPort())
+    # _writer.Update()
 
     bf.SetMatrix(1, moveBoxMatrix)
 

vtkPolyDataBooleanFilter.cxx

@@ -155,16 +155,18 @@ int vtkPolyDataBooleanFilter::RequestData(vtkInformation *request, vtkInformatio
 
             start = clock::now();
 
+            modPdA = vtkSmartPointer<vtkPolyData>::New();
+            modPdB = vtkSmartPointer<vtkPolyData>::New();
+
             if (transforms[0] != nullptr) {
                 auto tfA = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
                 tfA->SetInputData(cleanA);
                 tfA->SetTransform(transforms[0]);
                 tfA->Update();
 
-                modPdA = vtkSmartPointer<vtkPolyData>::New();
                 modPdA->DeepCopy(tfA->GetOutput());
             } else {
-                modPdA = cleanA;
+                modPdA->DeepCopy(cleanA);
             }
 
             if (transforms[1] != nullptr) {
@@ -173,10 +175,9 @@ int vtkPolyDataBooleanFilter::RequestData(vtkInformation *request, vtkInformatio
                 tfB->SetTransform(transforms[1]);
                 tfB->Update();
 
-                modPdB = vtkSmartPointer<vtkPolyData>::New();
                 modPdB->DeepCopy(tfB->GetOutput());
             } else {
-                modPdB = cleanB;
+                modPdB->DeepCopy(cleanB);
             }
 
             modPdA->EditableOn();
@@ -202,7 +203,7 @@ int vtkPolyDataBooleanFilter::RequestData(vtkInformation *request, vtkInformatio
 #endif
 
             if (contLines->GetNumberOfCells() == 0) {
-                vtkErrorMacro("There is no contact 1.");
+                vtkErrorMacro("There is no contact.");
                 return 1;
             }
 
@@ -258,7 +259,7 @@ int vtkPolyDataBooleanFilter::RequestData(vtkInformation *request, vtkInformatio
             // löscht bestimmte strips
 
             if (CleanStrips()) {
-                vtkErrorMacro("There is no contact 2.");
+                vtkErrorMacro("There is no contact.");
                 return 1;
             }