From 590a5a76a20bbe3b2893b60f69ebaa6238d9540f Mon Sep 17 00:00:00 2001
From: john <kremenators@gmail.com>
Date: Wed, 25 Jun 2014 20:44:47 +0400
Subject: [PATCH] Draw comments and replace 'fill', 'clear' with 'draw'

---
 src/app.rs   | 29 +++++++++++++++--------------
 src/board.rs |  4 ++--
 src/tile.rs  |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index b21afcb..b7b4bda 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -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);
diff --git a/src/board.rs b/src/board.rs
index 7f9e892..4a7372f 100644
--- a/src/board.rs
+++ b/src/board.rs
@@ -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;
             }
diff --git a/src/tile.rs b/src/tile.rs
index a5d055a..45aa1ce 100644
--- a/src/tile.rs
+++ b/src/tile.rs
@@ -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