sander/rust-2048
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded to latest rust

Browse source
This commit is contained in:
Coeuvre 2014-07-30 09:30:44 +08:00
parent d1b0cf14e2
commit 51da5b9a9c
4 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -2,9 +2,7 @@
name = "rust-2048" name = "rust-2048"
version = "0.0.0" version = "0.0.0"
readme = "README.md"
authors = ["coeuvre <coeuvre@gmail.com>"] authors = ["coeuvre <coeuvre@gmail.com>"]
tags = []
[[bin]] [[bin]]

12
src/board.rs
View file

@ -60,12 +60,12 @@ impl<'a> Board<'a> {
let mut tiles_need_removed = HashSet::<uint>::new(); let mut tiles_need_removed = HashSet::<uint>::new();
let mut tiles_need_added = Vec::<Tile>::new(); let mut tiles_need_added = Vec::<Tile>::new();
for i in range(0, self.tiles.len()) { for i in range(0, self.tiles.len()) {
let tile1 = self.tiles.get(i); let tile1 = &self.tiles[i];
if tile1.status != TileStatic { if tile1.status != TileStatic {
continue; continue;
} }
for j in range(i + 1, self.tiles.len()) { for j in range(i + 1, self.tiles.len()) {
let tile2 = self.tiles.get(j); let tile2 = &self.tiles[j];
if tile2.status != TileStatic if tile2.status != TileStatic
|| tile1.tile_x != tile2.tile_x || tile1.tile_x != tile2.tile_x
|| tile1.tile_y != tile2.tile_y { || tile1.tile_y != tile2.tile_y {
@ -84,7 +84,7 @@ impl<'a> Board<'a> {
let mut tiles = Vec::<Tile>::new(); let mut tiles = Vec::<Tile>::new();
for i in range(0, self.tiles.len()) { for i in range(0, self.tiles.len()) {
if !tiles_need_removed.contains(&i) { if !tiles_need_removed.contains(&i) {
tiles.push(*self.tiles.get(i)); tiles.push(self.tiles[i]);
} }
} }
self.tiles = tiles.append(tiles_need_added.as_slice()); self.tiles = tiles.append(tiles_need_added.as_slice());
@ -368,9 +368,9 @@ impl<'a> Board<'a> {
for _ in range(0, self.settings.tile_width) { for _ in range(0, self.settings.tile_width) {
c.view() c.view()
.rect(x, y, self.settings.tile_size, self.settings.tile_size) .rect(x, y, self.settings.tile_size, self.settings.tile_size)
.rgba(self.settings.tiles_colors.get(0)[0], .rgba(self.settings.tiles_colors[0][0],
self.settings.tiles_colors.get(0)[1], self.settings.tiles_colors[0][1],
self.settings.tiles_colors.get(0)[2], self.settings.tiles_colors[0][2],
1.0) 1.0)
.draw(gl); .draw(gl);

64
src/settings.rs
View file

@ -52,9 +52,9 @@ impl Settings {
let mut tiles_colors = Vec::<[f32, ..3]>::new(); let mut tiles_colors = Vec::<[f32, ..3]>::new();
for color in s.tiles_colors.iter() { for color in s.tiles_colors.iter() {
tiles_colors.push([ tiles_colors.push([
*color.get(0) / 255.0, color[0] / 255.0,
*color.get(1) / 255.0, color[1] / 255.0,
*color.get(2) / 255.0, color[2] / 255.0,
]); ]);
} }
Settings { Settings {
@ -66,9 +66,9 @@ impl Settings {
(s.board_padding * 2.0 + board_size[1] + s.board_offset_y) as u32, (s.board_padding * 2.0 + board_size[1] + s.board_offset_y) as u32,
], ],
window_background_color: [ window_background_color: [
*s.window_background_color.get(0) / 255.0, s.window_background_color[0] / 255.0,
*s.window_background_color.get(1) / 255.0, s.window_background_color[1] / 255.0,
*s.window_background_color.get(2) / 255.0, s.window_background_color[2] / 255.0,
], ],
board_padding: s.board_padding, board_padding: s.board_padding,
board_size: board_size, board_size: board_size,
@ -78,50 +78,50 @@ impl Settings {
tile_size: s.tile_size, tile_size: s.tile_size,
tile_padding: s.tile_padding, tile_padding: s.tile_padding,
tile_background_color: [ tile_background_color: [
*s.tile_background_color.get(0) / 255.0, s.tile_background_color[0] / 255.0,
*s.tile_background_color.get(1) / 255.0, s.tile_background_color[1] / 255.0,
*s.tile_background_color.get(2) / 255.0, s.tile_background_color[2] / 255.0,
], ],
tiles_colors: tiles_colors, tiles_colors: tiles_colors,
tile_unknow_color: [ tile_unknow_color: [
*s.tile_unknow_color.get(0) / 255.0, s.tile_unknow_color[0] / 255.0,
*s.tile_unknow_color.get(1) / 255.0, s.tile_unknow_color[1] / 255.0,
*s.tile_unknow_color.get(2) / 255.0, s.tile_unknow_color[2] / 255.0,
], ],
tile_move_time: s.tile_move_time, tile_move_time: s.tile_move_time,
tile_new_time: s.tile_new_time, tile_new_time: s.tile_new_time,
tile_combine_time: s.tile_combine_time, tile_combine_time: s.tile_combine_time,
best_rect: [ best_rect: [
*s.best_rect.get(0), s.best_rect[0],
*s.best_rect.get(1), s.best_rect[1],
*s.best_rect.get(2), s.best_rect[2],
*s.best_rect.get(3), s.best_rect[3],
], ],
score_rect: [ score_rect: [
*s.score_rect.get(0), s.score_rect[0],
*s.score_rect.get(1), s.score_rect[1],
*s.score_rect.get(2), s.score_rect[2],
*s.score_rect.get(3), s.score_rect[3],
], ],
label_color: [ label_color: [
*s.label_color.get(0) / 255.0, s.label_color[0] / 255.0,
*s.label_color.get(1) / 255.0, s.label_color[1] / 255.0,
*s.label_color.get(2) / 255.0, s.label_color[2] / 255.0,
], ],
button_color: [ button_color: [
*s.button_color.get(0) / 255.0, s.button_color[0] / 255.0,
*s.button_color.get(1) / 255.0, s.button_color[1] / 255.0,
*s.button_color.get(2) / 255.0, s.button_color[2] / 255.0,
], ],
text_dark_color: [ text_dark_color: [
*s.text_dark_color.get(0) / 255.0, s.text_dark_color[0] / 255.0,
*s.text_dark_color.get(1) / 255.0, s.text_dark_color[1] / 255.0,
*s.text_dark_color.get(2) / 255.0, s.text_dark_color[2] / 255.0,
], ],
text_light_color: [ text_light_color: [
*s.text_light_color.get(0) / 255.0, s.text_light_color[0] / 255.0,
*s.text_light_color.get(1) / 255.0, s.text_light_color[1] / 255.0,
*s.text_light_color.get(2) / 255.0, s.text_light_color[2] / 255.0,
], ],
} }
} }

2
src/tile.rs
View file

@ -139,7 +139,7 @@ impl<'a> Tile<'a> {
fn get_color(&self) -> [f32, ..3] { fn get_color(&self) -> [f32, ..3] {
let i = (self.score as f64).log2() as uint; let i = (self.score as f64).log2() as uint;
if i > 0 && i < self.settings.tiles_colors.len() { if i > 0 && i < self.settings.tiles_colors.len() {
*self.settings.tiles_colors.get(i) self.settings.tiles_colors[i]
} else { } else {
self.settings.tile_unknow_color self.settings.tile_unknow_color
} }