Style update: add spaces around assignment operators

[libs/gl.git] / source / font.cpp

diff --git a/source/font.cpp b/source/font.cpp
index 8320374e5070ec5580dc5c6e74ddda3de5f1468c..44e3d241154b0e4acd8ccdd8e747091ea776f9ef 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -36,8 +36,8 @@ void Font::set_texture(const Texture2D &t)
        if(own_tex)
                delete tex;
 
-       tex=&t;
-       own_tex=false;
+       tex = &t;
+       own_tex = false;
 }
 
 const Texture2D &Font::get_texture() const
@@ -50,25 +50,25 @@ const Texture2D &Font::get_texture() const
 void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
 {
        Glyph glyph;
-       glyph.code=code;
-       glyph.x1=x1;
-       glyph.y1=y1;
-       glyph.x2=x2;
-       glyph.y2=y2;
-       glyph.w=w;
-       glyph.h=h;
-       glyph.off_x=ox;
-       glyph.off_y=oy;
-       glyph.advance=adv;
+       glyph.code = code;
+       glyph.x1 = x1;
+       glyph.y1 = y1;
+       glyph.x2 = x2;
+       glyph.y2 = y2;
+       glyph.w = w;
+       glyph.h = h;
+       glyph.off_x = ox;
+       glyph.off_y = oy;
+       glyph.advance = adv;
        glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
 float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 {
-       float x=0;
+       float x = 0;
 
        for(string::const_iterator i=str.begin(); i!=str.end();)
-               x+=get_glyph_advance(dec.decode_char(str, i));
+               x += get_glyph_advance(dec.decode_char(str, i));
 
        return x;
 }
@@ -86,19 +86,19 @@ void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder
 
        tex->bind();
 
-       float x=0;
-       unsigned count=0;
+       float x = 0;
+       unsigned count = 0;
 
        pbuilder.begin(QUADS);
        for(string::const_iterator i=str.begin(); i!=str.end();)
        {
-               GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i));
+               GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
                if(j==glyphs.end())
                        continue;
 
                create_glyph_vertices(j->second, pbuilder, x);
-               x+=j->second.advance;
-               count+=4;
+               x += j->second.advance;
+               count += 4;
        }
        pbuilder.end();
 }
@@ -117,7 +117,7 @@ void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, fl
 
 float Font::get_glyph_advance(unsigned code) const
 {
-       GlyphMap::const_iterator i=glyphs.find(code);
+       GlyphMap::const_iterator i = glyphs.find(code);
        if(i==glyphs.end())
                return 0;
 
@@ -150,17 +150,17 @@ void Font::Loader::init()
 void Font::Loader::glyph(unsigned c)
 {
        Glyph gl;
-       gl.code=c;
+       gl.code = c;
        load_sub(gl);
        obj.glyphs.insert(GlyphMap::value_type(c, gl));
 }
 
 void Font::Loader::texture_inline()
 {
-       RefPtr<Texture2D> tex=new Texture2D;
+       RefPtr<Texture2D> tex = new Texture2D;
        load_sub(*tex);
-       obj.tex=tex.release();
-       obj.own_tex=true;
+       obj.tex = tex.release();
+       obj.own_tex = true;
 }
 
 
@@ -175,10 +175,10 @@ Font::Glyph::Loader::Loader(Glyph &g):
 
 void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
 {
-       obj.x1=x1;
-       obj.y1=y1;
-       obj.x2=x2;
-       obj.y2=y2;
+       obj.x1 = x1;
+       obj.y1 = y1;
+       obj.x2 = x2;
+       obj.y2 = y2;
 }
 
 } // namespace GL