projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to Rusr 2018!
[mandelwow.git]
/
text.rs
diff --git
a/text.rs
b/text.rs
index 4e1fcdfc10579f3ed5813005795bc11bb3a7bfc4..c341959c55beb7ab678969f57b45c821e0c1c1bd 100644
(file)
--- a/
text.rs
+++ b/
text.rs
@@
-1,7
+1,7
@@
use cgmath::conv::array4x4;
use cgmath::{Matrix4, Vector3};
use glium;
use cgmath::conv::array4x4;
use cgmath::{Matrix4, Vector3};
use glium;
-use glium::{Display, Program, Surface,
texture
};
+use glium::{Display, Program, Surface,
implement_vertex, texture, uniform
};
use std;
fn gamma<T>(x: T) -> f32
use std;
fn gamma<T>(x: T) -> f32
@@
-63,7
+63,7
@@
pub struct Text<'a> {
}
impl<'a> Text<'a> {
}
impl<'a> Text<'a> {
- pub fn new(display: &Display, character: char) -> Text {
+ pub fn new(display: &Display, character: char) -> 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),