Fix 64-bit compile errors

[netvis.git] / source / host.cpp

diff --git a/source/host.cpp b/source/host.cpp
index c18f117ba11d3dc360328ad0eb539c3d4e8939ed..afa61b71e775a4eaa5ab49c8c87fc799ce5f71b0 100644 (file)
--- a/source/host.cpp
+++ b/source/host.cpp
@@ -38,15 +38,15 @@ void Host::set_name(const string &n)
 
        if(local)
        {
-               unsigned dot = name.find('.');
+               string::size_type dot = name.find('.');
                short_name = name.substr(0, dot);
        }
        else
        {
-               unsigned dot = name.size();
+               string::size_type dot = name.size();
                for(unsigned i=0; (dot>0 && dot!=string::npos); ++i)
                {
-                       unsigned prev = name.rfind('.', dot-1);
+                       string::size_type prev = name.rfind('.', dot-1);
                        if(prev+15<name.size() && i>1)
                                break;
                        dot = prev;
@@ -100,8 +100,9 @@ void Host::tick(const Msp::Time::TimeDelta &td)
                return;
 
        const map<unsigned, Host *> &hosts = netvis.get_hosts();
-       float fx = -pos.x*0.1;
-       float fy = -pos.y*0.1;
+       float center_force = (local ? 0.5 : 0.1);
+       float fx = -pos.x*center_force;
+       float fy = -pos.y*center_force;
        for(map<unsigned, Host *>::const_iterator i=hosts.begin(); i!=hosts.end(); ++i)
        {
                if(i->second!=this)
@@ -136,8 +137,8 @@ void Host::render() const
        if(!active)
                return;
 
-       GL::PushMatrix push_;
-       GL::translate(static_cast<int>(pos.x), static_cast<int>(pos.y), 0);
+       GL::MatrixStack::Push push_(GL::MatrixStack::modelview());
+       GL::MatrixStack::modelview() *= GL::Matrix::translation(static_cast<int>(pos.x), static_cast<int>(pos.y), 0);
 
        GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
        imm.begin(GL::QUADS);
@@ -149,10 +150,9 @@ void Host::render() const
        imm.end();
 
        const GL::Font &font = netvis.get_font();
-       GL::translate(-static_cast<int>(font.get_string_width(short_name)*5), 6, 0);
-       GL::scale_uniform(10);
+       GL::MatrixStack::modelview() *= GL::Matrix::translation(-static_cast<int>(font.get_string_width(short_name)*5), 6, 0);
+       GL::MatrixStack::modelview() *= GL::Matrix::scaling(10);
 
-       imm.color(1.0f, 1.0f, 1.0f);
-       font.draw_string(short_name, imm);
+       font.draw_string(short_name);
        GL::Texture::unbind();
 }