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

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 65b1e7b..450b6e6 100644
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -109,12 +109,9 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 				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;
+					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));