X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/cafdb587ee6e195e5a917cea7570c2ea7e22a003..be1908f8097dbbc871bfd7c55432de43d25647b7:/Model/src/tank.cpp?ds=sidebyside

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index e951254..b3a940e 100644
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -26,14 +26,36 @@ void Tank::update(int dir)
 void Tank::simulate()
 {
 	if (!updated) return;
+	RGB in_color;
+
+	std::list<IConector *>::iterator i = in_list.begin();
+	if (i != in_list.end()) {
+		PlantItem *o = (PlantItem *)(*i);
+		in_color = o->get_color();
+	}
 
-	// le resto lo que entrego
-	litros -= actual_out_flow;
 	// le sumo lo que recibo
 	litros += actual_in_flow;
+	// calculo el nuevo color
+	int r, g, b;
+	float l = litros;
+
+	r = (int)(fluid_color.r()*litros/l + in_color.r()*actual_in_flow/l);
+	g = (int)(fluid_color.g()*litros/l + in_color.g()*actual_in_flow/l);
+	b = (int)(fluid_color.b()*litros/l + in_color.b()*actual_in_flow/l);
+
+	if (r>255) r = 255;
+	if (g>255) g = 255;
+	if (b>255) b = 255;
+	fluid_color = RGB(r,g,b);
+
+	// le resto lo que entrego
+	litros -= actual_out_flow;
 
+#ifdef DEBUG
 	std::cout << name << "Capacidad: " << capacity;
 	std::cout << "  Litros : " << litros << std::endl;
+#endif
 	updated = false;
 }
 
@@ -68,7 +90,8 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 
 void Tank::get_state_as_xml(std::stringstream &out)
 {
-	// El tanque no emite flujo actual!
+	PlantItem::get_state_as_xml(out);
+				
 	out << "\t<tank name=\"" << name << "\">" << std::endl;
 	out << "\t\t<capacity>" << capacity << "</capacity>" << std::endl;
 	out << "\t\t<litros>" << litros << "</litros>" << std::endl;