X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f61a5ebd00d4620af70c3780ba821f5af68def1c..16f64e28170d4473eebaa309d3082785c32b809c:/Model/src/union.cpp

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 5f22ef5..450b6e6 100644
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -12,6 +12,7 @@ Union::Union(const std::string &_name):Transport(_name)
 	in_on_zero = 0;
 	in_ready = 0;
 	actual_flow = 999999;
+	updated = false;
 }
 
 Union::~Union()
@@ -27,7 +28,6 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 	for(i=in_list.begin(); i!=in_list.end(); i++) {
 		if ((*i) == who) pos = IN;
 	}
-	
 	switch (msg) {
 		case MSG_QUERY_MAX_FLOW_OUT: {
 			// Me preguntan por el flujo máximo.
@@ -35,6 +35,12 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 			float m_data =  *((float *)data)*2;
 			float tmp;
 
+			if (updated) {
+				float tmp = actual_flow/2.0f;
+				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
+				break;
+			}
+			updated = true;
 			if (m_data == 0) {
 				in_on_zero++;
 				tmp = 0.0f;
@@ -43,7 +49,7 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 					if (in_ready == 0)
 						tmp = max_flow;
 					else
-						tmp = max_flow/2.0f;
+						tmp = actual_flow/2.0f;
 				}
 				send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &tmp);
 			} else {
@@ -62,7 +68,6 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 						actual_flow = 0;
 				}
 				send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
-				std::cout << in_on_zero << " " << actual_flow << std::endl;
 				tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow;
 				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
 			}
@@ -76,11 +81,44 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 				if (max < actual_flow)	actual_flow = max;
 				if (in_on_zero == 2) actual_flow = 0;
 			} else {
-					if (((2*max) < actual_flow) && (max != 0))
+					if (((2*max) < actual_flow) && (max != 0)) {
 						actual_flow = 2*max;
+						if (in_on_zero == 1) actual_flow /= 2.0;
+					}
 			}
 		}
 		break;
+		case MSG_RESPONSE_COLOR:
+			if (in_colors == 0) {
+				color1 = *((RGB *)data);
+				entrada1 = static_cast<PlantItem *>(who);
+				flow1 = entrada1->get_actual_flow();
+				in_colors++;
+			} else if ((in_colors == 1) && (entrada1 != who)) {
+				color2  = *((RGB *)data);
+				flow2 = static_cast<PlantItem *>(who)->get_actual_flow();
+				in_colors++;
+				if (color1 == color2) {
+						std::cout << "TODO MAL" << std::endl << std::endl;
+				}
+
+				/* Ya tengo mis 2 colores, los sumo */
+				int r,g,b;
+				int n=2;
+				if (flow1 == 0) n--;
+				if (flow2 == 0) n--;
+				float suma = flow1+flow2;
+				if (n != 0) {
+					r = (int)(color1.r()*flow1/suma + color2.r()*flow2/suma);
+					g = (int)(color1.g()*flow1/suma + color2.g()*flow2/suma);
+					b = (int)(color1.b()*flow1/suma + color2.b()*flow2/suma);
+					set_color(RGB(r,g,b));
+				} else {
+					set_color(RGB(0,0,0));
+				}
+				color_updated = true;
+			}
+		break;
 		default:
 			Transport::recieve_msg(msg, who, data);
 	}
@@ -90,6 +128,7 @@ void Union::update(int dir)
 {
 	// Si ya me actualice, no lo tengo que hacer de nuevo
 	if (updated) return;
+	
 	// Seteo mi actualizar en true para evitar entrar de nuevo
 	// FIXME : 99999 == INFINITO!!
 	actual_flow = 99999;
@@ -105,28 +144,16 @@ void Union::update(int dir)
 
 void Union::simulate()
 {
-	RGB c_in1, c_in2;
-	unsigned r,g,b;
-
-	if (!updated) {
-		return;
-	}
-	std::list<IConector *>::iterator i = in_list.begin();
-	if (i != in_list.end()) {
-		PlantItem *o = (PlantItem *)(*i);
-		c_in1 = o->get_color();
-		i++;
-		o = (PlantItem *)(*i);
-		c_in2 = o->get_color();
-	}
+	if (!updated) return;
 
-	r = ((c_in1.r()+c_in2.r())/2)%256;
-	g = ((c_in1.g()+c_in2.g())/2)%256;
-	b = ((c_in1.b()+c_in2.b())/2)%256;
-	set_color(RGB(r,g,b));
+#ifdef DEBUG
 	std::cout << name << "::Flujo actual = " << actual_flow << std::endl;
+#endif
 	updated = false;
+	color_updated = false;
 	in_on_zero = 0;
 	in_ready = 0;
+	color_updated = false;
+	in_colors = 0;
 }