refactor: rename Vtk classes by removing the vtk prefix to follow project naming conventions
This commit is contained in:
@@ -31,9 +31,9 @@
|
||||
#include <cstdlib>
|
||||
#include "vtkHandlerWidget.h"
|
||||
#include "vtkObjectsContext.h"
|
||||
#include "Math/Assembly.h"
|
||||
#include "Math/ContainerBox.h"
|
||||
#include "Math/Cylinder.h"
|
||||
#include "Vtk/Math/vtkAssembly.h"
|
||||
#include "Vtk/Math/vtkContainerBox.h"
|
||||
#include "Vtk/Math/vtkCylinder.h"
|
||||
#include "Math/Transform.h"
|
||||
#include "Vtk/Math/vtkAssembly.h"
|
||||
|
||||
@@ -53,7 +53,7 @@ struct ViewportData {
|
||||
|
||||
vtkSmartPointer<vtkNamedColors> m_Colors;
|
||||
|
||||
vtkSmartPointer<vtkHandlerWidget> m_HandlerWidget;
|
||||
vtkSmartPointer<HandlerWidget> m_HandlerWidget;
|
||||
vtkSmartPointer<vtkCellPicker> m_Picker;
|
||||
vtkSmartPointer<vtkCallbackCommand> m_KeyCallback;
|
||||
|
||||
@@ -194,7 +194,7 @@ void Viewport::SetupPipeline(vtkRenderWindowInteractor* iren)
|
||||
|
||||
// Setup Handler Widget
|
||||
if (!std::getenv("CTEST_PROJECT_NAME")) {
|
||||
pv->m_HandlerWidget = vtkSmartPointer<vtkHandlerWidget>::New();
|
||||
pv->m_HandlerWidget = vtkSmartPointer<HandlerWidget>::New();
|
||||
pv->m_HandlerWidget->SetInteractor(iren);
|
||||
pv->m_HandlerWidget->SetCurrentRenderer(pv->m_Renderer);
|
||||
if (pv->m_HandlerWidget->GetOverlayRenderer()) {
|
||||
@@ -308,28 +308,28 @@ void Viewport::SetupPipeline(vtkRenderWindowInteractor* iren)
|
||||
if (self->pv->m_HandlerWidget && self->pv->m_HandlerWidget->GetEnabled()) {
|
||||
if (key == "l") {
|
||||
if (event == vtkCommand::KeyPressEvent) {
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(vtkHandlerWidget::LOCAL);
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(HandlerWidget::LOCAL);
|
||||
std::cout << "Widget Frame: LOCAL" << std::endl;
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
else if (key == "g") {
|
||||
if (event == vtkCommand::KeyPressEvent) {
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(vtkHandlerWidget::GLOBAL);
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(HandlerWidget::GLOBAL);
|
||||
std::cout << "Widget Frame: GLOBAL" << std::endl;
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
else if (key == "c") {
|
||||
if (event == vtkCommand::KeyPressEvent) {
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(vtkHandlerWidget::CENTER);
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(HandlerWidget::CENTER);
|
||||
std::cout << "Widget Frame: CENTER" << std::endl;
|
||||
}
|
||||
handled = true;
|
||||
}
|
||||
else if (key == "k") {
|
||||
if (event == vtkCommand::KeyPressEvent) {
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(vtkHandlerWidget::CENTER_LOCAL);
|
||||
self->pv->m_HandlerWidget->SetReferenceFrame(HandlerWidget::CENTER_LOCAL);
|
||||
std::cout << "Widget Frame: CENTER_LOCAL" << std::endl;
|
||||
}
|
||||
handled = true;
|
||||
@@ -480,7 +480,7 @@ void Viewport::UnregisterPuppet(Puppet* p) {
|
||||
p->DisconnectRenderer(pv->m_Renderer);
|
||||
}
|
||||
|
||||
void Viewport::ObserveContext(vtkObjectsContext* ctx) {
|
||||
void Viewport::ObserveContext(ObjectsContext* ctx) {
|
||||
if (!ctx) return;
|
||||
|
||||
// Process existing puppets
|
||||
@@ -489,10 +489,10 @@ void Viewport::ObserveContext(vtkObjectsContext* ctx) {
|
||||
}
|
||||
|
||||
// Listen for future puppets
|
||||
uLib::Object::connect(ctx, &vtkObjectsContext::PuppetAdded, [this](Puppet* p){
|
||||
uLib::Object::connect(ctx, &ObjectsContext::PuppetAdded, [this](Puppet* p){
|
||||
this->RegisterPuppet(p, true);
|
||||
});
|
||||
uLib::Object::connect(ctx, &vtkObjectsContext::PuppetRemoved, [this](Puppet* p){
|
||||
uLib::Object::connect(ctx, &ObjectsContext::PuppetRemoved, [this](Puppet* p){
|
||||
this->UnregisterPuppet(p);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user