From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 22 Oct 2009 14:18:58 +0000 (+0000)
Subject: Get rid of any direct gl* calls in favor of the mspgl wrappers
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=6ffe2b950143c5474659cbca2bbcdf58d6b8322c;p=netvis.git

Get rid of any direct gl* calls in favor of the mspgl wrappers
---

diff --git a/source/host.cpp b/source/host.cpp
index 991e774..bd93de1 100644
--- a/source/host.cpp
+++ b/source/host.cpp
@@ -163,7 +163,9 @@ void Host::render_label() const
 	GL::translate(static_cast<int>(pos.x)-static_cast<int>(font.get_string_width(short_name)*5), static_cast<int>(pos.y)+6, 0);
 	GL::scale_uniform(10);
 
-	font.draw_string(short_name);
+	GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
+	imm.color(1.0f, 1.0f, 1.0f);
+	font.draw_string(short_name, imm);
 
 	GL::pop_matrix();
 }
diff --git a/source/netvis.cpp b/source/netvis.cpp
index e4d3057..7f0ac9e 100644
--- a/source/netvis.cpp
+++ b/source/netvis.cpp
@@ -15,6 +15,8 @@ Distributed unter the GPL
 #include <linux/if_ether.h>
 #include <msp/core/except.h>
 #include <msp/debug/profilingscope.h>
+#include <msp/gl/blend.h>
+#include <msp/gl/framebuffer.h>
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
@@ -67,8 +69,8 @@ NetVis::NetVis(int argc, char **argv):
 	wnd->signal_key_press.connect(sigc::mem_fun(this, &NetVis::key_press));
 	wnd->show();
 
-	GL::enable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	GL::enable(GL::BLEND);
+	GL::blend_func(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA);
 
 	font = new GL::Font;
 	DataFile::load(*font, "dejavu-10.font");
@@ -184,7 +186,7 @@ void NetVis::tick()
 
 	{
 		Debug::ProfilingScope s(profiler, "render");
-		glClear(GL_COLOR_BUFFER_BIT);
+		GL::clear(GL::COLOR_BUFFER_BIT);
 
 		GL::matrix_mode(GL::PROJECTION);
 		GL::load_identity();
@@ -196,7 +198,6 @@ void NetVis::tick()
 			i->second->render();
 		if(draw_labels)
 		{
-			glColor4f(1.0, 1.0, 1.0, 1.0);
 			for(map<unsigned, Host *>::iterator i=hosts.begin(); i!=hosts.end(); ++i)
 				i->second->render_label();
 			GL::Texture::unbind();
@@ -235,11 +236,12 @@ void NetVis::tick()
 			GL::push_matrix();
 			GL::translate(-484, 361, 0);
 			GL::scale_uniform(10);
-			glColor4f(1.0, 1.0, 1.0, 1.0);
 			n = 0;
 			for(map<unsigned, GL::Color>::iterator i=port_colors.begin(); (i!=port_colors.end() && n<20); ++i, ++n)
 			{
-				font->draw_string(format("%d", i->first));
+				GL::Immediate imm2((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
+				imm.color(1.0f, 1.0f, 1.0f);
+				font->draw_string(format("%d", i->first), imm2);
 
 				GL::translate(0, -1.2, 0);
 			}