factorized drawing cell on canvas

This commit is contained in:
Gwenhael Le Moine 2011-07-14 10:47:17 +02:00
parent 7113035f06
commit 257ff69520

View file

@ -118,23 +118,23 @@ function initialize_a_star( dom_container ) {
return state; return state;
} }
function draw_cell( sprite, x, y ) {
DOM_infos.canvas.context.drawImage( sprite,
x * level_infos.cell.width,
y * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
}
function switch_actor( ) { function switch_actor( ) {
state.moving = ( state.moving == cell.BALL ) ? cell.CUBE : cell.BALL; state.moving = ( state.moving == cell.BALL ) ? cell.CUBE : cell.BALL;
var ball_pos = get_pos( cell.BALL ); var ball_pos = get_pos( cell.BALL );
var cube_pos = get_pos( cell.CUBE ); var cube_pos = get_pos( cell.CUBE );
// redraw ball // redraw ball
DOM_infos.canvas.context.drawImage( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.ball, draw_cell( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.ball, ball_pos[ 0 ], ball_pos[ 1 ] );
ball_pos[ 0 ] * level_infos.cell.width,
ball_pos[ 1 ] * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
// redraw cube // redraw cube
DOM_infos.canvas.context.drawImage( ( state.moving == cell.CUBE ) ? assets.sprites.cube_selected : assets.sprites.cube, draw_cell( ( state.moving == cell.CUBE ) ? assets.sprites.cube_selected : assets.sprites.cube, cube_pos[ 0 ], cube_pos[ 1 ] );
cube_pos[ 0 ] * level_infos.cell.width,
cube_pos[ 1 ] * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
return state; return state;
} }
@ -154,11 +154,7 @@ function initialize_a_star( dom_container ) {
case "x": sprite = assets.sprites.gift; break; case "x": sprite = assets.sprites.gift; break;
case " ": sprite = assets.sprites.void; break; case " ": sprite = assets.sprites.void; break;
} }
DOM_infos.canvas.context.drawImage( sprite, draw_cell( sprite, j, i );
j * level_infos.cell.width,
i * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
} }
} }
} }
@ -228,22 +224,14 @@ function initialize_a_star( dom_container ) {
{ {
state = set_cell( item_coord[ 0 ], item_coord[ 1 ], cell.VOID ); /* void the origin cell */ state = set_cell( item_coord[ 0 ], item_coord[ 1 ], cell.VOID ); /* void the origin cell */
// voiding origin cell on canvas // voiding origin cell on canvas
DOM_infos.canvas.context.drawImage( assets.sprites.void, draw_cell( assets.sprites.void, item_coord[ 0 ], item_coord[ 1 ] );
item_coord[ 0 ] * level_infos.cell.width,
item_coord[ 1 ] * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
item_coord[ 0 ] += motion[ 0 ]; /* move coordinate */ item_coord[ 0 ] += motion[ 0 ]; /* move coordinate */
item_coord[ 1 ] += motion[ 1 ]; /* to those of target cells */ item_coord[ 1 ] += motion[ 1 ]; /* to those of target cells */
state = set_cell( item_coord[ 0 ], item_coord[ 1 ], state.moving ); /* move actor into target cell */ state = set_cell( item_coord[ 0 ], item_coord[ 1 ], state.moving ); /* move actor into target cell */
// drawing target cell on canvas // drawing target cell on canvas
DOM_infos.canvas.context.drawImage( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.cube_selected, draw_cell( ( state.moving == cell.BALL ) ? assets.sprites.ball_selected : assets.sprites.cube_selected, item_coord[ 0 ], item_coord[ 1 ] );
item_coord[ 0 ] * level_infos.cell.width,
item_coord[ 1 ] * level_infos.cell.height,
level_infos.cell.width,
level_infos.cell.height );
state.distance_travelled++; /* increment distance_travelled */ state.distance_travelled++; /* increment distance_travelled */
} }