merge conflic
This commit is contained in:
robin committed
1 parent
59bd2f5a73
commit
c9a88b1a46
19 files changed
+325
-86
No files matched your search
@@ -1,10 +1,11 @@
|
||||
#ifndef NORMALISEDCARTOGRAPHICCAMERA_H
|
||||
#define NORMALISEDCARTOGRAPHICCAMERA_H
|
||||
|
||||
#include <memory>
|
||||
#include <vtkCamera.h>
|
||||
#include <vtkTransformFilter.h>
|
||||
#include "advection/UVGrid.h"
|
||||
|
||||
#ifndef NORMALISEDCARTOGRAPHICCAMERA_H
|
||||
#define NORMALISEDCARTOGRAPHICCAMERA_H
|
||||
|
||||
|
||||
/**
|
||||
* Constructs a orthographically projected camera that looks at the square x,y in [-1, 1] with z = 0 and w = 1.
|
||||
@@ -27,5 +28,4 @@ vtkSmartPointer<vtkMatrix4x4> getCartographicTransformMatrix(const std::shared_p
|
||||
* @return pointer to transform filter
|
||||
*/
|
||||
vtkSmartPointer<vtkTransformFilter> createCartographicTransformFilter(const std::shared_ptr<UVGrid> uvGrid);
|
||||
|
||||
#endif //NORMALISEDCARTOGRAPHICCAMERA_H
|
||||