/* $Id$
-This file is part of the MSP Märklin suite
+This file is part of R²C²
Copyright © 2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <algorithm>
#include <cmath>
#include <msp/fs/path.h>
+#include <msp/gl/immediate.h>
#include <msp/gl/matrix.h>
#include <msp/gl/texture.h>
#include <msp/io/print.h>
using namespace std;
using namespace Msp;
-namespace Marklin {
+namespace R2C2 {
Overlay3D::Overlay3D(const Graphics::Window &w, const GL::Camera &c, const GL::Font &f):
window(w),
}
GL::translate(0, baseline, 0);
- font.draw_string(icon.label);
+ GL::Immediate imm((GL::TEXCOORD2, GL::COLOR4_UBYTE, GL::VERTEX2));
+ imm.color(0.0f, 1.0f, 0.0f);
+ font.draw_string(icon.label, imm);
GL::Texture::unbind();
}
GL::pop_matrix();
GL::matrix_mode(GL::MODELVIEW);
GL::pop_matrix();
+
+ glColor3f(1.0, 1.0, 1.0);
}
}
background((GL::COLOR4_UBYTE, GL::VERTEX2))
{ }
-} // namespace Marklin
+} // namespace R2C2