* Se agrega el tanque la suma de color (no me gusta como esta, vere si la puedo hacer...

[z.facultad/75.42/plaqui.git] / Model / src / tank.cpp

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index f21a2e8f1e08370ab4a265d7fce089a1be49240a..895b5eff04a010748319af99761d95db68442346 100644 (file)
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -26,11 +26,29 @@ 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;
+
+       // calculo el nuevo color
+       int r, g, b;
+       float l = litros+actual_in_flow;
+
+       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);
+       
+       fluid_color = RGB(r,g,b);
+
        // le sumo lo que recibo
-       litros += actual_in_flow;
+       litros = l;
 
        std::cout << name << "Capacidad: " << capacity;
        std::cout << "  Litros : " << litros << std::endl;
@@ -66,3 +84,12 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
        }
 }
 
+void Tank::get_state_as_xml(std::stringstream &out)
+{
+       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;
+       out << "\t</tank>" << std::endl;
+}