stretching updates for pxImageA (#1839)

Author: mfiess

examples/pxScene2d/src/pxImageA.cpp

@@ -36,6 +36,9 @@ pxImageA::pxImageA(pxScene2d *scene) : pxObject(scene),
   mFrameTime = -1;
   mPlays = 0;
   mResource = pxImageManager::getImageA("");
+
+  mw = -1;
+  mh = -1;
 }
 
 pxImageA::~pxImageA()
@@ -46,8 +49,6 @@ pxImageA::~pxImageA()
 
 void pxImageA::onInit() 
 {
-  mw = static_cast<float>(mImageWidth);
-  mh = static_cast<float>(mImageHeight);
 }
 
 rtError pxImageA::url(rtString &s) const
@@ -154,7 +155,7 @@ void pxImageA::draw()
     pxTimedOffscreenSequence &imageSequence = getImageAResource()->getTimedOffscreenSequence();
     if (imageSequence.numFrames() > 0)
     {
-      context.drawImage(0, 0, mw, mh, mTexture, nullMaskRef, false, NULL, mStretchX, mStretchY);
+      context.drawImage(0, 0, getOnscreenWidth(), getOnscreenHeight(), mTexture, nullMaskRef, false, NULL, mStretchX, mStretchY);
     }
   }
 }
@@ -261,8 +262,6 @@ void pxImageA::loadImageSequence()
       pxOffscreen &o = imageSequence.getFrameBuffer(0);
       mImageWidth = o.width();
       mImageHeight = o.height();
-      mw = static_cast<float>(mImageWidth);
-      mh = static_cast<float>(mImageHeight);
     }
     mReady.send("resolve", this);
   }
@@ -338,6 +337,26 @@ uint64_t pxImageA::textureMemoryUsage()
   return textureMemory;
 }
 
+float pxImageA::getOnscreenWidth()
+{
+  if(mw == -1 || mStretchX == pxConstantsStretch::NONE)
+  {
+    return static_cast<float>(mImageWidth);
+  }
+  else
+    return mw;
+
+}
+float pxImageA::getOnscreenHeight()
+{
+  if(mh == -1 || mStretchY == pxConstantsStretch::NONE)
+  {
+    return static_cast<float>(mImageHeight);
+  }
+  else
+    return mh;
+}
+
 rtDefineObject(pxImageA, pxObject);
 rtDefineProperty(pxImageA, url);
 rtDefineProperty(pxImageA, resource);

examples/pxScene2d/src/pxImageA.h

@@ -61,6 +61,8 @@ class pxImageA: public pxObject, pxResourceListener
   virtual void releaseData(bool sceneSuspended);
   virtual void reloadData(bool sceneSuspended);
   virtual uint64_t textureMemoryUsage();
+  virtual float getOnscreenWidth();
+  virtual float getOnscreenHeight();
 
 protected:
   virtual void onInit();