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

move the drawing code down into the frame object

Browse source
This commit is contained in:
Jérémy Rosen 2008-03-14 18:41:51 +00:00
parent f29f87f391
commit 9840d115fa
4 changed files with 94 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sound.hpp
View file

@ -17,6 +17,7 @@
#include <string>
#include <vector>
#include "config.hpp"
#include "events.hpp"
namespace sound {

85
src/unit_animation.cpp
View file

@ -777,91 +777,12 @@ void unit_animation::redraw()
}
void unit_animation::particule::redraw()
{
const int xsrc = game_display::get_singleton()->get_location_x(src_);
const int ysrc = game_display::get_singleton()->get_location_y(src_);
const int xdst = game_display::get_singleton()->get_location_x(dst_);
const int ydst = game_display::get_singleton()->get_location_y(dst_);
const gamemap::location::DIRECTION direction = src_.get_relative_dir(dst_);
double tmp_offset = offset();
int d2 = game_display::get_singleton()->hex_size() / 2;
update_last_draw_time(accelerate ? game_display::get_singleton()->turbo_speed() : 1.0);
const unit_frame& current_frame= get_current_frame();
if(get_current_frame_begin_time() != last_frame_begin_time_ ) {
// stuff sthat should be done only once per frame
if(!current_frame.sound().empty() ) {
sound::play_sound(current_frame.sound());
}
if(!current_frame.text().first.empty() ) {
game_display::get_singleton()->float_label(src_,current_frame.text().first,
(current_frame.text().second & 0x00FF0000) >> 16,
(current_frame.text().second & 0x0000FF00) >> 8,
(current_frame.text().second & 0x000000FF) >> 0);
}
last_frame_begin_time_ = get_current_frame_begin_time();
}
image::locator image_loc;
if(direction != gamemap::location::NORTH && direction != gamemap::location::SOUTH) {
image_loc = current_frame.image_diagonal();
}
if(image_loc.is_void()) { // invalid diag image, or not diagonal
image_loc = current_frame.image();
}
surface image;
if(!image_loc.is_void() && image_loc.get_filename() != "") { // invalid diag image, or not diagonal
image=image::get_image(image_loc,
image::SCALED_TO_ZOOM,
false
);
}
const int x = static_cast<int>(tmp_offset * xdst + (1.0-tmp_offset) * xsrc) + d2 ;
const int y = static_cast<int>(tmp_offset * ydst + (1.0-tmp_offset) * ysrc) + d2;
if (image != NULL) {
bool facing_west = direction == gamemap::location::NORTH_WEST || direction == gamemap::location::SOUTH_WEST;
bool facing_north = direction == gamemap::location::NORTH_WEST || direction == gamemap::location::NORTH || direction == gamemap::location::NORTH_EAST;
game_display::get_singleton()->render_unit_image(x- image->w/2, y - image->h/2, false, gamemap::get_drawing_order(src_), image, facing_west, false,
highlight_ratio(), blend_with(0), blend_ratio(),0,!facing_north);
}
halo::remove(halo_id_);
halo_id_ = halo::NO_HALO;
if(!halo().empty()) {
halo::ORIENTATION orientation;
switch(direction)
{
case gamemap::location::NORTH:
case gamemap::location::NORTH_EAST:
orientation = halo::NORMAL;
break;
case gamemap::location::SOUTH_EAST:
case gamemap::location::SOUTH:
orientation = halo::VREVERSE;
break;
case gamemap::location::SOUTH_WEST:
orientation = halo::HVREVERSE;
break;
case gamemap::location::NORTH_WEST:
orientation = halo::HREVERSE;
break;
case gamemap::location::NDIRECTIONS:
default:
orientation = halo::NORMAL;
break;
}
if(direction != gamemap::location::SOUTH_WEST && direction != gamemap::location::NORTH_WEST) {
halo_id_ = halo::add(x+halo_x(),
y+halo_y(),
halo(),
gamemap::location(-1, -1),
orientation);
} else {
halo_id_ = halo::add(x-halo_x(),
y+halo_y(),
halo(),
gamemap::location(-1, -1),
orientation);
}
current_frame.redraw(get_current_frame_time(),true,src_,dst_,&halo_id_);
} else {
current_frame.redraw(get_current_frame_time(),false,src_,dst_,&halo_id_);
}
}

