mirror of
https://github.com/gwenhael-le-moine/c-urs_-toil-s.git
synced 2024-12-27 09:58:44 +01:00
move sprites into state.board_infos + load_sprites()
This commit is contained in:
parent
6323fb94ad
commit
240233cc0e
1 changed files with 25 additions and 19 deletions
|
@ -14,7 +14,7 @@ var direction = {
|
||||||
LEFT : 'l',
|
LEFT : 'l',
|
||||||
RIGHT : 'r'
|
RIGHT : 'r'
|
||||||
};
|
};
|
||||||
var sprites = { };
|
|
||||||
var state = {
|
var state = {
|
||||||
moving : cell.BALL,
|
moving : cell.BALL,
|
||||||
distance_travelled : 0,
|
distance_travelled : 0,
|
||||||
|
@ -86,13 +86,13 @@ function switch_actor( state ) {
|
||||||
var ctx= state.board_infos.canvas.getContext( '2d' ); //$() returns a jquery object, [0] to get the canvas itself
|
var ctx= state.board_infos.canvas.getContext( '2d' ); //$() returns a jquery object, [0] to get the canvas itself
|
||||||
|
|
||||||
// redraw ball
|
// redraw ball
|
||||||
ctx.drawImage( ( state.moving == cell.BALL ) ? sprites.ball_selected : sprites.ball,
|
ctx.drawImage( ( state.moving == cell.BALL ) ? state.board_infos.sprites.ball_selected : state.board_infos.sprites.ball,
|
||||||
ball_pos[ 0 ] * state.board_infos.cell_dimensions.width,
|
ball_pos[ 0 ] * state.board_infos.cell_dimensions.width,
|
||||||
ball_pos[ 1 ] * state.board_infos.cell_dimensions.height,
|
ball_pos[ 1 ] * state.board_infos.cell_dimensions.height,
|
||||||
state.board_infos.cell_dimensions.width,
|
state.board_infos.cell_dimensions.width,
|
||||||
state.board_infos.cell_dimensions.height );
|
state.board_infos.cell_dimensions.height );
|
||||||
// redraw cube
|
// redraw cube
|
||||||
ctx.drawImage( ( state.moving == cell.CUBE ) ? sprites.cube_selected : sprites.cube,
|
ctx.drawImage( ( state.moving == cell.CUBE ) ? state.board_infos.sprites.cube_selected : state.board_infos.sprites.cube,
|
||||||
cube_pos[ 0 ] * state.board_infos.cell_dimensions.width,
|
cube_pos[ 0 ] * state.board_infos.cell_dimensions.width,
|
||||||
cube_pos[ 1 ] * state.board_infos.cell_dimensions.height,
|
cube_pos[ 1 ] * state.board_infos.cell_dimensions.height,
|
||||||
state.board_infos.cell_dimensions.width,
|
state.board_infos.cell_dimensions.width,
|
||||||
|
@ -111,11 +111,11 @@ function full_display_on_canvas( state, canvas_elt ) {
|
||||||
var c = get_cell( state, j, i );
|
var c = get_cell( state, j, i );
|
||||||
var sprite;
|
var sprite;
|
||||||
switch( c ) {
|
switch( c ) {
|
||||||
case "@": sprite = ( state.moving == cell.BALL ) ? sprites.ball_selected : sprites.ball; break;
|
case "@": sprite = ( state.moving == cell.BALL ) ? state.board_infos.sprites.ball_selected : state.board_infos.sprites.ball; break;
|
||||||
case "H": sprite = ( state.moving == cell.CUBE ) ? sprites.cube_selected : sprites.cube; break;
|
case "H": sprite = ( state.moving == cell.CUBE ) ? state.board_infos.sprites.cube_selected : state.board_infos.sprites.cube; break;
|
||||||
case "#": sprite = sprites.wall; break;
|
case "#": sprite = state.board_infos.sprites.wall; break;
|
||||||
case "x": sprite = sprites.gift; break;
|
case "x": sprite = state.board_infos.sprites.gift; break;
|
||||||
case " ": sprite = sprites.void; break;
|
case " ": sprite = state.board_infos.sprites.void; break;
|
||||||
}
|
}
|
||||||
ctx.drawImage( sprite,
|
ctx.drawImage( sprite,
|
||||||
j * state.board_infos.cell_dimensions.width,
|
j * state.board_infos.cell_dimensions.width,
|
||||||
|
@ -194,7 +194,7 @@ function make_a_move( state, elt, where ) {
|
||||||
{
|
{
|
||||||
state = set_cell( state, item_coord[ 0 ], item_coord[ 1 ], cell.VOID ); /* void the origin cell */
|
state = set_cell( state, item_coord[ 0 ], item_coord[ 1 ], cell.VOID ); /* void the origin cell */
|
||||||
// voiding origin cell on canvas
|
// voiding origin cell on canvas
|
||||||
ctx.drawImage( sprites.void,
|
ctx.drawImage( state.board_infos.sprites.void,
|
||||||
item_coord[ 0 ] * state.board_infos.cell_dimensions.width,
|
item_coord[ 0 ] * state.board_infos.cell_dimensions.width,
|
||||||
item_coord[ 1 ] * state.board_infos.cell_dimensions.height,
|
item_coord[ 1 ] * state.board_infos.cell_dimensions.height,
|
||||||
state.board_infos.cell_dimensions.width,
|
state.board_infos.cell_dimensions.width,
|
||||||
|
@ -205,7 +205,7 @@ function make_a_move( state, elt, where ) {
|
||||||
|
|
||||||
state = set_cell( state, item_coord[ 0 ], item_coord[ 1 ], state.moving ); /* move actor into target cell */
|
state = set_cell( state, item_coord[ 0 ], item_coord[ 1 ], state.moving ); /* move actor into target cell */
|
||||||
// drawing target cell on canvas
|
// drawing target cell on canvas
|
||||||
ctx.drawImage( ( state.moving == cell.BALL ) ? sprites.ball_selected : sprites.cube_selected,
|
ctx.drawImage( ( state.moving == cell.BALL ) ? state.board_infos.sprites.ball_selected : state.board_infos.sprites.cube_selected,
|
||||||
item_coord[ 0 ] * state.board_infos.cell_dimensions.width,
|
item_coord[ 0 ] * state.board_infos.cell_dimensions.width,
|
||||||
item_coord[ 1 ] * state.board_infos.cell_dimensions.height,
|
item_coord[ 1 ] * state.board_infos.cell_dimensions.height,
|
||||||
state.board_infos.cell_dimensions.width,
|
state.board_infos.cell_dimensions.width,
|
||||||
|
@ -313,23 +313,27 @@ function start_loop( state, elt ) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function initialize_a_star( elt ) {
|
function load_sprites( theme ) {
|
||||||
// load sprites
|
var sprites = { };
|
||||||
sprites.ball = new Image();
|
sprites.ball = new Image();
|
||||||
sprites.ball.src = "themes/HP48/tex_ball.png";
|
sprites.ball.src = "themes/" + theme + "/tex_ball.png";
|
||||||
sprites.ball_selected = new Image();
|
sprites.ball_selected = new Image();
|
||||||
sprites.ball_selected.src = "themes/HP48/tex_ball_selected.png";
|
sprites.ball_selected.src = "themes/" + theme + "/tex_ball_selected.png";
|
||||||
sprites.cube = new Image();
|
sprites.cube = new Image();
|
||||||
sprites.cube.src = "themes/HP48/tex_cube.png";
|
sprites.cube.src = "themes/" + theme + "/tex_cube.png";
|
||||||
sprites.cube_selected = new Image();
|
sprites.cube_selected = new Image();
|
||||||
sprites.cube_selected.src = "themes/HP48/tex_cube_selected.png";
|
sprites.cube_selected.src = "themes/" + theme + "/tex_cube_selected.png";
|
||||||
sprites.wall = new Image();
|
sprites.wall = new Image();
|
||||||
sprites.wall.src = "themes/HP48/tex_wall.png";
|
sprites.wall.src = "themes/" + theme + "/tex_wall.png";
|
||||||
sprites.void = new Image();
|
sprites.void = new Image();
|
||||||
sprites.void.src = "themes/HP48/tex_empty.png";
|
sprites.void.src = "themes/" + theme + "/tex_empty.png";
|
||||||
sprites.gift = new Image();
|
sprites.gift = new Image();
|
||||||
sprites.gift.src = "themes/HP48/tex_gift.png";
|
sprites.gift.src = "themes/" + theme + "/tex_gift.png";
|
||||||
|
|
||||||
|
return sprites;
|
||||||
|
}
|
||||||
|
|
||||||
|
function initialize_a_star( elt ) {
|
||||||
var starhtml = '<div class="gstar">';
|
var starhtml = '<div class="gstar">';
|
||||||
starhtml += '<aside id="help">' + format_help( state ) + '</aside>';
|
starhtml += '<aside id="help">' + format_help( state ) + '</aside>';
|
||||||
starhtml += '<canvas id="starboard" width="320" height="180"></canvas>';
|
starhtml += '<canvas id="starboard" width="320" height="180"></canvas>';
|
||||||
|
@ -338,6 +342,8 @@ function initialize_a_star( elt ) {
|
||||||
|
|
||||||
$( elt ).html( starhtml );
|
$( elt ).html( starhtml );
|
||||||
|
|
||||||
|
state.board_infos.sprites = load_sprites( "HP48" );
|
||||||
|
|
||||||
state.board_infos.canvas = $( elt + " #starboard" )[ 0 ];
|
state.board_infos.canvas = $( elt + " #starboard" )[ 0 ];
|
||||||
state.board_infos.offset = $( elt + " #starboard" ).offset();
|
state.board_infos.offset = $( elt + " #starboard" ).offset();
|
||||||
state.board_infos.dimensions = { };
|
state.board_infos.dimensions = { };
|
||||||
|
|
Loading…
Reference in a new issue