[email protected] 8 years ago
parent
commit
200f4abeed

+ 8 - 0
oxygine/src/oxygine/actor/Actor.cpp

@@ -137,6 +137,12 @@ namespace oxygine
 
 
 
+    void Actor::transformUpdated()
+    {
+        if (getName() == "qwe")
+            int q = 0;
+    }
+
     void Actor::calcBounds2(RectF& bounds, const Transform& transform) const
     {
         const Actor* c = getFirstChild().get();
@@ -495,6 +501,8 @@ namespace oxygine
 
     void Actor::setPosition(const Vector2& pos)
     {
+        if (getName() == "qwe")
+            int q = 0;
         if (_pos == pos)
             return;
         _pos = pos;

+ 1 - 1
oxygine/src/oxygine/actor/Actor.h

@@ -299,7 +299,7 @@ namespace oxygine
         void removedFromStage();
         virtual void onAdded2Stage() {}
         virtual void onRemovedFromStage() {}
-        virtual void transformUpdated() {}
+        virtual void transformUpdated();
 
         virtual void calcBounds2(RectF& bounds, const Transform& transform) const;
 

+ 8 - 6
oxygine/src/oxygine/actor/ProgressBar.cpp

@@ -113,13 +113,16 @@ namespace oxygine
             return;
         }
 
+        _mat->apply();
 
         STDRenderer* renderer = STDRenderer::getCurrent();
 
         const Diffuse& df = _frame.getDiffuse();
         if (df.base)
         {
-            rsCache().setBlendMode(getBlendMode());
+
+            unsigned int color = rs.getFinalColor(getColor()).rgba();
+            //rsCache().setBlendMode(getBlendMode());
             //renderer->setTexture(df.base, df.alpha, df.premultiplied);
 
             RectF destRect = inherited::getDestRect();
@@ -296,15 +299,14 @@ namespace oxygine
                 p2 = rs.transform.transform(p2);
                 p3 = rs.transform.transform(p3);
 
-                unsigned int rgba = getColor().rgba();
 
-                fill_tex_coord(*pv, rgba, p1, u1, v1);
+                fill_tex_coord(*pv, color, p1, u1, v1);
                 pv++;
-                fill_tex_coord(*pv, rgba, p2, u2, v2);
+                fill_tex_coord(*pv, color, p2, u2, v2);
                 pv++;
-                fill_tex_coord(*pv, rgba, p3, u3, v3);
+                fill_tex_coord(*pv, color, p3, u3, v3);
                 pv++;
-                fill_tex_coord(*pv, rgba, p2, u2, v2);
+                fill_tex_coord(*pv, color, p2, u2, v2);
                 pv++;