projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zelgadis_master' into genete_master
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_geometry
/
checkerboard.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
index
25edead
..
30bbf8e
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
+++ b/
synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
@@
-66,7
+66,7
@@
SYNFIG_LAYER_SET_CVS_ID(CheckerBoard,"$Id$");
CheckerBoard::CheckerBoard():
Layer_Composite (1.0,Color::BLEND_STRAIGHT),
color (Color::black()),
CheckerBoard::CheckerBoard():
Layer_Composite (1.0,Color::BLEND_STRAIGHT),
color (Color::black()),
-
pos
(Point(0.125,0.125)),
+
origin
(Point(0.125,0.125)),
size (Point(0.25,0.25))
{
size (Point(0.25,0.25))
{
@@
-76,10
+76,10
@@
CheckerBoard::CheckerBoard():
inline bool
CheckerBoard::point_test(const synfig::Point& getpos)const
{
inline bool
CheckerBoard::point_test(const synfig::Point& getpos)const
{
- int val=((int)((getpos[0]-
pos[0])/size[0])+(int)((getpos[1]-pos
[1])/size[1]));
- if(getpos[0]-
pos
[0] < 0.0)
+ int val=((int)((getpos[0]-
origin[0])/size[0])+(int)((getpos[1]-origin
[1])/size[1]));
+ if(getpos[0]-
origin
[0] < 0.0)
val++;
val++;
- if(getpos[1]-
pos
[1] < 0.0)
+ if(getpos[1]-
origin
[1] < 0.0)
val++;
return val&1;
}
val++;
return val&1;
}
@@
-90,11
+90,13
@@
CheckerBoard::set_param(const String ¶m, const ValueBase &value)
IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
set_blend_method(Color::BLEND_ALPHA_OVER);
color.set_a(1); } else transparent_color_ = true; } });
IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
set_blend_method(Color::BLEND_ALPHA_OVER);
color.set_a(1); } else transparent_color_ = true; } });
- IMPORT(pos);
- IMPORT(pos[0]);
- IMPORT(pos[1]);
+ IMPORT(origin);
IMPORT(size);
IMPORT(size);
+ IMPORT_AS(origin,"pos");
+ IMPORT_AS(origin[0],"pos[0]");
+ IMPORT_AS(origin[1],"pos[1]");
+
return Layer_Composite::set_param(param,value);
}
return Layer_Composite::set_param(param,value);
}
@@
-102,9
+104,7
@@
ValueBase
CheckerBoard::get_param(const String ¶m)const
{
EXPORT(color);
CheckerBoard::get_param(const String ¶m)const
{
EXPORT(color);
- EXPORT(pos);
- EXPORT(pos[0]);
- EXPORT(pos[1]);
+ EXPORT(origin);
EXPORT(size);
EXPORT_NAME();
EXPORT_VERSION();
EXPORT(size);
EXPORT_NAME();
EXPORT_VERSION();
@@
-121,13
+121,13
@@
CheckerBoard::get_param_vocab()const
.set_local_name(_("Color"))
.set_description(_("Color of checkers"))
);
.set_local_name(_("Color"))
.set_description(_("Color of checkers"))
);
- ret.push_back(ParamDesc("
pos
")
- .set_local_name(_("O
ffset
"))
+ ret.push_back(ParamDesc("
origin
")
+ .set_local_name(_("O
rigin
"))
);
ret.push_back(ParamDesc("size")
.set_local_name(_("Size"))
.set_description(_("Size of checkers"))
);
ret.push_back(ParamDesc("size")
.set_local_name(_("Size"))
.set_description(_("Size of checkers"))
- .set_origin("
pos
")
+ .set_origin("
origin
")
);
return ret;
);
return ret;
@@
-160,7
+160,7
@@
CheckerBoard::get_color(Context context, const Point &getpos)const
return Color::blend(color,context.get_color(getpos),get_amount(),get_blend_method());
}
else
return Color::blend(color,context.get_color(getpos),get_amount(),get_blend_method());
}
else
- return
context.get_color(getpos
);
+ return
Color::blend(Color::alpha(),context.get_color(getpos),get_amount(),get_blend_method()
);
}
bool
}
bool