Fix various issues with constant condition elimination

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

diff --git a/source/text.cpp b/source/text.cpp
index e3a854006a9bc444e929c90a3ef4b525204dbf8d..dfb88e3fcc1e8553721eeaf100735cf616fe4f6f 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -11,7 +11,8 @@ Text::Text(const Font &f, const Technique *tech):
        font(f),
        mesh((TEXCOORD2, VERTEX2)),
        horz_align(0.0f),
-       vert_offset(0.0f)
+       vert_offset(0.0f),
+       width(0.0f)
 {
        object.set_mesh(&mesh);
        if(tech)
@@ -23,7 +24,7 @@ void Text::set_technique(const Technique *tech)
        if(tech)
        {
                technique = *tech;
-               technique.replace_texture("diffusemap", font.get_texture());
+               technique.replace_texture("diffuse_map", font.get_texture());
                object.set_technique(&technique);
        }
        else
@@ -34,7 +35,7 @@ void Text::set_text(const string &text, StringCodec::Decoder &dec)
 {
        clear();
        width = font.get_string_width(text, dec);
-       GL::MeshBuilder bld(mesh);
+       MeshBuilder bld(mesh);
        bld.matrix() *= Matrix::translation(Vector3(-horz_align*width, vert_offset, 0.0f));
        font.build_string(text, dec, bld);
 }
@@ -61,7 +62,7 @@ void Text::set_alignment(HorizontalAlign ha, VerticalAlign va)
        {
        case DESCENT: v = -font.get_descent(); break;
        case BASELINE: v = 0.0f; break;
-       case MIDLINE: v = font.get_ascent()/2; break;  // XXX Midline should be cap height / 2
+       case MIDLINE: v = font.get_cap_height()/2; break;
        case ASCENT: v = font.get_ascent(); break;
        default: throw invalid_argument("Text::set_alignment");
        }
@@ -71,6 +72,9 @@ void Text::set_alignment(HorizontalAlign ha, VerticalAlign va)
 
 void Text::set_alignment(float h, float v)
 {
+       if(h==horz_align && -v==vert_offset)
+               return;
+
        float horz_adjust = (horz_align-h)*width;
        float vert_adjust = -v-vert_offset;
        horz_align = h;