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

Merge pull request #5 from Potpourri/master

Browse source 
Draw comments and replace 'fill', 'clear' with 'draw'
This commit is contained in:
Coeuvre Wong 2014-06-26 17:54:16 +08:00
commit f70dde3ca5
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/app.rs
View file

@ -53,25 +53,26 @@ impl<'a> App<'a> {
self.settings.label_color[1],
self.settings.label_color[2],
1.0)
.fill(&mut self.gl);
.draw(&mut self.gl);
//let comment1_offset_y = self.settings.comment1_offset_y;
//let comment1 = self.comment1.as_ref().unwrap();
//self.render_comment(comment1, comment1_offset_y, c);
//self.render_comment(self.comment2.get_ref(), self.settings.comment2_offset_y, c);
let comment1_offset_y = self.settings.comment1_offset_y;
let comment1 = self.comment1.as_ref().unwrap();
App::render_comment(self.settings, comment1, comment1_offset_y, c, &mut self.gl);
let comment2_offset_y = self.settings.comment2_offset_y;
let comment2 = self.comment2.as_ref().unwrap();
App::render_comment(self.settings, comment2, comment2_offset_y, c, &mut self.gl);
}
fn render_comment(&mut self, comment: &Texture, y: f64, c: &Context) {
fn render_comment(settings: &Settings, comment: &Texture, y: f64, c: &Context, gl: &mut Gl) {
let (width, height) = comment.get_size();
let w = self.settings.window_size[0] as f64 - 2.0 * self.settings.board_padding;
let w = settings.window_size[0] as f64 - 2.0 * settings.board_padding;
let h = height as f64 * w / width as f64;
c.rect(self.settings.board_padding, y, w, h)
c.rect(settings.board_padding, y, w, h)
.image(comment)
.rgb(self.settings.text_dark_color[0],
self.settings.text_dark_color[1],
self.settings.text_dark_color[2])
.draw(&mut self.gl);
.rgb(settings.text_dark_color[0],
settings.text_dark_color[1],
settings.text_dark_color[2])
.draw(gl);
}
}
@ -89,7 +90,7 @@ impl<'a> Game for App<'a> {
let ref c = Context::abs(args.width as f64, args.height as f64);
let bg = c.rgba(self.settings.window_background_color[0], self.settings.window_background_color[1], self.settings.window_background_color[2], 1.0);
bg.clear(&mut self.gl);
bg.draw(&mut self.gl);
self.render_ui(c);
self.board.render(self.number_renderer.get_ref(), c, &mut self.gl);

4
src/board.rs
View file

@ -357,7 +357,7 @@ impl<'a> Board<'a> {
self.settings.tile_background_color[1],
self.settings.tile_background_color[2],
1.0)
.fill(gl);
.draw(gl);
let mut x = self.settings.board_padding + self.settings.tile_padding;
let mut y = self.settings.board_padding + self.settings.board_offset_y + self.settings.tile_padding;
@ -369,7 +369,7 @@ impl<'a> Board<'a> {
self.settings.tiles_colors.get(0)[1],
self.settings.tiles_colors.get(0)[2],
1.0)
.fill(gl);
.draw(gl);
x += self.settings.tile_padding + self.settings.tile_size;
}

2
src/tile.rs
View file

@ -125,7 +125,7 @@ impl<'a> Tile<'a> {
.rect_centered(x + self.settings.tile_size / 2.0,
y + self.settings.tile_size / 2.0,
w / 2.0, h / 2.0)
.rgba(color[0], color[1], color[2], 1.0).fill(gl);
.rgba(color[0], color[1], color[2], 1.0).draw(gl);
let color = if self.score >= 8 {
self.settings.text_light_color