imageA resource width and height properties (#1844)

* imageA resource width and height properties

* adding tests

Author: Michael Fiess

examples/pxScene2d/src/pxResource.cpp

@@ -864,7 +864,7 @@ void pxResource::processDownloadedResource(rtFileDownloadRequest* fileDownloadRe
  * rtImageResource
  */
 
-rtImageAResource::rtImageAResource(const char* url, const char* proxy) : pxResource(), mTimedOffscreenSequence()
+rtImageAResource::rtImageAResource(const char* url, const char* proxy) : pxResource(), mTimedOffscreenSequence(), mWidth(0), mHeight(0), mDimensionsMutex()
 {
   mTimedOffscreenSequence.init();
   setUrl(url, proxy);
@@ -904,6 +904,13 @@ uint32_t rtImageAResource::loadResourceData(rtFileDownloadRequest* fileDownloadR
 
     if (pxLoadAImage(data, dataSize, mTimedOffscreenSequence) == RT_OK)
     {
+      if (mTimedOffscreenSequence.numFrames() > 0)
+      {
+        pxOffscreen &o = mTimedOffscreenSequence.getFrameBuffer(0);
+        rtMutexLockGuard dimensionsMutexLock(mDimensionsMutex);
+        mWidth = o.width();
+        mHeight = o.height();
+      }
       return PX_RESOURCE_LOAD_SUCCESS;
     }
   }
@@ -923,6 +930,41 @@ void rtImageAResource::loadResourceFromArchive(rtObjectRef archiveRef)
   setLoadStatus("statusCode",PX_RESOURCE_STATUS_UNKNOWN_ERROR);
 }
 
+int32_t rtImageAResource::w() const
+{
+  int32_t returnValue = 0;
+  {
+    rtMutexLockGuard dimensionsMutexLock(mDimensionsMutex);
+    returnValue = mWidth;
+  }
+  return returnValue;
+}
+rtError rtImageAResource::w(int32_t& v) const
+{
+  {
+    rtMutexLockGuard dimensionsMutexLock(mDimensionsMutex);
+    v = mWidth;
+  }
+  return RT_OK;
+}
+int32_t rtImageAResource::h() const
+{
+  int32_t returnValue = 0;
+  {
+    rtMutexLockGuard dimensionsMutexLock(mDimensionsMutex);
+    returnValue = mHeight;
+  }
+  return returnValue;
+}
+rtError rtImageAResource::h(int32_t& v) const
+{
+  {
+    rtMutexLockGuard dimensionsMutexLock(mDimensionsMutex);
+    v = mHeight;
+  }
+  return RT_OK;
+}
+
 ImageMap pxImageManager::mImageMap;
 rtRef<rtImageResource> pxImageManager::emptyUrlResource = 0;
 
@@ -1148,3 +1190,5 @@ rtDefineProperty(rtImageResource, w);
 rtDefineProperty(rtImageResource, h);
 
 rtDefineObject(rtImageAResource, pxResource);
+rtDefineProperty(rtImageAResource, w);
+rtDefineProperty(rtImageAResource, h);

examples/pxScene2d/src/pxResource.h

@@ -216,6 +216,14 @@ class rtImageAResource : public pxResource
 
   rtDeclareObject(rtImageAResource, pxResource);
 
+  rtReadOnlyProperty(w, w, int32_t);
+  rtReadOnlyProperty(h, h, int32_t);
+
+  virtual int32_t w() const;
+  virtual rtError w(int32_t& v) const;
+  virtual int32_t h() const;
+  virtual rtError h(int32_t& v) const;
+
   virtual unsigned long Release() ;
 
   virtual void init();
@@ -231,6 +239,9 @@ class rtImageAResource : public pxResource
   void loadResourceFromArchive(rtObjectRef archiveRef);
   pxTimedOffscreenSequence mTimedOffscreenSequence;
 
+  int32_t mWidth;
+  int32_t mHeight;
+  mutable rtMutex mDimensionsMutex;
 };
 
 // Weak Map

examples/pxScene2d/src/pxScene2d.cpp

@@ -1936,7 +1936,6 @@ pxScene2d::pxScene2d(bool top, pxScriptView* scriptView)
   mInfo.set("build", build);
   mInfo.set("gfxmemory", context.currentTextureMemoryUsageInBytes());
 
-
   //capability versions
   mCapabilityVersions = new rtMapObject;
   rtObjectRef graphicsCapabilities = new rtMapObject;
@@ -1945,6 +1944,7 @@ pxScene2d::pxScene2d(bool top, pxScriptView* scriptView)
 #ifdef SUPPORT_GIF
     graphicsCapabilities.set("gif", 1);
 #endif //SUPPORT_GIF
+  graphicsCapabilities.set("imageAResource", 2);
 
   mCapabilityVersions.set("graphics", graphicsCapabilities);
 

tests/pxScene2d/testRunner/tests.json

@@ -22,6 +22,7 @@
       {"url":"../tests/test_pxImage.js", "title":"test_pxImage","useBaseURI":"true"},
       {"url":"../tests/test_pxImageA_2.js", "title":"test_pxImageA_2","useBaseURI":"true"},
       {"url":"../tests/test_pxImage9.js", "title":"test_pxImage9","useBaseURI":"true"},
+      {"url":"../tests/test_imageASize.js", "title":"test_imageASize.js","useBaseURI":"true"},
       {"url":"../tests/test_textureMemoryUsage.js", "title":"test_textureMemoryUsage.js","useBaseURI":"true"},
       {"url":"../tests/test_moveForwardBackward.js", "title":"test_moveForwardBackward","useBaseURI":"true"},
       {"url":"../tests/test_imports.js", "title":"test_imports","useBaseURI":"true"},