X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=text.rs;fp=text.rs;h=bf19aa2ad273aff0eb9cd544153cac4a90bf0982;hb=cb9417c29f520264b1d6395216e2dcf624eebd04;hp=82d4d1703a79da5bd4efed53dc5c9205f4493f2b;hpb=bcda449dea3673fecf4c0ea5c96799f4bc4e59a2;p=mandelwow.git

diff --git a/text.rs b/text.rs
index 82d4d17..bf19aa2 100644
--- a/text.rs
+++ b/text.rs
@@ -13,7 +13,7 @@ struct Vertex {
 implement_vertex!(Vertex, position, tex_coords);
 
 pub struct Text<'a> {
-    tex: texture::UnsignedTexture2d,
+    tex: texture::Texture2d,
     vertex_buffer: glium::VertexBuffer<Vertex>,
     index_buffer: glium::IndexBuffer<u16>,
     program: glium::Program,
@@ -34,10 +34,10 @@ impl<'a> Text<'a> {
             height: h,
             format: glium::texture::ClientFormat::U8,
         };
-        let tex = glium::texture::UnsignedTexture2d::with_format(
+        let tex = glium::texture::Texture2d::with_format(
             display,
             image,
-            glium::texture::UncompressedUintFormat::U8,
+            glium::texture::UncompressedFloatFormat::U8,
             glium::texture::MipmapsOption::NoMipmap,
         ).unwrap();
 
@@ -94,13 +94,13 @@ impl<'a> Text<'a> {
                     // Characters are arranged in a 16x16 square.
                     int xpos = index % 16;
                     int ypos = index / 16;
-                    v_tex_coords = (tex_coords) / 16.0 + vec2(xpos / 16., ypos / 16.);
+                    v_tex_coords = (tex_coords + vec2(xpos, ypos)) / 16.;
                 }
             ",
 
             fragment: "
                 #version 140
-                uniform usampler2D tex;
+                uniform sampler2D tex;
                 uniform vec4 bgcolor;
                 uniform vec4 fgcolor;