remove extra Shape:: on new function definition in Shape class.

[inkscape.git] / src / box3d-face.h

diff --git a/src/box3d-face.h b/src/box3d-face.h
index 3b96937b657cd26f31ce610dabcb8e04083f2fbb..0e911cccfdbe84a1d18878ac63586d47767441e7 100644 (file)
--- a/src/box3d-face.h
+++ b/src/box3d-face.h
@@ -25,11 +25,8 @@ class SP3DBox;
 
 class Box3DFace {
 public:
-    Box3DFace(SP3DBox *box3d);
-    Box3DFace(SP3DBox *box3d, NR::Point &A, NR::Point &B, NR::Point &C, NR::Point &D);
-    //Box3DFace(SP3DBox *box3d, NR::Point const ul, NR::Point const lr,
-    //          Box3D::Axis const dir1, Box3D::Axis const dir2,
-    //          unsigned int shift_count = 0, NR::Maybe<NR::Point> pt_align = NR::Nothing(), bool align_along_PL = false);
+    Box3DFace(SP3DBox *box, NR::Point &A, NR::Point &B, NR::Point &C, NR::Point &D,
+                           Box3D::Axis plane, Box3D::FrontOrRear rel_pos);
     Box3DFace(Box3DFace const &box3dface);
     ~Box3DFace();
 
@@ -45,9 +42,12 @@ public:
     void set_corners (NR::Point &A, NR::Point &B, NR::Point &C, NR::Point &D);
     void set_face (NR::Point const A, NR::Point const C, Box3D::Axis const dir1, Box3D::Axis const dir2);
     
-    void hook_path_to_3dbox();
+    void hook_path_to_3dbox(SPPath * existing_path = NULL);
     void set_path_repr();
     void set_curve();
+    inline void lower_to_bottom() { SP_ITEM (path)->lowerToBottom(); }
+    inline void raise_to_top() { SP_ITEM (path)->raiseToTop(); }
+    gchar * axes_string();
     gchar * svg_repr_string();
 
 private:
@@ -55,9 +55,11 @@ private:
 
     Box3D::Axis dir1;
     Box3D::Axis dir2;
+
+    Box3D::FrontOrRear front_or_rear;
     
     SPPath *path;
-    SP3DBox *parent_box3d; // the parent box
+    SP3DBox *parent_box3d;
 };
 
 #endif