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

Add a function to get next or previous frame (from current) of an animation.

Browse source 
fix some values in constructors.
This commit is contained in:
Ali El Gariani 2007-04-11 14:31:56 +00:00
parent f8304f07a2
commit 19d49aecd6
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/animated.cpp
View file

@ -45,7 +45,7 @@ animated<T,T_void_value>::animated(int start_time) :
cycles_(false),
acceleration_(1),
last_update_tick_(0),
current_frame_key_(start_time)
current_frame_key_(0)
{
}
@ -58,7 +58,7 @@ animated<T,T_void_value>::animated(const std::vector<std::pair<int,T> > &cfg, in
cycles_(false),
acceleration_(1),
last_update_tick_(0),
current_frame_key_(start_time)
current_frame_key_(0)
{
typename std::vector< std::pair<int,T> >::const_iterator itor = cfg.begin();
@ -90,6 +90,7 @@ void animated<T,T_void_value>::start_animation(int start_time, bool cycles, doub
start_tick_ = last_update_tick_ + ( starting_frame_time_ - start_time);
cycles_ = cycles;
acceleration_ = acceleration;
//FIXME: allow negative acceleration -> reverse animation
if(acceleration_ <=0) acceleration_ = 1;
current_frame_key_= 0;
update_last_draw_time();
@ -183,6 +184,21 @@ const T& animated<T,T_void_value>::get_current_frame() const
return frames_[current_frame_key_].value_;
}
template<typename T, typename T_void_value>
const T& animated<T,T_void_value>::get_next_frame(int shift) const
{
if(frames_.empty() )
return void_value_;
int next_frame_key = current_frame_key_ + shift;;
if (!cycles_) {
if (next_frame_key < 0)
return get_first_frame();
else if (next_frame_key >= get_frames_count())
return get_last_frame();
}
return frames_[next_frame_key % get_frames_count()].value_;
}
template<typename T, typename T_void_value>
const int animated<T,T_void_value>::get_current_frame_begin_time() const
{

2
src/animated.hpp
View file

@ -62,6 +62,8 @@ public:
bool animation_would_finish() const;
int get_animation_time() const;
const T& get_current_frame() const;
// get the next frame (or the current + shift frames)
const T& get_next_frame(int shift = 1) const;
const int get_current_frame_begin_time() const;
const int get_current_frame_end_time() const;
const int get_current_frame_duration() const;