![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index 3f1e8851fe7075185e9f3b4e3a8c7781cb5ac8cf..74208444b04418be0e1b862fffad32cb71c8f6d0 100644 (file)
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
-#define __PERSP3D_C__
-
/*
* Class modelling a 3D perspective as an SPObject
*
* Authors:
* Maximilian Albert <Anhalter42@gmx.de>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
* Copyright (C) 2007 authors
*
#include "desktop-handles.h"
#include <glibmm/i18n.h>
+using Inkscape::DocumentUndo;
+
static void persp3d_class_init(Persp3DClass *klass);
static void persp3d_init(Persp3D *persp);
static void persp3d_on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
+static void persp3d_update_with_point (Persp3DImpl *persp_impl, Proj::Axis const axis, Proj::Pt2 const &new_image);
+static gchar * persp3d_pt_to_str (Persp3DImpl *persp_impl, Proj::Axis const axis);
+
static SPObjectClass *persp3d_parent_class;
static int global_counter = 0;
Persp3DImpl::Persp3DImpl() {
tmat = Proj::TransfMat3x4 ();
-
- boxes_transformed = new std::map<SPBox3D *, bool>;
- boxes_transformed->clear();
document = NULL;
my_counter = global_counter++;
}
-Persp3DImpl::~Persp3DImpl() {
- delete boxes_transformed;
-}
-
/**
* Registers Persp3d class and returns its type.
*/
@@ -120,10 +118,10 @@ static void persp3d_build(SPObject *object, SPDocument *document, Inkscape::XML:
/* calls sp_object_set for the respective attributes */
// The transformation matrix is updated according to the values we read for the VPs
- sp_object_read_attr(object, "inkscape:vp_x");
- sp_object_read_attr(object, "inkscape:vp_y");
- sp_object_read_attr(object, "inkscape:vp_z");
- sp_object_read_attr(object, "inkscape:persp3d-origin");
+ object->readAttr( "inkscape:vp_x" );
+ object->readAttr( "inkscape:vp_y" );
+ object->readAttr( "inkscape:vp_z" );
+ object->readAttr( "inkscape:persp3d-origin" );
if (repr) {
repr->addListener (&persp3d_repr_events, object);
((SPObjectClass *) persp3d_parent_class)->update(object, ctx, flags);
}
-Persp3D *
-persp3d_create_xml_element (SPDocument *document, Persp3DImpl *dup) {// if dup is given, copy the attributes over
+Persp3D *persp3d_create_xml_element(SPDocument *document, Persp3DImpl *dup) {// if dup is given, copy the attributes over
SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+ Inkscape::XML::Document *xml_doc = document->getReprDoc();
Inkscape::XML::Node *repr;
/* if no perspective is given, create a default one */
repr = xml_doc->createElement("inkscape:perspective");
repr->setAttribute("sodipodi:type", "inkscape:persp3d");
- Proj::Pt2 proj_vp_x = Proj::Pt2 (0.0, sp_document_height(document)/2, 1.0);
+ Proj::Pt2 proj_vp_x = Proj::Pt2 (0.0, document->getHeight()/2, 1.0);
Proj::Pt2 proj_vp_y = Proj::Pt2 (0.0, 1000.0, 0.0);
- Proj::Pt2 proj_vp_z = Proj::Pt2 (sp_document_width(document), sp_document_height(document)/2, 1.0);
- Proj::Pt2 proj_origin = Proj::Pt2 (sp_document_width(document)/2, sp_document_height(document)/3, 1.0);
+ Proj::Pt2 proj_vp_z = Proj::Pt2 (document->getWidth(), document->getHeight()/2, 1.0);
+ Proj::Pt2 proj_origin = Proj::Pt2 (document->getWidth()/2, document->getHeight()/3, 1.0);
if (dup) {
proj_vp_x = dup->tmat.column (Proj::X);
@@ -250,20 +247,18 @@ persp3d_create_xml_element (SPDocument *document, Persp3DImpl *dup) {// if dup i
SP_OBJECT_REPR(defs)->addChild(repr, NULL);
Inkscape::GC::release(repr);
- return (Persp3D *) sp_object_get_child_by_repr (SP_OBJECT(defs), repr);
+ return (Persp3D *) SP_OBJECT(defs)->get_child_by_repr (repr);
}
-Persp3D *
-persp3d_document_first_persp (SPDocument *document) {
- SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
- Inkscape::XML::Node *repr;
- for (SPObject *child = sp_object_first_child(defs); child != NULL; child = SP_OBJECT_NEXT(child) ) {
- repr = SP_OBJECT_REPR(child);
+Persp3D *persp3d_document_first_persp(SPDocument *document)
+{
+ Persp3D *first = 0;
+ for ( SPObject *child = SP_DOCUMENT_DEFS(document)->firstChild(); child && !first; child = child->getNext() ) {
if (SP_IS_PERSP3D(child)) {
- return SP_PERSP3D(child);
+ first = SP_PERSP3D(child);
}
}
- return NULL;
+ return first;
}
/**
persp3d_update_box_reprs (persp);
SP_OBJECT(persp)->updateRepr(SP_OBJECT_WRITE_EXT);
if (set_undo) {
- sp_document_done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX,
- _("Toggle vanishing point"));
+ DocumentUndo::done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX,
+ _("Toggle vanishing point"));
}
}
for (std::list<Persp3D *>::iterator i = p.begin(); i != p.end(); ++i) {
persp3d_toggle_VP((*i), axis, false);
}
- sp_document_done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX,
- _("Toggle multiple vanishing points"));
+ DocumentUndo::done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX,
+ _("Toggle multiple vanishing points"));
}
void
return false;
}
-void
-persp3d_add_box_transform (Persp3D *persp, SPBox3D *box) {
- Persp3DImpl *persp_impl = persp->perspective_impl;
-
- std::map<SPBox3D *, bool>::iterator i = persp_impl->boxes_transformed->find(box);
- if (i != persp_impl->boxes_transformed->end() && (*i).second == true) {
- g_print ("Warning! In %s (%d): trying to add transform status for box %d twice when it's already listed as true.\n", SP_OBJECT_REPR(persp_impl)->attribute("id"), persp_impl->my_counter, box->my_counter);
- return;
- }
-
- (*persp_impl->boxes_transformed)[box] = false;
-}
-
-void
-persp3d_remove_box_transform (Persp3D *persp, SPBox3D *box) {
- persp->perspective_impl->boxes_transformed->erase(box);
-}
-
-void
-persp3d_set_box_transformed (Persp3D *persp, SPBox3D *box, bool transformed) {
- Persp3DImpl *persp_impl = persp->perspective_impl;
-
- if (persp_impl->boxes_transformed->find(box) == persp_impl->boxes_transformed->end()) {
- g_print ("Warning! In %s (%d): trying to set transform status for box %d, but it is not listed in the perspective!! Aborting.\n",
- SP_OBJECT_REPR(persp)->attribute("id"), persp_impl->my_counter,
- box->my_counter);
- return;
- }
-
- (*persp_impl->boxes_transformed)[box] = transformed;
-}
-
-bool
-persp3d_was_transformed (Persp3D *persp) {
- Persp3DImpl *persp_impl = persp->perspective_impl;
-
- if (persp_impl->boxes_transformed->size() == 1) {
- /* either the transform has not been applied to the single box associated to this perspective yet
- or the transform was already reset; in both cases we need to return false because upcoming
- transforms need to be applied */
- (*persp_impl->boxes_transformed->begin()).second = false; // make sure the box is marked as untransformed (in case more boxes are added later)
- return false;
- }
-
- for (std::map<SPBox3D *, bool>::iterator i = persp_impl->boxes_transformed->begin();
- i != persp_impl->boxes_transformed->end(); ++i) {
- if ((*i).second == true) {
- // at least one of the boxes in the perspective has already been transformed;
- return true;
- }
- }
- return false; // all boxes in the perspective are still untransformed; a pending transformation should be applied
-}
-
-bool
-persp3d_all_transformed(Persp3D *persp) {
- Persp3DImpl *persp_impl = persp->perspective_impl;
-
- for (std::map<SPBox3D *, bool>::iterator i = persp_impl->boxes_transformed->begin();
- i != persp_impl->boxes_transformed->end(); ++i) {
- if ((*i).second == false) {
- return false;
- }
- }
- return true;
-}
-
-void
-persp3d_unset_transforms(Persp3D *persp) {
- Persp3DImpl *persp_impl = persp->perspective_impl;
-
- for (std::map<SPBox3D *, bool>::iterator i = persp_impl->boxes_transformed->begin();
- i != persp_impl->boxes_transformed->end(); ++i) {
- (*i).second = false;
- }
-}
-
void
persp3d_update_box_displays (Persp3D *persp) {
Persp3DImpl *persp_impl = persp->perspective_impl;
/* checks whether all boxes linked to this perspective are currently selected */
bool
-persp3d_has_all_boxes_in_selection (Persp3D *persp) {
+persp3d_has_all_boxes_in_selection (Persp3D *persp, Inkscape::Selection *selection) {
Persp3DImpl *persp_impl = persp->perspective_impl;
- std::list<SPBox3D *> selboxes = sp_desktop_selection(inkscape_active_desktop())->box3DList();
+ std::list<SPBox3D *> selboxes = selection->box3DList();
for (std::vector<SPBox3D *>::iterator i = persp_impl->boxes.begin(); i != persp_impl->boxes.end(); ++i) {
if (std::find(selboxes.begin(), selboxes.end(), *i) == selboxes.end()) {
return true;
}
-/**
- * For each perspective having a box in \a selection, determine all its unselected boxes.
- */
-// TODO: Check where we can use pass-by-reference (or so) instead of recreating all the lists afresh.
-std::map<Persp3D *, std::list<SPBox3D *> >
-persp3d_unselected_boxes(Inkscape::Selection *selection) {
- std::list<Persp3D *> plist = selection->perspList();
- std::map<Persp3D *, std::list<SPBox3D *> > punsel;
-
- std::list<Persp3D *>::iterator i;
- std::vector<SPBox3D *>::iterator j;
- // for all perspectives in the list ...
- for (i = plist.begin(); i != plist.end(); ++i) {
- Persp3D *persp = *i;
- Persp3DImpl *persp_impl = persp->perspective_impl;
- // ... and each box associated to it ...
- for (j = persp_impl->boxes.begin(); j != persp_impl->boxes.end(); ++j) {
- SPBox3D *box = *j;
- // ... check whether it is unselected, and if so add it to the list
- if (persp_impl->boxes_transformed->find(box) == persp_impl->boxes_transformed->end()) {
- punsel[persp].push_back(box);
- }
- }
- }
- return punsel;
-}
-
-/**
- * Split all perspectives with a box in \a selection by moving their unselected boxes to newly
- * created perspectives.
- */
-void
-persp3d_split_perspectives_according_to_selection(Inkscape::Selection *selection) {
- std::map<Persp3D *, std::list<SPBox3D *> > punsel = persp3d_unselected_boxes(selection);
-
- std::map<Persp3D *, std::list<SPBox3D *> >::iterator i;
- std::list<SPBox3D *>::iterator j;
- // for all perspectives in the list ...
- for (i = punsel.begin(); i != punsel.end(); ++i) {
- Persp3D *persp = (*i).first;
- // ... if the perspective has unselected boxes ...
- if (!(*i).second.empty()) {
- // create a new perspective and move these boxes over
- SPDocument *document = SP_OBJECT_DOCUMENT(persp);
- Persp3D * new_persp = persp3d_create_xml_element (document, persp->perspective_impl);
- for (j = (*i).second.begin(); j != (*i).second.end(); ++j) {
- SPBox3D *box = *j;
- box3d_switch_perspectives(box, persp, new_persp);
- }
- }
- }
-}
-
/* some debugging stuff follows */
void
g_print ("========================\n");
}
-void
-persp3d_print_debugging_info_all(SPDocument *document) {
- SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
- Inkscape::XML::Node *repr;
- for (SPObject *child = sp_object_first_child(defs); child != NULL; child = SP_OBJECT_NEXT(child) ) {
- repr = SP_OBJECT_REPR(child);
+void persp3d_print_debugging_info_all(SPDocument *document)
+{
+ for ( SPObject *child = SP_DOCUMENT_DEFS(document)->firstChild(); child; child = child->getNext() ) {
if (SP_IS_PERSP3D(child)) {
persp3d_print_debugging_info(SP_PERSP3D(child));
}
Persp3D *persp = SP_PERSP3D(*j);
Persp3DImpl *persp_impl = persp->perspective_impl;
g_print (" %s (%d): ", SP_OBJECT_REPR(persp)->attribute("id"), persp->perspective_impl->my_counter);
- for (std::map<SPBox3D *, bool>::iterator i = persp_impl->boxes_transformed->begin();
- i != persp_impl->boxes_transformed->end(); ++i) {
- g_print ("<%d,%d> ", (*i).first->my_counter, (*i).second);
+ for (std::vector<SPBox3D *>::iterator i = persp_impl->boxes.begin();
+ i != persp_impl->boxes.end(); ++i) {
+ g_print ("%d ", (*i)->my_counter);
}
g_print ("\n");
}
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :