0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add blend with and blend color parameter

Browse source
This commit is contained in:
Jérémy Rosen 2006-09-10 10:36:59 +00:00
parent 350b7ed49b
commit 0ba1ecfb93
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -47,6 +47,8 @@ Version 1.3-svn:
continuously in an animation
* alpha blending is our first progressive parameter
* new parameter in frames, offset. It allows to specify the position
* new parameter in frames blend_color and blend_ratio, to mix a color in
the anim
relative to the faced hex
* units can now have a recruit animation that will be played on unit
recruit.

4
src/unit_frame.cpp
View file

@ -13,6 +13,7 @@
#include <global.hpp>
#include <unit_frame.hpp>
#include <display.hpp>
progressive_string::progressive_string(const std::string & data,int duration)
{
const std::vector<std::string> first_pass = utils::split(data);
@ -232,7 +233,8 @@ unit_frame::unit_frame(const config& cfg)
halo_ = progressive_string(cfg["halo"],end_time_-begin_time_);
halo_x_ = progressive_int(cfg["halo_x"],end_time_ -begin_time_);
halo_y_ = progressive_int(cfg["halo_y"],end_time_ -begin_time_);
blend_with_= 0;
std::vector<std::string> tmp_blend=utils::split(cfg["blend_color"]);
if(tmp_blend.size() ==3) blend_with_= display::rgb(atoi(tmp_blend[0].c_str()),atoi(tmp_blend[1].c_str()),atoi(tmp_blend[2].c_str()));
blend_ratio_ = progressive_double(cfg["blend_ratio"],end_time_-begin_time_);
highlight_ratio_ = progressive_double(cfg["alpha"].empty()?"1.0":cfg["alpha"],end_time_-begin_time_);
offset_ = progressive_double(cfg["offset"].empty()?"-20":cfg["offset"],end_time_-begin_time_);