projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a bunch more DEBUGPOINT()s.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_composite.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_composite.cpp
b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
index
e29b378
..
43c3fa0
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_composite.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_composite.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_composite.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_composite.cpp
-** \brief
Template File
+** \brief
Implementation of the "Composite" valuenode conversion.
**
**
-** $Id
: valuenode_composite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-88,7
+88,7
@@
synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
}
default:
assert(0);
}
default:
assert(0);
- throw Exception::BadType(ValueBase::type_
name(get_type()));
+ throw Exception::BadType(ValueBase::type_
local_name(get_type()));
}
}
}
}
@@
-102,7
+102,7
@@
ValueNode_Composite::create(const ValueBase &value)
{
return new ValueNode_Composite(value);
}
{
return new ValueNode_Composite(value);
}
-
+
LinkableValueNode*
ValueNode_Composite::create_new()const
{
LinkableValueNode*
ValueNode_Composite::create_new()const
{
@@
-184,9
+184,8
@@
ValueNode_Composite::link_count()const
bool
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
{
bool
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
{
- assert(i>=0);
- assert(i<6);
-
+ assert(i>=0 && i<link_count());
+
if(PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
if(PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
@@
-196,7
+195,6
@@
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
- assert(i<2);
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
@@
-205,16
+203,14
@@
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
break;
case ValueBase::TYPE_COLOR:
break;
case ValueBase::TYPE_COLOR:
- assert(i<4);
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
return true;
}
break;
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
return true;
}
break;
-
+
case ValueBase::TYPE_SEGMENT:
case ValueBase::TYPE_SEGMENT:
- assert(i<4);
if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
@@
-223,7
+219,6
@@
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
break;
case ValueBase::TYPE_BLINEPOINT:
break;
case ValueBase::TYPE_BLINEPOINT:
- assert(i<6);
if((i==0 || i==4 || i==5) && x->get_type()==ValueBase(Point()).get_type())
{
components[i]=x;
if((i==0 || i==4 || i==5) && x->get_type()==ValueBase(Point()).get_type())
{
components[i]=x;
@@
-240,24
+235,26
@@
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
return true;
}
break;
return true;
}
break;
-
+
default:
break;
}
default:
break;
}
- return false;
+ return false;
}
ValueNode::LooseHandle
ValueNode_Composite::get_link_vfunc(int i)const
{
}
ValueNode::LooseHandle
ValueNode_Composite::get_link_vfunc(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
return components[i];
}
String
ValueNode_Composite::link_local_name(int i)const
{
return components[i];
}
String
ValueNode_Composite::link_local_name(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
@@
-272,7
+269,7
@@
ValueNode_Composite::link_local_name(int i)const
return _("Blue");
else if(i==3)
return _("Alpha");
return _("Blue");
else if(i==3)
return _("Alpha");
-
+
case ValueBase::TYPE_SEGMENT:
if(i==0)
return _("Vertex 1");
case ValueBase::TYPE_SEGMENT:
if(i==0)
return _("Vertex 1");
@@
-298,18
+295,18
@@
ValueNode_Composite::link_local_name(int i)const
return _("Tangent 2");
default:
return _("Tangent 2");
default:
-
break
;
+
return etl::strprintf(_("C%d"),i+1)
;
}
}
- return etl::strprintf(_("C%d"),i+1);
-}
+}
String
ValueNode_Composite::link_name(int i)const
{
String
ValueNode_Composite::link_name(int i)const
{
- assert(i>=0 && i<5);
+ assert(i>=0 && i<link_count());
+
return strprintf("c%d",i);
return strprintf("c%d",i);
-}
+}
int
ValueNode_Composite::get_link_index_from_name(const String &name)const
int
ValueNode_Composite::get_link_index_from_name(const String &name)const
@@
-360,7
+357,7
@@
ValueNode_Composite::get_link_index_from_name(const String &name)const
return 4;
if(name=="t2")
return 5;
return 4;
if(name=="t2")
return 5;
- default:
+ default:
break;
}
break;
}