X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fb8d2fb83534b0ca76f81e6d107e38d002642a46..4c30f5939017e47c70f79df3a9f737d9ea743db5:/Model/src/union.cpp?ds=sidebyside

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index f581a67..7fe666b 100644
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -36,7 +36,8 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 			float tmp;
 
 			if (updated) {
-				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_flow);
+				float tmp = actual_flow/2.0f;
+				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
 				break;
 			}
 			updated = true;
@@ -87,6 +88,35 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 			}
 		}
 		break;
+		case MSG_RESPONSE_COLOR:
+			if (in_colors == 0) {
+				color1 = *((RGB *)data);
+				flow1 = static_cast<PlantItem *>(who)->get_actual_flow();
+				in_colors++;
+			} else {
+				color2  = *((RGB *)data);
+				flow2 = static_cast<PlantItem *>(who)->get_actual_flow();
+
+				/* 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)/n;
+					g = (int)(color1.g()*flow1/suma + color2.g()*flow2/suma)/n;
+					b = (int)(color1.b()*flow1/suma + color2.b()*flow2/suma)/n;
+					r %= 256;
+					g %= 256;
+					b %= 256;
+					set_color(RGB(r,g,b));
+				} else {
+					set_color(RGB(0,0,0));
+				}
+				color_updated = true;
+			}
+		break;
 		default:
 			Transport::recieve_msg(msg, who, data);
 	}
@@ -95,41 +125,8 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 void Union::update(int dir)
 {
 	// Si ya me actualice, no lo tengo que hacer de nuevo
-	RGB c_in1, c_in2;
-	unsigned r=0,g=0,b=0;
-	float c_f1, c_f2; // para ver los flujos de cada uno
-
-	if (updated) {
-		std::list<IConector *>::iterator i = in_list.begin();
-		if (i != in_list.end()) {
-			PlantItem *o = (PlantItem *)(*i);
-			c_in1 = o->get_color();
-			c_f1 = o->get_actual_flow();
-			i++;
-			o = (PlantItem *)(*i);
-			c_in2 = o->get_color();
-			c_f2 = o->get_actual_flow();
-		}
-
-		set_color( RGB(r,g,b) );
-		if ((c_f1 != 0) && (c_f2 != 0)) {
-			// Si ambas entradas traen flujo, sumo sus colores
-			int total = c_f1+c_f2;
-			r = ((int)((c_in1.r()*c_f1/total+c_in2.r()*c_f2/total)))%256;
-			g = ((int)((c_in1.g()*c_f1/total+c_in2.g()*c_f2/total)))%256;
-			b = ((int)((c_in1.b()*c_f1/total+c_in2.b()*c_f2/total)))%256;
-			set_color(RGB(r,g,b));
-		} else {
-			// Veo que entrada trae color
-			if (c_f1 != 0) {
-				set_color( c_in1 );
-			}
-			if (c_f2 != 0) {
-				set_color( c_in2 );
-			}
-		}
-		return;
-	}
+	if (updated) return;
+	
 	// Seteo mi actualizar en true para evitar entrar de nuevo
 	// FIXME : 99999 == INFINITO!!
 	actual_flow = 99999;
@@ -151,7 +148,10 @@ void Union::simulate()
 	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;
 }