Se corrige el bug en la union (del modelo) que probablemente era el error

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

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 65b1e7b43e412562b5af376e3b3f43727c4f5911..450b6e630211cb341e3d6ea8cdfa74d1dbb124ec 100644 (file)
--- 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) {
                                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));
                                        set_color(RGB(r,g,b));
                                } else {
                                        set_color(RGB(0,0,0));