Cleaned up unit animation code
This commit is contained in:
Charles Dang
parent
663fde109a
commit
82a879725c
2 changed files with 938 additions and 819 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -27,209 +27,244 @@ class unit;
|
|||
|
||||
class unit_animation
|
||||
{
|
||||
/** Shouldn't be used so only declared. */
|
||||
unit_animation();
|
||||
public:
|
||||
enum variation_type { MATCH_FAIL=-10 , DEFAULT_ANIM=-9};
|
||||
MAKE_ENUM(hit_type,
|
||||
(HIT, "hit")
|
||||
(MISS, "miss")
|
||||
(KILL, "kill")
|
||||
(INVALID, "invalid")
|
||||
)
|
||||
public:
|
||||
unit_animation() = delete;
|
||||
explicit unit_animation(const config& cfg, const std::string& frame_string = "");
|
||||
|
||||
static const std::vector<std::string>& all_tag_names();
|
||||
static void fill_initial_animations( std::vector<unit_animation> & animations, const config & cfg);
|
||||
static void add_anims( std::vector<unit_animation> & animations, const config & cfg);
|
||||
enum variation_type {MATCH_FAIL = -10 , DEFAULT_ANIM = -9};
|
||||
|
||||
int matches(const display &disp,const map_location& loc,const map_location& second_loc,const unit* my_unit,const std::string & event="",const int value=0,hit_type hit=hit_type::INVALID,const attack_type* attack=nullptr,const attack_type* second_attack = nullptr, int value2 =0) const;
|
||||
MAKE_ENUM(hit_type,
|
||||
(HIT, "hit")
|
||||
(MISS, "miss")
|
||||
(KILL, "kill")
|
||||
(INVALID, "invalid")
|
||||
)
|
||||
|
||||
static void fill_initial_animations(std::vector<unit_animation>& animations, const config& cfg);
|
||||
static void add_anims(std::vector<unit_animation>& animations, const config& cfg);
|
||||
|
||||
const unit_frame& get_last_frame() const{ return unit_anim_.get_last_frame() ; }
|
||||
void add_frame(int duration, const unit_frame& value,bool force_change =false){ unit_anim_.add_frame(duration,value,force_change) ; }
|
||||
int matches(const display& disp, const map_location& loc, const map_location& second_loc, const unit* my_unit, const std::string& event = "", const int value = 0, hit_type hit = hit_type::INVALID, const attack_type* attack = nullptr, const attack_type* second_attack = nullptr, int value2 = 0) const;
|
||||
|
||||
bool need_update() const;
|
||||
bool need_minimal_update() const;
|
||||
bool animation_finished() const;
|
||||
bool animation_finished_potential() const;
|
||||
void update_last_draw_time();
|
||||
int get_begin_time() const;
|
||||
int get_end_time() const;
|
||||
int time_to_tick(int animation_time) const { return unit_anim_.time_to_tick(animation_time); }
|
||||
int get_animation_time() const{ return unit_anim_.get_animation_time() ; }
|
||||
int get_animation_time_potential() const{ return unit_anim_.get_animation_time_potential() ; }
|
||||
void start_animation(int start_time
|
||||
, const map_location &src = map_location::null_location()
|
||||
, const map_location &dst = map_location::null_location()
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const bool accelerate = true);
|
||||
void update_parameters(const map_location &src, const map_location &dst);
|
||||
void pause_animation();
|
||||
void restart_animation();
|
||||
int get_current_frame_begin_time() const{ return unit_anim_.get_current_frame_begin_time() ; }
|
||||
void redraw(frame_parameters& value, halo::manager & halo_man);
|
||||
void clear_haloes();
|
||||
bool invalidate(frame_parameters& value );
|
||||
std::string debug() const;
|
||||
friend std::ostream& operator << (std::ostream& outstream, const unit_animation& u_animation);
|
||||
const unit_frame& get_last_frame() const
|
||||
{
|
||||
return unit_anim_.get_last_frame();
|
||||
}
|
||||
|
||||
void add_frame(int duration, const unit_frame& value, bool force_change = false)
|
||||
{
|
||||
unit_anim_.add_frame(duration,value,force_change);
|
||||
}
|
||||
|
||||
bool need_update() const;
|
||||
bool need_minimal_update() const;
|
||||
bool animation_finished() const;
|
||||
bool animation_finished_potential() const;
|
||||
void update_last_draw_time();
|
||||
int get_begin_time() const;
|
||||
int get_end_time() const;
|
||||
|
||||
int time_to_tick(int animation_time) const
|
||||
{
|
||||
return unit_anim_.time_to_tick(animation_time);
|
||||
}
|
||||
|
||||
int get_animation_time() const
|
||||
{
|
||||
return unit_anim_.get_animation_time();
|
||||
}
|
||||
|
||||
int get_animation_time_potential() const
|
||||
{
|
||||
return unit_anim_.get_animation_time_potential();
|
||||
}
|
||||
|
||||
void start_animation(int start_time
|
||||
, const map_location& src = map_location::null_location()
|
||||
, const map_location& dst = map_location::null_location()
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const bool accelerate = true);
|
||||
|
||||
void update_parameters(const map_location& src, const map_location& dst);
|
||||
void pause_animation();
|
||||
void restart_animation();
|
||||
int get_current_frame_begin_time() const
|
||||
{
|
||||
return unit_anim_.get_current_frame_begin_time();
|
||||
|
||||
}
|
||||
void redraw(frame_parameters& value, halo::manager& halo_man);
|
||||
void clear_haloes();
|
||||
bool invalidate(frame_parameters& value );
|
||||
std::string debug() const;
|
||||
friend std::ostream& operator << (std::ostream& outstream, const unit_animation& u_animation);
|
||||
|
||||
friend class unit;
|
||||
friend class unit_drawer;
|
||||
|
||||
explicit unit_animation(const config &cfg, const std::string &frame_string = "");
|
||||
|
||||
protected:
|
||||
protected:
|
||||
// reserved to class unit, for the special case of redrawing the unit base frame
|
||||
const frame_parameters get_current_params(const frame_parameters & default_val = frame_parameters()) const { return unit_anim_.parameters(default_val); }
|
||||
private:
|
||||
explicit unit_animation(int start_time
|
||||
, const unit_frame &frame
|
||||
, const std::string& event = ""
|
||||
, const int variation=DEFAULT_ANIM
|
||||
, const frame_builder & builder = frame_builder());
|
||||
|
||||
class particule:public animated<unit_frame>
|
||||
const frame_parameters get_current_params(const frame_parameters& default_val = frame_parameters()) const
|
||||
{
|
||||
public:
|
||||
explicit particule(int start_time=0,const frame_builder &builder = frame_builder()) :
|
||||
animated<unit_frame>(start_time),
|
||||
accelerate(true),
|
||||
parameters_(builder),
|
||||
halo_id_(),
|
||||
last_frame_begin_time_(0),
|
||||
cycles_(false)
|
||||
{}
|
||||
explicit particule(const config& cfg
|
||||
, const std::string& frame_string ="frame");
|
||||
return unit_anim_.parameters(default_val);
|
||||
}
|
||||
|
||||
virtual ~particule();
|
||||
bool need_update() const;
|
||||
bool need_minimal_update() const;
|
||||
enum cycle_state { UNSET,CYCLE,NO_CYCLE};
|
||||
void override(int start_time
|
||||
, int duration
|
||||
, const cycle_state cycles
|
||||
, const std::string& highlight = ""
|
||||
, const std::string& blend_ratio =""
|
||||
, Uint32 blend_color = 0
|
||||
, const std::string& offset = ""
|
||||
, const std::string& layer = ""
|
||||
, const std::string& modifiers = "");
|
||||
void redraw( const frame_parameters& value,const map_location &src, const map_location &dst, halo::manager & halo_man);
|
||||
std::set<map_location> get_overlaped_hex(const frame_parameters& value,const map_location &src, const map_location &dst);
|
||||
void start_animation(int start_time);
|
||||
const frame_parameters parameters(const frame_parameters & default_val) const { return get_current_frame().merge_parameters(get_current_frame_time(),parameters_.parameters(get_animation_time()-get_begin_time()),default_val); }
|
||||
void clear_halo();
|
||||
bool accelerate;
|
||||
private:
|
||||
private:
|
||||
explicit unit_animation(int start_time
|
||||
, const unit_frame &frame
|
||||
, const std::string& event = ""
|
||||
, const int variation=DEFAULT_ANIM
|
||||
, const frame_builder & builder = frame_builder());
|
||||
|
||||
//animation params that can be locally overridden by frames
|
||||
frame_parsed_parameters parameters_;
|
||||
halo::handle halo_id_;
|
||||
int last_frame_begin_time_;
|
||||
bool cycles_;
|
||||
class particule : public animated<unit_frame>
|
||||
{
|
||||
public:
|
||||
explicit particule(int start_time = 0,const frame_builder& builder = frame_builder()) :
|
||||
animated<unit_frame>(start_time),
|
||||
accelerate(true),
|
||||
parameters_(builder),
|
||||
halo_id_(),
|
||||
last_frame_begin_time_(0),
|
||||
cycles_(false)
|
||||
{}
|
||||
explicit particule(const config& cfg, const std::string& frame_string ="frame");
|
||||
|
||||
virtual ~particule();
|
||||
bool need_update() const;
|
||||
bool need_minimal_update() const;
|
||||
enum cycle_state {UNSET, CYCLE, NO_CYCLE};
|
||||
void override(int start_time
|
||||
, int duration
|
||||
, const cycle_state cycles
|
||||
, const std::string& highlight = ""
|
||||
, const std::string& blend_ratio =""
|
||||
, Uint32 blend_color = 0
|
||||
, const std::string& offset = ""
|
||||
, const std::string& layer = ""
|
||||
, const std::string& modifiers = "");
|
||||
void redraw(const frame_parameters& value, const map_location& src, const map_location& dst, halo::manager& halo_man);
|
||||
std::set<map_location> get_overlaped_hex(const frame_parameters& value,const map_location& src, const map_location& dst);
|
||||
void start_animation(int start_time);
|
||||
const frame_parameters parameters(const frame_parameters& default_val) const
|
||||
{
|
||||
return get_current_frame().merge_parameters(get_current_frame_time(), parameters_.parameters(get_animation_time() - get_begin_time()), default_val);
|
||||
}
|
||||
void clear_halo();
|
||||
bool accelerate;
|
||||
|
||||
private:
|
||||
//animation params that can be locally overridden by frames
|
||||
frame_parsed_parameters parameters_;
|
||||
halo::handle halo_id_;
|
||||
int last_frame_begin_time_;
|
||||
bool cycles_;
|
||||
};
|
||||
t_translation::ter_list terrain_types_;
|
||||
std::vector<config> unit_filter_;
|
||||
std::vector<config> secondary_unit_filter_;
|
||||
std::vector<map_location::DIRECTION> directions_;
|
||||
int frequency_;
|
||||
int base_score_;
|
||||
std::vector<std::string> event_;
|
||||
std::vector<int> value_;
|
||||
std::vector<config> primary_attack_filter_;
|
||||
std::vector<config> secondary_attack_filter_;
|
||||
std::vector<hit_type> hits_;
|
||||
std::vector<int> value2_;
|
||||
std::map<std::string,particule> sub_anims_;
|
||||
particule unit_anim_;
|
||||
/* these are drawing parameters, but for efficiency reason they are in the anim and not in the particle */
|
||||
map_location src_;
|
||||
map_location dst_;
|
||||
// optimization
|
||||
bool invalidated_;
|
||||
bool play_offscreen_;
|
||||
std::set<map_location> overlaped_hex_;
|
||||
|
||||
t_translation::ter_list terrain_types_;
|
||||
std::vector<config> unit_filter_;
|
||||
std::vector<config> secondary_unit_filter_;
|
||||
std::vector<map_location::DIRECTION> directions_;
|
||||
int frequency_;
|
||||
int base_score_;
|
||||
std::vector<std::string> event_;
|
||||
std::vector<int> value_;
|
||||
std::vector<config> primary_attack_filter_;
|
||||
std::vector<config> secondary_attack_filter_;
|
||||
std::vector<hit_type> hits_;
|
||||
std::vector<int> value2_;
|
||||
std::map<std::string,particule> sub_anims_;
|
||||
particule unit_anim_;
|
||||
/* these are drawing parameters, but for efficiency reason they are in the anim and not in the particle */
|
||||
map_location src_;
|
||||
map_location dst_;
|
||||
// optimization
|
||||
bool invalidated_;
|
||||
bool play_offscreen_;
|
||||
std::set<map_location> overlaped_hex_;
|
||||
};
|
||||
|
||||
class unit_animator
|
||||
{
|
||||
public:
|
||||
unit_animator() :
|
||||
animated_units_(),
|
||||
start_time_(INT_MIN)
|
||||
{
|
||||
}
|
||||
public:
|
||||
unit_animator() :
|
||||
animated_units_(),
|
||||
start_time_(INT_MIN)
|
||||
{}
|
||||
|
||||
void add_animation(const unit* animated_unit
|
||||
, const unit_animation* animation
|
||||
, const map_location& src = map_location::null_location()
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0);
|
||||
|
||||
void add_animation(const unit* animated_unit
|
||||
, const unit_animation * animation
|
||||
, const map_location &src = map_location::null_location()
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0);
|
||||
void add_animation(const unit* animated_unit
|
||||
, const std::string& event
|
||||
, const map_location &src = map_location::null_location()
|
||||
, const map_location &dst = map_location::null_location()
|
||||
, const int value = 0
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const unit_animation::hit_type hit_type =
|
||||
unit_animation::hit_type::INVALID
|
||||
, const attack_type* attack = nullptr
|
||||
, const attack_type* second_attack = nullptr
|
||||
, int value2 = 0);
|
||||
void replace_anim_if_invalid(const unit* animated_unit
|
||||
, const std::string& event
|
||||
, const map_location &src = map_location::null_location()
|
||||
, const map_location &dst = map_location::null_location()
|
||||
, const int value = 0
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const unit_animation::hit_type hit_type =
|
||||
unit_animation::hit_type::INVALID
|
||||
, const attack_type* attack = nullptr
|
||||
, const attack_type* second_attack = nullptr
|
||||
, int value2 = 0);
|
||||
void start_animations();
|
||||
void pause_animation();
|
||||
void restart_animation();
|
||||
void clear(){start_time_ = INT_MIN ; animated_units_.clear();}
|
||||
void set_all_standing();
|
||||
void add_animation(const unit* animated_unit
|
||||
, const std::string& event
|
||||
, const map_location& src = map_location::null_location()
|
||||
, const map_location& dst = map_location::null_location()
|
||||
, const int value = 0
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const unit_animation::hit_type hit_type =
|
||||
unit_animation::hit_type::INVALID
|
||||
, const attack_type* attack = nullptr
|
||||
, const attack_type* second_attack = nullptr
|
||||
, int value2 = 0);
|
||||
|
||||
void replace_anim_if_invalid(const unit* animated_unit
|
||||
, const std::string& event
|
||||
, const map_location& src = map_location::null_location()
|
||||
, const map_location& dst = map_location::null_location()
|
||||
, const int value = 0
|
||||
, bool with_bars = false
|
||||
, const std::string& text = ""
|
||||
, const Uint32 text_color = 0
|
||||
, const unit_animation::hit_type hit_type = unit_animation::hit_type::INVALID
|
||||
, const attack_type* attack = nullptr
|
||||
, const attack_type* second_attack = nullptr
|
||||
, int value2 = 0);
|
||||
void start_animations();
|
||||
void pause_animation();
|
||||
void restart_animation();
|
||||
|
||||
bool would_end() const;
|
||||
int get_animation_time() const;
|
||||
int get_animation_time_potential() const;
|
||||
int get_end_time() const;
|
||||
void wait_for_end() const;
|
||||
void wait_until( int animation_time) const;
|
||||
private:
|
||||
struct anim_elem {
|
||||
void clear()
|
||||
{
|
||||
start_time_ = INT_MIN;
|
||||
animated_units_.clear();
|
||||
}
|
||||
|
||||
anim_elem() :
|
||||
my_unit(0),
|
||||
animation(0),
|
||||
text(),
|
||||
text_color(0),
|
||||
src(),
|
||||
with_bars(false)
|
||||
{}
|
||||
void set_all_standing();
|
||||
|
||||
unit_const_ptr my_unit;
|
||||
const unit_animation * animation;
|
||||
std::string text;
|
||||
Uint32 text_color;
|
||||
map_location src;
|
||||
bool with_bars;
|
||||
};
|
||||
bool would_end() const;
|
||||
int get_animation_time() const;
|
||||
int get_animation_time_potential() const;
|
||||
int get_end_time() const;
|
||||
void wait_for_end() const;
|
||||
void wait_until( int animation_time) const;
|
||||
|
||||
std::vector<anim_elem> animated_units_;
|
||||
int start_time_;
|
||||
private:
|
||||
struct anim_elem
|
||||
{
|
||||
anim_elem()
|
||||
: my_unit(0)
|
||||
, animation(0)
|
||||
, text()
|
||||
, text_color(0)
|
||||
, src()
|
||||
, with_bars(false)
|
||||
{}
|
||||
|
||||
unit_const_ptr my_unit;
|
||||
const unit_animation * animation;
|
||||
std::string text;
|
||||
Uint32 text_color;
|
||||
map_location src;
|
||||
bool with_bars;
|
||||
};
|
||||
|
||||
std::vector<anim_elem> animated_units_;
|
||||
int start_time_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue