|
|
@@ -60,12 +60,10 @@ namespace oxygine
|
|
|
Image mt;
|
|
|
if (mt.init(bf, true))
|
|
|
{
|
|
|
- ResAnim rs;
|
|
|
- rs.init(&mt);
|
|
|
- float w = (float)rs.getFrame(0, 0).getWidth();
|
|
|
- if (w != 0.0f)
|
|
|
- _image->setScale(getWidth() / w);
|
|
|
- _image->setAnimFrame(&rs);
|
|
|
+ _rs.init(&mt);
|
|
|
+ _image->setResAnim(&_rs);
|
|
|
+
|
|
|
+ fit();
|
|
|
}
|
|
|
|
|
|
_http = 0;
|
|
|
@@ -76,4 +74,21 @@ namespace oxygine
|
|
|
{
|
|
|
_image->setResAnim(0);
|
|
|
}
|
|
|
+
|
|
|
+ void WebImage::fit()
|
|
|
+ {
|
|
|
+ if (!_rs.getTotalFrames())
|
|
|
+ return;
|
|
|
+ if (!_rs.getWidth())
|
|
|
+ return;
|
|
|
+ float sx = getWidth() / _rs.getWidth();
|
|
|
+ float sy = getHeight() / _rs.getHeight();
|
|
|
+ float s = std::min(sx, sy);
|
|
|
+ _image->setScale(s);
|
|
|
+ }
|
|
|
+
|
|
|
+ void WebImage::sizeChanged(const Vector2& size)
|
|
|
+ {
|
|
|
+ fit();
|
|
|
+ }
|
|
|
}
|