88
src/unit_frame.cpp
View file

@ -16,6 +16,8 @@
//!
#include "global.hpp"
#include "sound.hpp"
#include "halo.hpp"
#include <cassert>
// NOTE: global.hpp must be first!
@ -264,3 +266,89 @@ bool frame_builder::need_update() const
return false;
}
void unit_frame::redraw(const int frame_time,bool first_time,const gamemap::location & src,const gamemap::location & dst,int*halo_id)const
{
const int xsrc = game_display::get_singleton()->get_location_x(src);
const int ysrc = game_display::get_singleton()->get_location_y(src);
const int xdst = game_display::get_singleton()->get_location_x(dst);
const int ydst = game_display::get_singleton()->get_location_y(dst);
const gamemap::location::DIRECTION direction = src.get_relative_dir(dst);
double tmp_offset = offset(frame_time);
int d2 = game_display::get_singleton()->hex_size() / 2;
if(first_time ) {
// stuff sthat should be done only once per frame
if(!sound().empty() ) {
sound::play_sound(sound());
}
if(!text().first.empty() ) {
game_display::get_singleton()->float_label(src,text().first,
(text().second & 0x00FF0000) >> 16,
(text().second & 0x0000FF00) >> 8,
(text().second & 0x000000FF) >> 0);
}
}
image::locator image_loc;
if(direction != gamemap::location::NORTH && direction != gamemap::location::SOUTH) {
image_loc = image_diagonal();
}
if(image_loc.is_void()) { // invalid diag image, or not diagonal
image_loc = image();
}
surface image;
if(!image_loc.is_void() && image_loc.get_filename() != "") { // invalid diag image, or not diagonal
image=image::get_image(image_loc,
image::SCALED_TO_ZOOM,
false
);
}
const int x = static_cast<int>(tmp_offset * xdst + (1.0-tmp_offset) * xsrc) + d2 ;
const int y = static_cast<int>(tmp_offset * ydst + (1.0-tmp_offset) * ysrc) + d2;
if (image != NULL) {
bool facing_west = direction == gamemap::location::NORTH_WEST || direction == gamemap::location::SOUTH_WEST;
bool facing_north = direction == gamemap::location::NORTH_WEST || direction == gamemap::location::NORTH || direction == gamemap::location::NORTH_EAST;
game_display::get_singleton()->render_unit_image(x- image->w/2, y - image->h/2, false, gamemap::get_drawing_order(src), image, facing_west, false,
highlight_ratio(frame_time), blend_with(0), blend_ratio(frame_time),0,!facing_north);
}
halo::remove(*halo_id);
*halo_id = halo::NO_HALO;
if(!halo(frame_time).empty()) {
halo::ORIENTATION orientation;
switch(direction)
{
case gamemap::location::NORTH:
case gamemap::location::NORTH_EAST:
orientation = halo::NORMAL;
break;
case gamemap::location::SOUTH_EAST:
case gamemap::location::SOUTH:
orientation = halo::VREVERSE;
break;
case gamemap::location::SOUTH_WEST:
orientation = halo::HVREVERSE;
break;
case gamemap::location::NORTH_WEST:
orientation = halo::HREVERSE;
break;
case gamemap::location::NDIRECTIONS:
default:
orientation = halo::NORMAL;
break;
}
if(direction != gamemap::location::SOUTH_WEST && direction != gamemap::location::NORTH_WEST) {
*halo_id = halo::add(x+halo_x(frame_time),
y+halo_y(frame_time),
halo(frame_time),
gamemap::location(-1, -1),
orientation);
} else {
*halo_id = halo::add(x-halo_x(frame_time),
y+halo_y(frame_time),
halo(frame_time),
gamemap::location(-1, -1),
orientation);
}
}
}

2
src/unit_frame.hpp
View file

@ -22,6 +22,7 @@
#include "util.hpp"
#include "image.hpp"
#include "serialization/string_utils.hpp"
#include "game_display.hpp"
class config;
@ -134,6 +135,7 @@ class unit_frame: public frame_builder{
public:
// Constructors
unit_frame(const frame_builder builder=frame_builder()):frame_builder(builder){initialization_finished=true;};
void redraw(const int frame_time,bool first_time,const gamemap::location & src,const gamemap::location & dst,int*halo_id)const;
};