X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=760a2319f98b44b62ab503aab5a45deba30a1de2;hb=d8a0d032dc97e5c058ef37b79e245689b2ae7c10;hp=9132bab14637908927dc20350d11d7a72d8620d9;hpb=67e4cb808328ea14df418d983e368f0eb4b742ae;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 9132bab..760a231 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -234,7 +234,7 @@ CanvasParser::parse_keyframe(xmlpp::Element *element,Canvas::Handle canvas) Real -CanvasParser::parse_real(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_real(xmlpp::Element *element) { assert(element->get_name()=="real"); @@ -272,7 +272,7 @@ CanvasParser::parse_time(xmlpp::Element *element,Canvas::Handle canvas) } int -CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_integer(xmlpp::Element *element) { assert(element->get_name()=="integer"); @@ -291,7 +291,7 @@ CanvasParser::parse_integer(xmlpp::Element *element,Canvas::Handle canvas) } Vector -CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_vector(xmlpp::Element *element) { assert(element->get_name()=="vector"); @@ -336,7 +336,7 @@ CanvasParser::parse_vector(xmlpp::Element *element,Canvas::Handle canvas) } Color -CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_color(xmlpp::Element *element) { assert(element->get_name()=="color"); @@ -346,7 +346,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) return Color(); } - Color color; + Color color(0); xmlpp::Element::NodeList list = element->get_children(); for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) @@ -402,7 +402,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas) } synfig::String -CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_string(xmlpp::Element *element) { assert(element->get_name()=="string"); @@ -422,7 +422,7 @@ CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas) } bool -CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_bool(xmlpp::Element *element) { assert(element->get_name()=="bool"); @@ -448,7 +448,7 @@ CanvasParser::parse_bool(xmlpp::Element *element,Canvas::Handle canvas) } Gradient -CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas) +CanvasParser::parse_gradient(xmlpp::Element *node) { assert(node->get_name()=="gradient"); Gradient ret; @@ -462,7 +462,7 @@ CanvasParser::parse_gradient(xmlpp::Element *node,Canvas::Handle canvas) else { Gradient::CPoint cpoint; - cpoint.color=parse_color(child,canvas); + cpoint.color=parse_color(child); if(!child->get_attribute("pos")) { @@ -505,7 +505,7 @@ CanvasParser::parse_list(xmlpp::Element *element,Canvas::Handle canvas) } Segment -CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_segment(xmlpp::Element *element) { assert(element->get_name()=="segment"); @@ -545,7 +545,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.p1=parse_vector(dynamic_cast(*iter),canvas); + seg.p1=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="t1") @@ -569,7 +569,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.t1=parse_vector(dynamic_cast(*iter),canvas); + seg.t1=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="p2") @@ -593,7 +593,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.p2=parse_vector(dynamic_cast(*iter),canvas); + seg.p2=parse_vector(dynamic_cast(*iter)); } else if(child->get_name()=="t2") @@ -617,7 +617,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) continue; } - seg.t2=parse_vector(dynamic_cast(*iter),canvas); + seg.t2=parse_vector(dynamic_cast(*iter)); } else error_unexpected_element(child,child->get_name()); @@ -626,7 +626,7 @@ CanvasParser::parse_segment(xmlpp::Element *element,Canvas::Handle canvas) } BLinePoint -CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_bline_point(xmlpp::Element *element) { assert(element->get_name()=="bline_point"); if(element->get_children().empty()) @@ -667,7 +667,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_vertex(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_vertex(parse_vector(dynamic_cast(*iter))); } else // Tangent 1 @@ -692,7 +692,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_tangent1(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_tangent1(parse_vector(dynamic_cast(*iter))); } else // Tangent 2 @@ -717,7 +717,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_tangent2(parse_vector(dynamic_cast(*iter),canvas)); + ret.set_tangent2(parse_vector(dynamic_cast(*iter))); ret.set_split_tangent_flag(true); } else @@ -743,7 +743,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_width(parse_real(dynamic_cast(*iter),canvas)); + ret.set_width(parse_real(dynamic_cast(*iter))); } else // origin @@ -768,7 +768,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) continue; } - ret.set_origin(parse_real(dynamic_cast(*iter),canvas)); + ret.set_origin(parse_real(dynamic_cast(*iter))); } else error_unexpected_element(child,child->get_name()); @@ -777,7 +777,7 @@ CanvasParser::parse_bline_point(xmlpp::Element *element,Canvas::Handle canvas) } Angle -CanvasParser::parse_angle(xmlpp::Element *element,Canvas::Handle canvas) +CanvasParser::parse_angle(xmlpp::Element *element) { assert(element->get_name()=="angle"); @@ -799,45 +799,43 @@ ValueBase CanvasParser::parse_value(xmlpp::Element *element,Canvas::Handle canvas) { if(element->get_name()=="real") - return parse_real(element,canvas); + return parse_real(element); else if(element->get_name()=="time") return parse_time(element,canvas); else if(element->get_name()=="integer") - return parse_integer(element,canvas); + return parse_integer(element); else if(element->get_name()=="string") - return parse_string(element,canvas); + return parse_string(element); else if(element->get_name()=="vector") - { - return parse_vector(element,canvas); - } + return parse_vector(element); else if(element->get_name()=="color") - return parse_color(element,canvas); + return parse_color(element); else if(element->get_name()=="segment") - return parse_segment(element,canvas); + return parse_segment(element); else if(element->get_name()=="list") return parse_list(element,canvas); else if(element->get_name()=="gradient") - return parse_gradient(element,canvas); + return parse_gradient(element); else if(element->get_name()=="bool") - return parse_bool(element,canvas); + return parse_bool(element); else //if(element->get_name()=="canvas") // return parse_canvas(element,canvas,true); // inline canvas //else if(element->get_name()=="angle" || element->get_name()=="degrees" || element->get_name()=="radians" || element->get_name()=="rotations") - return parse_angle(element,canvas); + return parse_angle(element); else if(element->get_name()=="bline_point") - return parse_bline_point(element,canvas); + return parse_bline_point(element); else if(element->get_name()=="canvas") return ValueBase(parse_canvas(element,canvas,true)); @@ -1042,219 +1040,6 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) return value_node; } -// This function is a phase-out hack for the timed swap value node -etl::handle -CanvasParser::parse_timedswap(xmlpp::Element *node,Canvas::Handle canvas) -{ - ValueNode_TimedSwap::Handle timed_swap(parse_linkable_value_node(node,canvas)); - - assert(timed_swap); - - ValueNode_Animated::Handle animated(ValueNode_Animated::create(timed_swap->get_type())); - - animated->set_root_canvas(canvas->get_root()); - - assert(animated); - - Time swap_time, swap_length; - (*timed_swap->get_swap_time())(0).put(&swap_time); - (*timed_swap->get_swap_length())(0).put(&swap_length); - - animated->new_waypoint(swap_time-swap_length,timed_swap->get_before()); - animated->new_waypoint(swap_time,timed_swap->get_after()); - - return animated; -} - - -handle -CanvasParser::parse_subtract(xmlpp::Element *element,Canvas::Handle canvas) -{ - assert(element->get_name()=="subtract"); - - handle value_node; - handle lhs,rhs,scalar; - - if(element->get_attribute("type")) - { - ValueBase::Type type=ValueBase::ident_type(element->get_attribute("type")->get_value()); - - if(!type) - { - error(element,"Bad type in "); - return ValueNode_Subtract::Handle(); - } - value_node=ValueNode_Subtract::create(type); - } - else - value_node=ValueNode_Subtract::create(); - - if(!value_node) - { - error(element,strprintf(_("Unable to create "))); - return handle(); - } - - //if(element->get_attribute("scalar")) - //{ - // value_node->set_scalar(atof(element->get_attribute("scalar")->get_value().c_str())); - //} - - try - { - if(element->get_attribute("scalar")) - { - // This is for compatibility with older versions of the file format - String value(element->get_attribute("scalar")->get_value()); - if((value[0]<='9' && value[0]>='0') || value[0]=='-') - { - warning(element, _("Use of a real value where the ID should be is deprecated")); - value_node->set_scalar(atof(value.c_str())); - } - else - value_node->set_scalar(canvas->surefind_value_node(value)); - scalar=value_node->get_scalar(); - } - - if(element->get_attribute("lhs")) - { - lhs=canvas->surefind_value_node(element->get_attribute("lhs")->get_value()); - value_node->set_lhs(lhs); - } - - if(element->get_attribute("rhs")) - { - rhs=canvas->surefind_value_node(element->get_attribute("rhs")->get_value()); - value_node->set_rhs(rhs); - } - } - catch (Exception::IDNotFound) - { - error(element,"attribute in references unknown ID"); - } - catch (Exception::FileNotFound) - { - error(element,"Unable to open external file referenced in ID"); - } - - xmlpp::Element::NodeList list = element->get_children(); - for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) - { - xmlpp::Element *child(dynamic_cast(*iter)); - if(!child) - continue; - else - if(child->get_name()=="lhs") - { - if(lhs) - { - error(child,"LHS component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - lhs=parse_value_node(dynamic_cast(*iter),canvas); - - if(lhs) - value_node->set_lhs(lhs); - else - { - error((*iter),"Parse of LHS ValueNode failed"); - } - - // \todo do a search for more elements and warn if they are found - } - else - if(child->get_name()=="rhs") - { - if(rhs) - { - error(child,"RHS component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - rhs=parse_value_node(dynamic_cast(*iter),canvas); - - if(rhs) - value_node->set_rhs(rhs); - else - { - error((*iter),"Parse of RHS ValueNode failed"); - } - - // \todo do a search for more elements and warn if they are found - } - else - if(child->get_name()=="scalar") - { - if(scalar) - { - error(child,"scalar component of already defined!"); - continue; - } - - xmlpp::Element::NodeList list = child->get_children(); - xmlpp::Element::NodeList::iterator iter; - - // Search for the first non-text XML element - for(iter = list.begin(); iter != list.end(); ++iter) - if(dynamic_cast(*iter)) break; - - if(iter==list.end()) - { - error(child,_(" is missing its contents")); - continue; - } - - scalar=parse_value_node(dynamic_cast(*iter),canvas); - - if(scalar) - value_node->set_scalar(scalar); - else - { - error((*iter),"Parse of scalar ValueNode failed"); - } - - // \todo do a search for more elements and warn if they are found - } - else - error_unexpected_element(child,child->get_name()); - } - - if(!value_node->get_rhs() || !value_node->get_lhs() || !value_node->get_scalar()) - error(element," is missing LHS, RHS, or SCALAR"); - - if(value_node->get_rhs() == value_node->get_lhs()) - warning(element,"LHS is equal to RHS in , so this value_node will always be zero!"); - - return value_node; -} - etl::handle CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle canvas) { @@ -1772,9 +1557,6 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) if(element->get_name()=="hermite" || element->get_name()=="animated") value_node=parse_animated(element,canvas); else - if(element->get_name()=="subtract") - value_node=parse_subtract(element,canvas); - else if(element->get_name()=="composite") value_node=parse_composite(element,canvas); else @@ -1784,9 +1566,6 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas) if(element->get_name()=="bline") // This is not a typo. The dynamic list parser will parse a bline. value_node=parse_dynamic_list(element,canvas); else -// if(element->get_name()=="timed_swap") -// value_node=parse_timedswap(element,canvas); -// else if(LinkableValueNode::book().count(element->get_name())) value_node=parse_linkable_value_node(element,canvas); else