X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fperspective-line.h;h=e0235aafc72f830f31512b1f3c86437879e33ea3;hb=8d358698ecbf192ba7c6dc05d4f7de7592753d9f;hp=a02737692d07cc63bfbce6da024f2288af55e436;hpb=536ac52055722b168e4482f612302fa754dc4f72;p=inkscape.git diff --git a/src/perspective-line.h b/src/perspective-line.h index a02737692..e0235aafc 100644 --- a/src/perspective-line.h +++ b/src/perspective-line.h @@ -12,11 +12,11 @@ #ifndef SEEN_PERSPECTIVE_LINE_H #define SEEN_PERSPECTIVE_LINE_H -#include "vanishing-point.h" #include "line-geometry.h" -#include "box3d-context.h" #include +class SPDesktop; + namespace Box3D { class PerspectiveLine : public Box3D::Line { @@ -27,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, Box3D::Axis const axis, - Perspective3D *perspective = SP3DBoxContext::current_perspective); - NR::Maybe 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 (NR::Point const &pt, Proj::Axis const axis, Persp3D *persp); + private: - Box3D::Axis 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 */ /*