X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbox3d.h;h=b6d962a3c924375ca6c6b3daa34df8c0e4dc53a7;hb=22e5d80ca99dd066de2fabd41c6830300a0e81a5;hp=bca319e678c6c01d461fa9fce6ace1429cd81190;hpb=b9314c4c1c56471487e07aa368f0e311d29bee58;p=inkscape.git diff --git a/src/box3d.h b/src/box3d.h index bca319e67..b6d962a3c 100644 --- a/src/box3d.h +++ b/src/box3d.h @@ -1,5 +1,5 @@ -#ifndef __SP_3DBOX_H__ -#define __SP_3DBOX_H__ +#ifndef __SP_BOX3D_H__ +#define __SP_BOX3D_H__ /* * SVG implementation @@ -15,71 +15,82 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "inkscape.h" -#include "perspective-line.h" - #include "sp-item-group.h" -#include "sp-path.h" -#include "xml/document.h" -#include "xml/repr.h" -#include "line-geometry.h" -#include "box3d-face.h" +#include "proj_pt.h" +#include "axis-manip.h" + +#define SP_TYPE_BOX3D (box3d_get_type ()) +#define SP_BOX3D(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_BOX3D, SPBox3D)) +#define SP_BOX3D_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_BOX3D, Box3DClass)) +#define SP_IS_BOX3D(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_BOX3D)) +#define SP_IS_BOX3D_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_BOX3D)) +class Box3DSide; +class Persp3D; +class Persp3DReference; -#define SP_TYPE_3DBOX (sp_3dbox_get_type ()) -#define SP_3DBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_3DBOX, SP3DBox)) -#define SP_3DBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_3DBOX, SP3DBoxClass)) -#define SP_IS_3DBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_3DBOX)) -#define SP_IS_3DBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_3DBOX)) +struct SPBox3D : public SPGroup { + gint z_orders[6]; // z_orders[i] holds the ID of the face at position #i in the group (from top to bottom) + gchar *persp_href; + Persp3DReference *persp_ref; -struct SP3DBox : public SPGroup { - NR::Point corners[8]; - Box3DFace *faces[6]; - guint z_orders[6]; // z_orders[i] holds the ID of the face at position #i in the group (from top to bottom) + Proj::Pt3 orig_corner0; + Proj::Pt3 orig_corner7; - // TODO: Keeping/updating the ratios works reasonably well but is still an ad hoc implementation. - // Use a mathematically correct model to update the boxes. - double ratio_x; - double ratio_y; - double ratio_z; + Proj::Pt3 save_corner0; + Proj::Pt3 save_corner7; - guint front_bits; /* used internally to determine which of two parallel faces is supposed to be the front face */ + Box3D::Axis swapped; // to indicate which coordinates are swapped during dragging - gint my_counter; // for testing only + gint my_counter; // for debugging only }; -struct SP3DBoxClass { - SPGroupClass parent_class; +struct SPBox3DClass { + SPGroupClass parent_class; }; -GType sp_3dbox_get_type (void); - -void sp_3dbox_position_set (SP3DBoxContext &bc); -void sp_3dbox_set_shape(SP3DBox *box3d, bool use_previous_corners = false); -void sp_3dbox_recompute_corners (SP3DBox *box, NR::Point const pt1, NR::Point const pt2, NR::Point const pt3); -bool sp_3dbox_recompute_z_orders (SP3DBox *box); /* returns true if there was a change in the z-orders - (which triggers an update of the repr) */ -void sp_3dbox_set_z_orders (SP3DBox *box); -void sp_3dbox_update_curves (SP3DBox *box); -void sp_3dbox_link_to_existing_paths (SP3DBox *box, Inkscape::XML::Node *repr); -void sp_3dbox_set_ratios (SP3DBox *box, Box3D::Axis axes = Box3D::XYZ); -void sp_3dbox_switch_front_face (SP3DBox *box, Box3D::Axis axis); -void sp_3dbox_move_corner_in_XY_plane (SP3DBox *box, guint id, NR::Point pt, Box3D::Axis axes = Box3D::XY); -void sp_3dbox_move_corner_in_Z_direction (SP3DBox *box, guint id, NR::Point pt, bool constrained = true); -NR::Maybe sp_3dbox_get_center (SP3DBox *box); -NR::Maybe sp_3dbox_get_midpoint_between_corners (SP3DBox *box, guint id_corner1, guint id_corner2); - -void sp_3dbox_update_perspective_lines(); -void sp_3dbox_corners_for_perspective_lines (const SP3DBox * box, Box3D::Axis axis, NR::Point &corner1, NR::Point &corner2, NR::Point &corner3, NR::Point &corner4); -guint sp_3dbox_get_corner_id_along_edge (const SP3DBox *box, guint corner, Box3D::Axis axis, Box3D::FrontOrRear rel_pos); -NR::Point sp_3dbox_get_corner_along_edge (const SP3DBox *box, guint corner, Box3D::Axis axis, Box3D::FrontOrRear rel_pos); - -gchar * sp_3dbox_get_svg_descr_of_persp (Box3D::Perspective3D *persp); - -inline NR::Point sp_3dbox_get_corner (SP3DBox *box, guint id) { return box->corners[id]; } -inline bool sp_3dbox_corners_are_adjacent (guint id_corner1, guint id_corner2) { - return Box3D::is_single_axis_direction ((Box3D::Axis) (id_corner1 ^ id_corner2)); -} - -#endif +GType box3d_get_type (void); + +void box3d_position_set (SPBox3D *box); +Proj::Pt3 box3d_get_proj_corner (SPBox3D const *box, guint id); +Geom::Point box3d_get_corner_screen (SPBox3D const *box, guint id, bool item_coords = true); +Proj::Pt3 box3d_get_proj_center (SPBox3D *box); +Geom::Point box3d_get_center_screen (SPBox3D *box); + +void box3d_set_corner (SPBox3D *box, guint id, Geom::Point const &new_pos, Box3D::Axis movement, bool constrained); +void box3d_set_center (SPBox3D *box, Geom::Point const &new_pos, Geom::Point const &old_pos, Box3D::Axis movement, bool constrained); +void box3d_corners_for_PLs (const SPBox3D * box, Proj::Axis axis, Geom::Point &corner1, Geom::Point &corner2, Geom::Point &corner3, Geom::Point &corner4); +bool box3d_recompute_z_orders (SPBox3D *box); +void box3d_set_z_orders (SPBox3D *box); + +int box3d_pt_lies_in_PL_sector (SPBox3D const *box, Geom::Point const &pt, int id1, int id2, Box3D::Axis axis); +int box3d_VP_lies_in_PL_sector (SPBox3D const *box, Proj::Axis vpdir, int id1, int id2, Box3D::Axis axis); + +void box3d_relabel_corners(SPBox3D *box); +void box3d_check_for_swapped_coords(SPBox3D *box); + +void box3d_add_to_selection(SPBox3D *box); +void box3d_remove_from_selection(SPBox3D *box); +void box3d_mark_transformed(SPBox3D *box); + +std::list box3d_extract_boxes(SPObject *obj); + +Persp3D *box3d_get_perspective(SPBox3D const *box); +void box3d_switch_perspectives(SPBox3D *box, Persp3D *old_persp, Persp3D *new_persp, bool recompute_corners = false); + +SPGroup *box3d_convert_to_group(SPBox3D *box); + + +#endif /* __SP_BOX3D_H__ */ + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :