Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vtkext: Move vtkF3DRendererWithColoring into vtkF3DRenderer #1664

Merged
merged 4 commits into from
Oct 10, 2024
Merged

vtkext: Move vtkF3DRendererWithColoring into vtkF3DRenderer #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
955e8c8
vtkext: Move vtkF3DRendererWithColoring into vtkF3DRenderer
mwestphal Oct 10, 2024
fa875dc
vtkext: Merge ConfigureColoringActorsProperties and ConfigureActorsPr…
mwestphal Oct 10, 2024
6e8a229
options: Use optional for edges and orthographic
mwestphal Oct 10, 2024
8eb5a8c
vtkext: Remove unused member
mwestphal Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions library/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
"type": "int"
},
"orthographic": {
"type": "bool",
"default_value": "false"
"type": "bool"
}
}
},
"render": {
"show_edges": {
"type": "bool",
"default_value": "false"
"type": "bool"
},
"line_width": {
"type": "double"
Expand Down
23 changes: 11 additions & 12 deletions library/src/interactor_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "vtkF3DConfigure.h"
#include "vtkF3DInteractorEventRecorder.h"
#include "vtkF3DInteractorStyle.h"
#include "vtkF3DRendererWithColoring.h"
#include "vtkF3DRenderer.h"

#include <vtkCallbackCommand.h>
#include <vtkCellPicker.h>
Expand Down Expand Up @@ -163,7 +163,6 @@ class interactor_impl::internals
// No user defined behavior, use standard behavior
vtkRenderWindow* renWin = self->Window.GetRenderWindow();
vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());
vtkF3DRendererWithColoring* renWithColor = vtkF3DRendererWithColoring::SafeDownCast(ren);
bool checkColoring = false;
bool render = false;

Expand All @@ -177,27 +176,27 @@ class interactor_impl::internals
render = true;
break;
case 'C':
if (renWithColor)
if (ren)
{
renWithColor->CycleScalars(vtkF3DRendererWithColoring::CycleType::FIELD);
ren->CycleScalars(vtkF3DRenderer::CycleType::FIELD);
self->Window.PrintColoringDescription(log::VerboseLevel::DEBUG);
checkColoring = true;
render = true;
}
break;
case 'S':
if (renWithColor)
if (ren)
{
renWithColor->CycleScalars(vtkF3DRendererWithColoring::CycleType::ARRAY_INDEX);
ren->CycleScalars(vtkF3DRenderer::CycleType::ARRAY_INDEX);
self->Window.PrintColoringDescription(log::VerboseLevel::DEBUG);
checkColoring = true;
render = true;
}
break;
case 'Y':
if (renWithColor)
if (ren)
{
renWithColor->CycleScalars(vtkF3DRendererWithColoring::CycleType::COMPONENT);
ren->CycleScalars(vtkF3DRenderer::CycleType::COMPONENT);
self->Window.PrintColoringDescription(log::VerboseLevel::DEBUG);
checkColoring = true;
render = true;
Expand Down Expand Up @@ -368,10 +367,10 @@ class interactor_impl::internals
if (checkColoring)
{
// Resynchronise renderer coloring status with options
self->Options.model.scivis.enable = renWithColor->GetColoringEnabled();
self->Options.model.scivis.cells = renWithColor->GetColoringUseCell();
self->Options.model.scivis.array_name = renWithColor->GetColoringArrayName();
self->Options.model.scivis.component = renWithColor->GetColoringComponent();
self->Options.model.scivis.enable = ren->GetColoringEnabled();
self->Options.model.scivis.cells = ren->GetColoringUseCell();
self->Options.model.scivis.array_name = ren->GetColoringArrayName();
self->Options.model.scivis.component = ren->GetColoringComponent();
}
if (render)
{
Expand Down
12 changes: 6 additions & 6 deletions library/src/window_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "vtkF3DGenericImporter.h"
#include "vtkF3DNoRenderWindow.h"
#include "vtkF3DRendererWithColoring.h"
#include "vtkF3DRenderer.h"

#include <vtkCamera.h>
#include <vtkImageData.h>
Expand Down Expand Up @@ -141,7 +141,7 @@ class window_impl::internals

std::unique_ptr<camera_impl> Camera;
vtkSmartPointer<vtkRenderWindow> RenWin;
vtkNew<vtkF3DRendererWithColoring> Renderer;
vtkNew<vtkF3DRenderer> Renderer;
Type WindowType;
const options& Options;
std::string CachePath;
Expand Down Expand Up @@ -316,7 +316,7 @@ window_impl::~window_impl()
//----------------------------------------------------------------------------
void window_impl::UpdateDynamicOptions()
{
vtkF3DRendererWithColoring* renderer = this->Internals->Renderer;
vtkF3DRenderer* renderer = this->Internals->Renderer;

if (this->Internals->WindowType == Type::NONE)
{
Expand All @@ -339,9 +339,9 @@ void window_impl::UpdateDynamicOptions()
// XXX: model.point_sprites.type only has an effect on geometry scene
// but we set it here for practical reasons
const int pointSpritesSize = opt.model.point_sprites.size;
const vtkF3DRendererWithColoring::SplatType splatType = opt.model.point_sprites.type == "gaussian"
? vtkF3DRendererWithColoring::SplatType::GAUSSIAN
: vtkF3DRendererWithColoring::SplatType::SPHERE;
const vtkF3DRenderer::SplatType splatType = opt.model.point_sprites.type == "gaussian"
? vtkF3DRenderer::SplatType::GAUSSIAN
: vtkF3DRenderer::SplatType::SPHERE;
renderer->SetPointSpritesProperties(splatType, pointSpritesSize);

renderer->SetLineWidth(opt.render.line_width);
Expand Down
1 change: 0 additions & 1 deletion vtkext/private/module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ set(classes
vtkF3DPostProcessFilter
vtkF3DRenderPass
vtkF3DRenderer
vtkF3DRendererWithColoring
vtkF3DUserRenderPass
)

Expand Down
8 changes: 4 additions & 4 deletions vtkext/private/module/Testing/TestF3DRendererWithColoring.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

#include "vtkF3DConfigure.h"
#include "vtkF3DGenericImporter.h"
#include "vtkF3DRendererWithColoring.h"
#include "vtkF3DRenderer.h"

int TestF3DRendererWithColoring(int argc, char* argv[])
{
vtkNew<vtkF3DRendererWithColoring> renderer;
vtkNew<vtkF3DRenderer> renderer;
vtkNew<vtkF3DMetaImporter> importer;
vtkNew<vtkRenderWindow> window;

Expand All @@ -34,7 +34,7 @@ int TestF3DRendererWithColoring(int argc, char* argv[])
renderer->SetColoring(true, false, "Invalid", 0);
renderer->SetUseVolume(false);
renderer->UpdateActors();
renderer->CycleScalars(vtkF3DRendererWithColoring::CycleType::COMPONENT);
renderer->CycleScalars(vtkF3DRenderer::CycleType::COMPONENT);
renderer->SetUseVolume(true);
renderer->UpdateActors();

Expand All @@ -56,7 +56,7 @@ int TestF3DRendererWithColoring(int argc, char* argv[])
return EXIT_FAILURE;
}

renderer->CycleScalars(vtkF3DRendererWithColoring::CycleType::COMPONENT);
renderer->CycleScalars(vtkF3DRenderer::CycleType::COMPONENT);
if (renderer->GetColoringArrayName() != "Momentum" || renderer->GetColoringComponent() != 1)
{
std::cerr << "Unexpected coloring information after cycling component" << std::endl;
Expand Down
Loading