X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=text.rs;h=e020156cd08956f226d9c36c0117dcaa24069452;hb=94fdc78f7f906b1afefc0075f31f35dab18d4f1c;hp=4c66a285cbdd5ab689c478834cf6692ece11f825;hpb=3024c5dfb352a3f9011a5ce9aa50fe7dc1a2e013;p=mandelwow.git diff --git a/text.rs b/text.rs index 4c66a28..e020156 100644 --- a/text.rs +++ b/text.rs @@ -51,16 +51,16 @@ struct Vertex { } implement_vertex!(Vertex, position, tex_coords); -pub struct Text<'a> { +pub struct Text { tex: texture::Texture2d, vertex_buffer: glium::VertexBuffer, index_buffer: glium::IndexBuffer, program: glium::Program, - params: glium::DrawParameters<'a>, + params: glium::DrawParameters<'static>, } -impl<'a> Text<'a> { - pub fn new(display: &Display) -> Text<'a> { +impl Text { + pub fn new(display: &Display) -> Text { let (w, h, pixels) = c64_font(); let image = glium::texture::RawImage2d { data: std::borrow::Cow::from(pixels),