Make some internal colors darker to match linear color space

[r2c2.git] / source / 3d / overlay.cpp

diff --git a/source/3d/overlay.cpp b/source/3d/overlay.cpp
index cf0cd269148878cc45606dcdd6bef8a09a119be2..2a26915a6e5fce5288254ac8b9d3af907bac7f5b 100644 (file)
--- a/source/3d/overlay.cpp
+++ b/source/3d/overlay.cpp
@@ -84,7 +84,7 @@ void Overlay3D::render(GL::Renderer &renderer, const GL::Tag &) const
 
        glLineWidth(1);
 
-       int size = int(font.get_default_size()+0.5);
+       int size = int(font.get_native_size()+0.5);
        float spacing = round(size*1.1)/size;
        float baseline = round((0.5-font.get_ascent()*0.5-font.get_descent()*0.5)*size)/size;
 
@@ -95,8 +95,7 @@ void Overlay3D::render(GL::Renderer &renderer, const GL::Tag &) const
 
                const Icon &icon = *i->second;
 
-               Vector node = i->first->get_node();
-               GL::Vector3 p = renderer.get_camera()->project(GL::Vector3(node.x, node.y, node.z));
+               GL::Vector3 p = renderer.get_camera()->project(i->first->get_node());
                p.x = int(p.x*0.5*fb_width-icon.width*size/2);
                p.y = int(p.y*0.5*fb_height);
 
@@ -140,7 +139,7 @@ const GL::Mesh *Overlay3D::get_graphic(const string &name)
                {
                        DataFile::load(*grf, (FS::Path("icons")/(name+".mesh")).str());
                }
-               catch(const Exception &e)
+               catch(const exception &e)
                {
                        IO::print("Error loading overlay graphic '%s': %s\n", name, e.what());
                        delete grf;
@@ -159,7 +158,7 @@ void Overlay3D::update_icon(Icon &icon)
 
        {
                GL::MeshBuilder bld(icon.background);
-               bld.color(0.2f, 0.2f, 0.2f, 0.7f);
+               bld.color(0.05f, 0.05f, 0.05f, 0.7f);
 
                bld.begin(GL::TRIANGLE_FAN);
                bld.vertex(0.4, 0.5);
@@ -183,7 +182,7 @@ void Overlay3D::update_icon(Icon &icon)
        {
                GL::MeshBuilder bld(icon.text);
                bld.color(0.0f, 1.0f, 0.0f);
-               font.draw_string(icon.label, bld);
+               font.build_string(icon.label, bld);
        }
 }