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

Unit/Animation: make frame_parameters a proper aggregate

Browse source
This commit is contained in:
Charles Dang 2024-08-15 21:31:26 -04:00
parent 824df30778
commit 3dad5f4e62
2 changed files with 15 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/units/frame.cpp
View file

@ -24,24 +24,6 @@
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
frame_parameters::frame_parameters()
: duration(0)
, halo_x(0)
, halo_y(0)
, blend_ratio(0.0)
, highlight_ratio(1.0)
, offset(0)
, submerge(0.0)
, x(0)
, y(0)
, directional_x(0)
, directional_y(0)
, auto_vflip(boost::logic::indeterminate)
, auto_hflip(boost::logic::indeterminate)
, primary_frame(boost::logic::indeterminate)
, drawing_layer(get_abs_frame_layer(drawing_layer::unit_default))
{}
frame_builder::frame_builder()
: duration_(1)
, auto_vflip_(boost::logic::indeterminate)

32
src/units/frame.hpp
View file

@ -40,9 +40,7 @@ constexpr int get_abs_frame_layer(drawing_layer layer)
/** All parameters from a frame at a given instant */
struct frame_parameters
{
frame_parameters();
int duration;
int duration = 0;
image::locator image;
image::locator image_diagonal;
@ -50,8 +48,8 @@ struct frame_parameters
std::string image_mod;
std::string halo;
int halo_x;
int halo_y;
int halo_x = 0;
int halo_y = 0;
std::string halo_mod;
std::string sound;
@ -60,21 +58,21 @@ struct frame_parameters
utils::optional<color_t> text_color;
utils::optional<color_t> blend_with;
double blend_ratio;
double highlight_ratio;
double offset;
double submerge;
double blend_ratio = 0.0;
double highlight_ratio = 1.0;
double offset = 0.0;
double submerge = 0.0;
int x;
int y;
int directional_x;
int directional_y;
int x = 0;
int y = 0;
int directional_x = 0;
int directional_y = 0;
boost::tribool auto_vflip;
boost::tribool auto_hflip;
boost::tribool primary_frame;
boost::tribool auto_vflip = boost::logic::indeterminate;
boost::tribool auto_hflip = boost::logic::indeterminate;
boost::tribool primary_frame = boost::logic::indeterminate;
int drawing_layer;
int drawing_layer = get_abs_frame_layer(drawing_layer::unit_default);
};
/**