Extensions. Color marker improvements (Bug #692582, Color markers to match stroke...

[inkscape.git] / src / perspective-line.h

diff --git a/src/perspective-line.h b/src/perspective-line.h
index a1c61c52272ef283d30954b8b9504b483ec0783c..57abaae9c2148f3147cb065b2d18ba7e5c770ad2 100644 (file)
--- a/src/perspective-line.h
+++ b/src/perspective-line.h
@@ -12,10 +12,11 @@
 #ifndef SEEN_PERSPECTIVE_LINE_H
 #define SEEN_PERSPECTIVE_LINE_H
 
-#include "vanishing-point.h"
-#include "box3d-context.h" 
+#include "line-geometry.h"
 #include <glib.h>
 
+class SPDesktop;
+
 namespace Box3D {
 
 class PerspectiveLine : public Box3D::Line {
@@ -26,29 +27,17 @@ public:
      * PL runs through it; otherwise it has the direction specified by the v_dir vector
      * of the VP.
      */
-    PerspectiveLine (NR::Point const &pt, PerspDir const axis,
-                     Perspective3D *perspective = SP3DBoxContext::current_perspective);
-    NR::Maybe<NR::Point> intersect (Line const &line); // FIXME: Can we make this return only a NR::Point to remove the extra method meet()?
-    NR::Point meet (Line const &line);
-       
+    PerspectiveLine (Geom::Point const &pt, Proj::Axis const axis, Persp3D *persp);
+
 private:
-    PerspDir vp_dir; // direction of the associated VP
-    Perspective3D *persp;
+    Proj::Axis vp_dir; // direction of the associated VP
+    Persp3D *persp;
 };
 
 
 } // namespace Box3D
 
 
-/** A function to print out the VanishingPoint (prints the coordinates) **/
-/***
-inline std::ostream &operator<< (std::ostream &out_file, const VanishingPoint &vp) {
-    out_file << vp;
-    return out_file;
-}
-***/
-
-
 #endif /* !SEEN_PERSPECTIVE_LINE_H */
 
 /*