progress bar set scale fixed, progress bar has default image

examples/Demo/src/TestProgressBar.h

@@ -19,7 +19,8 @@ public:
         bar->setResAnim(resources.getResAnim("bg"));
         bar->setAnchor(Vector2(0.5f, 0.5f));
         bar->setPosition(getSize() / 2);
-        bar->setScale(0.5f);
+
+        //bar->setSize(600, 200);
         content->addChild(bar);
     }
 

oxygine/src/AnimationFrame.cpp

@@ -82,6 +82,8 @@ namespace oxygine
 
     AnimationFrame::AnimationFrame(spNativeTexture t)
     {
+        _row = _column = 0;
+        _resAnim = 0;
         _diffuse.base = t;
         _diffuse.premultiplied = true;
         _srcRect = RectF(0, 0, 1, 1);

oxygine/src/AnimationFrame.h

@@ -61,6 +61,7 @@ namespace oxygine
         void            setResAnim(ResAnim* rs) {_resAnim = rs;}
         void            setDiffuse(const Diffuse& d) { _diffuse = d; }
         void            setSize(const Vector2& size) {_frameSize = size;}
+        void            setSize(float w, float h) { setSize(Vector2(w, h)); }
         void            setHitTestData(const HitTestData& ad) { _hittest = ad; }
         void            setRow(int v) {_row = v;}
         void            setColumn(int v) {_column = v;}

oxygine/src/Input.cpp

@@ -19,7 +19,7 @@ namespace oxygine
     {
         if (!_multiTouch && ps->getIndex() != 1 && ps != &_pointerMouse)
             return;
-        
+
         Vector2 p(x, y);
 
         TouchEvent me(type, true, p);
@@ -46,10 +46,10 @@ namespace oxygine
 
     void Input::sendPointerMotionEvent(spStage stage, float x, float y, float pressure, PointerState* ps)
     {
-        
+
         if (!_multiTouch && ps->getIndex() != 1 && ps != &_pointerMouse)
             return;
-        
+
         TouchEvent me(TouchEvent::MOVE, true, Vector2(x, y));
         me.index = ps->getIndex();
         me.pressure = pressure;
@@ -87,7 +87,7 @@ namespace oxygine
     void Input::cleanup()
     {
     }
-    
+
     void Input::multiTouchEnabled(bool en)
     {
         _multiTouch = en;

oxygine/src/Input.h

@@ -21,7 +21,7 @@ namespace oxygine
         ~Input();
 
         void cleanup();
-        
+
         void multiTouchEnabled(bool en);
 
         /**id should be in range [1, MAX_TOUCHES]*/
@@ -43,7 +43,7 @@ namespace oxygine
         void sendPointerButtonEvent(spStage, MouseButton button, float x, float y, float pressure, int type, PointerState*);
         void sendPointerMotionEvent(spStage, float x, float y, float pressure, PointerState*);
         void sendPointerWheelEvent(spStage, int scroll, PointerState*);
-        
+
         bool _multiTouch;
     };
 }

oxygine/src/ProgressBar.cpp

@@ -42,7 +42,10 @@ namespace oxygine
 
     ProgressBar::ProgressBar(): _progress(1.0f), _direction(dir_0)
     {
-
+        AnimationFrame f(STDRenderer::white);
+        f.setSize(200, 60);
+        f.setDestRect(RectF(0, 0, 200, 60));
+        setAnimFrame(f);
     }
 
     ProgressBar::~ProgressBar()
@@ -101,8 +104,6 @@ namespace oxygine
 
     void ProgressBar::doRender(const RenderState& rs)
     {
-        if (_progress == 0)
-            return;
         if (((_direction != __dir_radial_ccw) && (_direction != dir_radial_cw)) || (_progress == 1.0f))
         {
             inherited::doRender(rs);
@@ -348,12 +349,6 @@ namespace oxygine
 
         return stream.str();
     }
-
-    RectF ProgressBar::getDestRect() const
-    {
-        return _frame.getDestRect();
-    }
-
     void ProgressBar::setProgress(float f)
     {
         _progress = scalar::clamp(f, 0.0f, 1.0f);

oxygine/src/ProgressBar.h

@@ -46,7 +46,6 @@ namespace oxygine
     private:
         void doRender(const RenderState& rs);
 
-        RectF getDestRect() const OVERRIDE;
         virtual void _update();
 
         void animFrameChanged(const AnimationFrame& f);