fixed vtk containerbox handler

src/Vtk/Math/vtkStructuredGrid.cpp

@@ -30,6 +30,8 @@
 #include "Math/StructuredGrid.h"
 #include "Vtk/Math/vtkStructuredGrid.h"
 
+#include "Vtk/Math/vtkDense.h"
+
 namespace uLib {
 namespace Vtk {
 
@@ -39,73 +41,64 @@ namespace Vtk {
 
 vtkStructuredGrid::vtkStructuredGrid(Content &content)
     : m_Content(&content), m_Actor(vtkActor::New()),
-      m_Widget(vtkBoxWidget::New()), m_Transform(vtkTransform::New()) {
-  vtkSmartPointer<vtkWidgetCallback> callback =
-      vtkSmartPointer<vtkWidgetCallback>::New();
-  callback->SetGrid(this);
-  m_Widget->AddObserver(vtkCommand::InteractionEvent, callback);
+      m_Transform(vtkTransform::New()) {
 
   this->InstallPipe();
 }
 
 vtkStructuredGrid::~vtkStructuredGrid() {
   m_Actor->Delete();
-  m_Widget->Delete();
   m_Transform->Delete();
 }
 
 void vtkStructuredGrid::SetTransform(vtkTransform *t) {
   vtkMatrix4x4 *vmat = t->GetMatrix();
-  Matrix4f mat;
-  for (int i = 0; i < 4; ++i)
-    for (int j = 0; j < 4; ++j)
-      mat(i, j) = vmat->GetElement(i, j);
+  Matrix4f mat = VtkToMatrix4f(vmat);
   m_Content->SetMatrix(mat);
 
   vtkSmartPointer<vtkMatrix4x4> vmat2 = vtkSmartPointer<vtkMatrix4x4>::New();
   mat = m_Content->GetWorldMatrix();
-  for (int i = 0; i < 4; ++i)
-    for (int j = 0; j < 4; ++j)
-      vmat2->SetElement(i, j, mat(i, j));
+  Matrix4fToVtk(mat, vmat2);
   m_Transform->SetMatrix(vmat2);
   m_Transform->Update();
   this->Update();
 }
 
-vtkBoxWidget *vtkStructuredGrid::GetWidget() { return m_Widget; }
+void vtkStructuredGrid::Update() {
+  if (!m_Content) return;
 
-void vtkStructuredGrid::Update() { m_Actor->GetMapper()->Update(); }
+  vtkProp3D* actor = vtkProp3D::SafeDownCast(this->GetProp());
+  if (!actor) return;
+
+  vtkMatrix4x4* vmat = actor->GetUserMatrix();
+  if (!vmat) return;
+  
+  Matrix4f transform = VtkToMatrix4f(vmat);
+  m_Content->SetMatrix(transform);
+
+  m_Content->Updated(); // Notify others (like raytracer)
+}
 
 void vtkStructuredGrid::InstallPipe() {
   vtkSmartPointer<vtkCubeSource> cube = vtkSmartPointer<vtkCubeSource>::New();
-  vtkSmartPointer<vtkTransformPolyDataFilter> filter =
-      vtkSmartPointer<vtkTransformPolyDataFilter>::New();
-
-  vtkSmartPointer<vtkMatrix4x4> vmat = vtkSmartPointer<vtkMatrix4x4>::New();
-  Matrix4f mat = m_Content->GetWorldMatrix();
-  for (int i = 0; i < 4; ++i)
-    for (int j = 0; j < 4; ++j)
-      vmat->SetElement(i, j, mat(i, j));
-  m_Transform->SetMatrix(vmat);
-  filter->SetTransform(m_Transform);
-  filter->SetInputConnection(cube->GetOutputPort());
-
+ 
   Vector3i dims = m_Content->GetDims();
   cube->SetBounds(0, dims(0), 0, dims(1), 0, dims(2));
   cube->Update();
-  filter->Update();
 
   vtkSmartPointer<vtkPolyDataMapper> mapper =
       vtkSmartPointer<vtkPolyDataMapper>::New();
-  mapper->SetInputConnection(filter->GetOutputPort());
+  mapper->SetInputConnection(cube->GetOutputPort());
 
   m_Actor->SetMapper(mapper);
   m_Actor->GetProperty()->SetRepresentationToSurface();
   m_Actor->GetProperty()->SetEdgeVisibility(true);
   m_Actor->GetProperty()->SetOpacity(0.4);
   m_Actor->GetProperty()->SetAmbient(0.7);
-  this->Update();
-  m_Widget->SetProp3D(m_Actor);
+
+  vtkNew<vtkMatrix4x4> vmat;
+  Matrix4fToVtk(m_Content->GetWorldMatrix(), vmat);
+  m_Actor->SetUserMatrix(vmat);
 
   this->SetProp(m_Actor);
 }