Skip to content

Commit 349a2a8

Browse files
committed
[upd] move print_text into font module
1 parent bbfb272 commit 349a2a8

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

src/68-analog-clock.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
extern crate sdl2;
22
extern crate time;
33

4+
mod font;
5+
46
use sdl2::pixels::Color;
57
use sdl2::event::Event;
68
use sdl2::keyboard::Keycode;
7-
use sdl2::render::{Renderer, TextureQuery};
8-
use sdl2::rect::{Rect, Point};
9+
use sdl2::render::Renderer;
10+
use sdl2::rect::Point;
911
use sdl2::ttf::Font;
12+
use font::print_text;
1013

1114
const W_WIDTH: u32 = 320;
1215
const W_HEIGHT: u32 = 320;
@@ -22,16 +25,6 @@ fn get_point(center: Point, angle: f32, amplitute: f32) -> Point {
2225
Point::new(x, y)
2326
}
2427

25-
fn print_text<'a>(renderer: &'a mut Renderer, font: &'a Font, text: &'a str, pos: Point) {
26-
let surface = font.render(text)
27-
.blended(Color::RGBA(255, 255, 255, 255))
28-
.unwrap();
29-
let mut texture = renderer.create_texture_from_surface(&surface).unwrap();
30-
let TextureQuery { width, height, .. } = texture.query();
31-
let target = Rect::new(pos.x, pos.y, width, height);
32-
renderer.copy(&mut texture, None, Some(target)).unwrap();
33-
}
34-
3528
fn render<'a>(renderer: &'a mut Renderer, font: &'a mut Font) {
3629
let center = Point::new((W_WIDTH / 2) as i32, (W_HEIGHT / 2) as i32);
3730
renderer.set_draw_color(Color::RGB(0, 0, 0));

src/font/mod.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#[warn(dead_code)]
2+
use sdl2::pixels::Color;
3+
use sdl2::render::{Renderer, TextureQuery};
4+
use sdl2::rect::{Rect, Point};
5+
use sdl2::ttf::Font;
6+
7+
pub fn print_text<'a>(renderer: &'a mut Renderer, font: &'a Font, text: &'a str, pos: Point) {
8+
let surface = font.render(text)
9+
.blended(Color::RGBA(255, 255, 255, 255))
10+
.unwrap();
11+
let mut texture = renderer.create_texture_from_surface(&surface).unwrap();
12+
let TextureQuery { width, height, .. } = texture.query();
13+
let target = Rect::new(pos.x, pos.y, width, height);
14+
renderer.copy(&mut texture, None, Some(target)).unwrap();
15+
}

0 commit comments

Comments
 (0)