X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/636ae51408b6eaafa0f719c3b26192a69477b256..5e9414c4a70c6f2a33f399dd1f92a3adf3fe73ea:/Model/src/tank.cpp?ds=sidebyside diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp index 88cbbe6..93c8564 100644 --- a/Model/src/tank.cpp +++ b/Model/src/tank.cpp @@ -18,7 +18,7 @@ bool Tank::get_output() return litros > 0; } -void Tank::update() +void Tank::update(int dir) { updated = true; } @@ -26,11 +26,31 @@ void Tank::update() void Tank::simulate() { if (!updated) return; + RGB in_color; + + std::list::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; std::cout << name << "Capacidad: " << capacity; std::cout << " Litros : " << litros << std::endl; @@ -66,3 +86,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" << std::endl; + out << "\t\t" << capacity << "" << std::endl; + out << "\t\t" << litros << "" << std::endl; + out << "\t" << std::endl; +}