super sampling

vtk/src/layers/LGlyphLayer.cpp

@@ -17,14 +17,13 @@
 
 #include "../CartographicTransformation.h"
 
-
 vtkSmartPointer<SpawnPointCallback> LGlyphLayer::createSpawnPointCallback() {
-    auto newPointCallBack = vtkSmartPointer<SpawnPointCallback>::New();
-    newPointCallBack->setData(data);
-    newPointCallBack->setPoints(points);
-    newPointCallBack->setRen(ren);
-    newPointCallBack->setUVGrid(uvGrid);
-    return newPointCallBack;
+  auto newPointCallBack = vtkSmartPointer<SpawnPointCallback>::New();
+  newPointCallBack->setData(data);
+  newPointCallBack->setPoints(points);
+  newPointCallBack->setRen(ren);
+  newPointCallBack->setUVGrid(uvGrid);
+  return newPointCallBack;
 }
 
 // Further notes; current thinking is to allow tracking a particle's age by using a scalar array in the VtkPolyData. This would be incremented for every tick/updateData function call.
@@ -33,72 +32,72 @@ vtkSmartPointer<SpawnPointCallback> LGlyphLayer::createSpawnPointCallback() {
 // TODO: modelling all this in vtkClasses is workable, but ideally i would want to work with a native C++ class. See if this is doable and feasible.
 
 LGlyphLayer::LGlyphLayer(std::shared_ptr<UVGrid> uvGrid, std::unique_ptr<AdvectionKernel> advectionKernel) {
-    this->ren = vtkSmartPointer<vtkRenderer>::New();
-    this->ren->SetLayer(2);
+  this->ren = vtkSmartPointer<vtkRenderer>::New();
+  this->ren->SetLayer(2);
 
-    this->points = vtkSmartPointer<vtkPoints>::New();
-    this->data = vtkSmartPointer<vtkPolyData>::New();
-    this->data->SetPoints(this->points);
+  this->points = vtkSmartPointer<vtkPoints>::New();
+  this->data = vtkSmartPointer<vtkPolyData>::New();
+  this->data->SetPoints(this->points);
 
-    advector = std::move(advectionKernel);
-    this->uvGrid = uvGrid;
+  advector = std::move(advectionKernel);
+  this->uvGrid = uvGrid;
 
-    auto camera = createNormalisedCamera();
-    ren->SetActiveCamera(camera);
+  auto camera = createNormalisedCamera();
+  ren->SetActiveCamera(camera);
 
-    vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter(uvGrid);
-    transformFilter->SetInputData(data);
+  vtkSmartPointer<vtkTransformFilter> transformFilter = createCartographicTransformFilter(uvGrid);
+  transformFilter->SetInputData(data);
 
-    vtkNew<vtkGlyphSource2D> circleSource;
-    circleSource->SetGlyphTypeToCircle();
-    circleSource->SetScale(0.05);
-    circleSource->Update();
+  vtkNew<vtkGlyphSource2D> circleSource;
+  circleSource->SetGlyphTypeToCircle();
+  circleSource->SetScale(0.05);
+  circleSource->Update();
 
-    vtkNew<vtkGlyph2D> glyph2D;
-    glyph2D->SetSourceConnection(circleSource->GetOutputPort());
-    glyph2D->SetInputConnection(transformFilter->GetOutputPort());
-    glyph2D->SetColorModeToColorByScalar();
-    glyph2D->Update();
+  vtkNew<vtkGlyph2D> glyph2D;
+  glyph2D->SetSourceConnection(circleSource->GetOutputPort());
+  glyph2D->SetInputConnection(transformFilter->GetOutputPort());
+  glyph2D->SetColorModeToColorByScalar();
+  glyph2D->Update();
 
-    vtkNew<vtkPolyDataMapper> mapper;
-    mapper->SetInputConnection(glyph2D->GetOutputPort());
-    mapper->Update();
+  vtkNew<vtkPolyDataMapper> mapper;
+  mapper->SetInputConnection(glyph2D->GetOutputPort());
+  mapper->Update();
 
-    vtkNew<vtkActor> actor;
-    actor->SetMapper(mapper);
+  vtkNew<vtkActor> actor;
+  actor->SetMapper(mapper);
 
-    this->ren->AddActor(actor);
+  this->ren->AddActor(actor);
 }
 
 // creates a few points so we can test the updateData function
 void LGlyphLayer::spoofPoints() {
-    this->points->InsertNextPoint(-4.125, 61.375 , 0);
-    this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
-    this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
-    this->points->InsertNextPoint( 6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
-    this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857, 0); // Coordinates of the top of the Faroe islands
+  this->points->InsertNextPoint(-4.125, 61.375, 0);
+  this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
+  this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
+  this->points->InsertNextPoint(6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
+  this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857,
+                                0); // Coordinates of the top of the Faroe islands
 
-    this->points->Modified();
-}
-
-// returns new coords for a point; used to test the updateData function
-std::pair<double, double> advect(int time, double lat, double lon) {
-    return {lat + 0.01, lon + 0.01};
+  this->points->Modified();
 }
 
 void LGlyphLayer::updateData(int t) {
-    double point[3];
-    for (vtkIdType n = 0; n < this->points->GetNumberOfPoints(); n++) {
-        this->points->GetPoint(n, point);
-        auto [yNew, xNew] = advector->advect(t, point[1], point[0]);
-        this->points->SetPoint(n, xNew, yNew, 0);
+  const int SUPERSAMPLINGRATE = 4;
+  double point[3];
+  for (vtkIdType n = 0; n < this->points->GetNumberOfPoints(); n++) {
+    this->points->GetPoint(n, point);
+    for (int i = 0; i < SUPERSAMPLINGRATE; i++) {
+      std::tie(point[1], point[0]) = advector->advect(t, point[1], point[0], (t-lastT)/SUPERSAMPLINGRATE);
     }
-    this->points->Modified();
+    this->points->SetPoint(n, point[0], point[1], 0);
+  }
+  lastT = t;
+  this->points->Modified();
 }
 
 void LGlyphLayer::addObservers(vtkSmartPointer<vtkRenderWindowInteractor> interactor) {
-    auto newPointCallBack = createSpawnPointCallback();
-    interactor->AddObserver(vtkCommand::LeftButtonPressEvent, newPointCallBack);
-    interactor->AddObserver(vtkCommand::LeftButtonReleaseEvent, newPointCallBack);
-    interactor->AddObserver(vtkCommand::MouseMoveEvent, newPointCallBack);
+  auto newPointCallBack = createSpawnPointCallback();
+  interactor->AddObserver(vtkCommand::LeftButtonPressEvent, newPointCallBack);
+  interactor->AddObserver(vtkCommand::LeftButtonReleaseEvent, newPointCallBack);
+  interactor->AddObserver(vtkCommand::MouseMoveEvent, newPointCallBack);
 }

vtk/src/layers/LGlyphLayer.h

@@ -16,6 +16,7 @@ private:
   vtkSmartPointer<vtkPolyData> data;
   std::unique_ptr<AdvectionKernel> advector;
   std::shared_ptr<UVGrid> uvGrid;
+  int lastT = 1000;
 
 public:
   /** Constructor.