Changeset 398 for trunk/src/gfx/texture_font.cc

Timestamp:

06/13/15 11:20:22 (10 years ago)

Author:

epyon

Message:

• cleanup of glm usage

File:

• trunk/src/gfx/texture_font.cc (modified) (3 diffs)

trunk/src/gfx/texture_font.cc

@@ -94 +94 @@
 bool texture_font::load_glyphs( string_ref codes )
 {
-        FT_Face face     = (FT_Face)(m_rface);
-        size_t depth     = m_atlas->get_depth();
-        glm::ivec2 asize = m_atlas->get_size();
+        FT_Face face = (FT_Face)(m_rface);
+        size_t depth = m_atlas->get_depth();
+        ivec2 asize  = m_atlas->get_size();
         FT_Int32 flags = 0; 
         flags |= FT_LOAD_RENDER; 
@@ -137 +137 @@
                 int reg_width       = ft_bitmap_width / (depth > 3 ? 3 : (int)depth);
 
-                glm::ivec2 gsize( reg_width + 1, ft_bitmap_rows + 1 ); 
+                ivec2 gsize( reg_width + 1, ft_bitmap_rows + 1 ); 
                 region r = m_atlas->get_region( gsize );
                 if ( r.pos.x < 0 ) 
@@ -164 +164 @@
                 g->charcode = c;
                 g->size     = gsize;
-                g->offset   = glm::ivec2( ft_glyph_left, ft_glyph_top );
-                g->tl       = glm::vec2( r.pos.x/(float)asize.x, r.pos.y/(float)asize.y );
-                g->br       = glm::vec2( ( r.pos.x + gsize.x )/(float)asize.x, (r.pos.y + gsize.y )/(float)asize.y );
+                g->offset   = ivec2( ft_glyph_left, ft_glyph_top );
+                g->tl       = vec2( r.pos.x/(float)asize.x, r.pos.y/(float)asize.y );
+                g->br       = vec2( ( r.pos.x + gsize.x )/(float)asize.x, (r.pos.y + gsize.y )/(float)asize.y );
 
                 // Discard hinting to get advance
                 FT_Load_Glyph( face, glyph_index, FT_LOAD_RENDER | FT_LOAD_NO_HINTING);
                 slot = face->glyph;
-                g->advance = glm::ivec2( slot->advance.x/64.0, slot->advance.y/64.0 );
+                g->advance = ivec2( slot->advance.x/64.0, slot->advance.y/64.0 );
         }
         generate_kerning();