Adapt to MSP library changes

[netvis.git] / source / port.cpp

diff --git a/source/port.cpp b/source/port.cpp
index 5c0bfa62435634892f970f282887e8ef006b41a8..a96e151fcd63c9d82f933d91bfc9b879d469c96e 100644 (file)
--- a/source/port.cpp
+++ b/source/port.cpp
@@ -37,7 +37,7 @@ Port::Port(NetVis &v, unsigned n):
                registered = !isdigit(name[0]);
        }
        else
-               name = Msp::lexical_cast(number);
+               name = Msp::lexical_cast<string>(number);
 
        const map<unsigned, Port *> &ports = netvis.get_ports();
        unsigned tries = 100;
@@ -104,7 +104,7 @@ void Port::tick(const Time::TimeDelta &dt)
 
 void Port::render() const
 {
-       GL::PushMatrix push_;
+       GL::MatrixStack::Push push_(GL::MatrixStack::modelview());
        mesh.draw();
        {
                GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
@@ -117,11 +117,8 @@ void Port::render() const
                imm.vertex(14, 10);
                imm.end();
        }
-       GL::translate(16, 1, 0);
-       GL::scale_uniform(10);
-       {
-               GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-               netvis.get_font().draw_string(name, imm);
-       }
+       GL::MatrixStack::modelview() *= GL::Matrix::translation(16, 1, 0);
+       GL::MatrixStack::modelview() *= GL::Matrix::scaling(10);
+       netvis.get_font().draw_string(name);
        GL::Texture::unbind();
 }