projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-enable fullscreen toggling
[mandelwow.git]
/
text.rs
diff --git
a/text.rs
b/text.rs
index 4c66a285cbdd5ab689c478834cf6692ece11f825..e020156cd08956f226d9c36c0117dcaa24069452 100644
(file)
--- a/
text.rs
+++ b/
text.rs
@@
-51,16
+51,16
@@
struct Vertex {
}
implement_vertex!(Vertex, position, tex_coords);
}
implement_vertex!(Vertex, position, tex_coords);
-pub struct Text
<'a>
{
+pub struct Text {
tex: texture::Texture2d,
vertex_buffer: glium::VertexBuffer<Vertex>,
index_buffer: glium::IndexBuffer<u16>,
program: glium::Program,
tex: texture::Texture2d,
vertex_buffer: glium::VertexBuffer<Vertex>,
index_buffer: glium::IndexBuffer<u16>,
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),
let (w, h, pixels) = c64_font();
let image = glium::texture::RawImage2d {
data: std::borrow::Cow::from(pixels),