Filter effects dialog:

[inkscape.git] / src / vanishing-point.h

diff --git a/src/vanishing-point.h b/src/vanishing-point.h
index de06002e4ddc47e188dc280d985e2468c04bdb63..e6c106481f0063d625c8129a59245c5792a0dcee 100644 (file)
--- a/src/vanishing-point.h
+++ b/src/vanishing-point.h
@@ -13,7 +13,9 @@
 #define SEEN_VANISHING_POINT_H
 
 #include "libnr/nr-point.h"
-#include "line-geometry.h"
+#include "axis-manip.h"
+
+#include "line-geometry.h" // TODO: Remove this include as soon as we don't need create_canvas_(point|line) any more.
 
 namespace Box3D {
 
@@ -22,23 +24,7 @@ enum VPState {
     VP_INFINITE    // perspective lines are parallel
 };
 
-// The X-/Y-/Z-axis corresponds to the first/second/third digit
-// in binary representation, respectively.
-enum PerspDir {
-    X = 1,
-    Y = 2,
-    Z = 4,
-    NONE = 0
-};
-
-
-/** Given two axis directions out of {X, Y, Z}, returns the remaining one */
-inline Box3D::PerspDir third_axis_direction (Box3D::PerspDir dir1, Box3D::PerspDir dir2) {
-    return (Box3D::PerspDir) ((dir1 + dir2) ^ 0x7);
-}
-
-
-// FIXME: Store the PerspDir of the VP inside the class
+// FIXME: Store the Axis of the VP inside the class
 class VanishingPoint : public NR::Point {
 public:
     inline VanishingPoint() : NR::Point() {};
@@ -63,7 +49,7 @@ public:
 
     bool is_finite();
     VPState toggle_parallel();
-    void draw(PerspDir const axis); // Draws a point on the canvas if state == VP_FINITE
+    void draw(Box3D::Axis const axis); // Draws a point on the canvas if state == VP_FINITE
     //inline VPState state() { return state; }
        
     VPState state;