X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhost.cpp;h=4314d75f63714c01c5a7e3f5f1ac42f9df06c9ae;hb=42bd2e83d66a98584540dd8cc5b47ee2349fe844;hp=e5eafc899fd98db7bd9d851fb208b237f72b1619;hpb=a56b7174bc4d39064e5fb8d22953963f224315db;p=netvis.git

diff --git a/source/host.cpp b/source/host.cpp
index e5eafc8..4314d75 100644
--- a/source/host.cpp
+++ b/source/host.cpp
@@ -28,108 +28,108 @@ Host::Host(NetVis &nv, unsigned a):
 	throttle(0)
 {
 	in_addr ina;
-	ina.s_addr=htonl(addr);
-	name=inet_ntoa(ina);
-	short_name=name;
+	ina.s_addr = htonl(addr);
+	name = inet_ntoa(ina);
+	short_name = name;
 }
 
 void Host::set_name(const string &n)
 {
-	name=n;
+	name = n;
 
 	if(local)
 	{
-		unsigned dot=name.find('.');
-		short_name=name.substr(0, dot);
+		unsigned dot = name.find('.');
+		short_name = name.substr(0, dot);
 	}
 	else
 	{
-		unsigned dot=name.size();
+		unsigned dot = name.size();
 		for(unsigned i=0; (dot>0 && dot!=string::npos); ++i)
 		{
-			unsigned prev=name.rfind('.', dot-1);
+			unsigned prev = name.rfind('.', dot-1);
 			if(prev+15<name.size() && i>1)
 				break;
-			dot=prev;
+			dot = prev;
 		}
 
 		if(dot==string::npos)
-			short_name=name;
+			short_name = name;
 		else
-			short_name="..."+name.substr(dot+1);
+			short_name = "..."+name.substr(dot+1);
 	}
 }
 
 void Host::set_local(bool l)
 {
-	local=l;
+	local = l;
 }
 
 void Host::set_position(const Vector2 &p)
 {
-	pos=p;
+	pos = p;
 }
 
 void Host::set_active(bool a)
 {
-	active=a;
+	active = a;
 }
 
 void Host::add_activity(unsigned bytes)
 {
-	activity+=bytes*0.06935;
+	activity += bytes*0.06935;
 }
 
 float Host::send_packet()
 {
-	float ret=throttle;
+	float ret = throttle;
 	if(throttle<1)
-		throttle+=0.025;
+		throttle += 0.025;
 	return ret;
 }
 
 void Host::tick(const Msp::Time::TimeDelta &td)
 {
-	float dt=td/Msp::Time::sec;
+	float dt = td/Msp::Time::sec;
 
-	activity*=pow(0.933f, dt);
-	throttle-=dt;
+	activity *= pow(0.933f, dt);
+	throttle -= dt;
 	if(throttle<0)
-		throttle=0;
+		throttle = 0;
 
 	if(!active)
 		return;
 
-	const map<unsigned, Host *> &hosts=netvis.get_hosts();
-	float fx=-pos.x*0.1;
-	float fy=-pos.y*0.1;
+	const map<unsigned, Host *> &hosts = netvis.get_hosts();
+	float fx = -pos.x*0.1;
+	float fy = -pos.y*0.1;
 	for(map<unsigned, Host *>::const_iterator i=hosts.begin(); i!=hosts.end(); ++i)
 	{
 		if(i->second!=this)
 		{
-			const Vector2 &other_pos=i->second->get_position();
-			float dx=other_pos.x-pos.x;
-			float dy=other_pos.y-pos.y;
-			float d2=dx*dx+dy*dy;
-			float d=sqrt(d2);
-
-			unsigned other_addr=i->second->get_address();
-			unsigned matching_bits=0;
+			const Vector2 &other_pos = i->second->get_position();
+			float dx = other_pos.x-pos.x;
+			float dy = other_pos.y-pos.y;
+			float d2 = dx*dx+dy*dy;
+			float d = sqrt(d2);
+
+			unsigned other_addr = i->second->get_address();
+			unsigned matching_bits = 0;
 			for(unsigned j=32; (j-- && !((addr^other_addr)>>j));)
 				++matching_bits;
 
-			float optimal_dist=100+(24-min(matching_bits, 24U))*12;
-			float f=5000.0*(1.0/optimal_dist-1.0/d);
+			float optimal_dist = 100+(24-min(matching_bits, 24U))*12;
+			float f = 5000.0*(1.0/optimal_dist-1.0/d);
 
-			fx+=dx/d*f;
-			fy+=dy/d*f;
+			fx += dx/d*f;
+			fy += dy/d*f;
 		}
 	}
 
 	if(fx<-4 || fx>4)
-		pos.x+=fx*dt;
+		pos.x += fx*dt;
 	if(fy<-4 || fy>4)
-		pos.y+=fy*dt;
+		pos.y += fy*dt;
 }
 
 void Host::render() const
@@ -137,10 +137,10 @@ void Host::render() const
 	if(!active)
 		return;
 
-	GL::push_matrix();
+	GL::PushMatrix push_;
 	GL::translate(static_cast<int>(pos.x), static_cast<int>(pos.y), 0);
 
-	GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
+	GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
 	imm.begin(GL::QUADS);
 	imm.color(1.0f, 1.0f, 1.0f, max(min(static_cast<float>(activity/10000), 1.0f), 0.2f));
 	imm.vertex(-5, -5);
@@ -149,21 +149,13 @@ void Host::render() const
 	imm.vertex(-5, 5);
 	imm.end();
 
-	GL::pop_matrix();
-}
-
-void Host::render_label() const
-{
-	if(!active)
-		return;
-
-	const GL::Font &font=netvis.get_font();
-
-	GL::push_matrix();
-	GL::translate(static_cast<int>(pos.x)-static_cast<int>(font.get_string_width(short_name)*5), static_cast<int>(pos.y)+6, 0);
+	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);
 
-	font.draw_string(short_name);
+	imm.color(1.0f, 1.0f, 1.0f);
+	font.draw_string(short_name, imm);
+	GL::Texture::unbind();
 
 	GL::pop_matrix();
 }