Use bitmap resolution in costume dimensions

Author: adazem009

src/scratch/costume.cpp

@@ -26,7 +26,11 @@ double Costume::bitmapResolution() const
 /*! Sets the reciprocal of the costume scaling factor for bitmap costumes. */
 void Costume::setBitmapResolution(double newBitmapResolution)
 {
+    if (impl->bitmapResolution == newBitmapResolution)
+        return;
+
     impl->bitmapResolution = newBitmapResolution;
+    impl->updateImage();
 }
 
 /*! Returns the x-coordinate of the rotation center. */
@@ -56,13 +60,13 @@ void Costume::setRotationCenterY(int newRotationCenterY)
 /*! Returns the costume width. */
 unsigned int Costume::width() const
 {
-    return impl->image->width() * impl->scale;
+    return impl->image->width() * impl->scale / impl->bitmapResolution;
 }
 
 /*! Returns the costume height. */
 unsigned int Costume::height() const
 {
-    return impl->image->height() * impl->scale;
+    return impl->image->height() * impl->scale / impl->bitmapResolution;
 }
 
 /*! Returns the image scale. */

src/scratch/costume_p.cpp

@@ -16,29 +16,30 @@ CostumePrivate::~CostumePrivate()
 
 void CostumePrivate::updateImage()
 {
-    unsigned int scaledWidth = image->width() * scale;
-    unsigned int scaledHeight = image->height() * scale;
+    unsigned int scaledWidth = image->width() * scale / bitmapResolution;
+    unsigned int scaledHeight = image->height() * scale / bitmapResolution;
 
     if (scaledWidth == 0 || scaledHeight == 0) {
         freeImage();
         return;
     }
 
-    if (!bitmap || (scale != oldScale)) {
+    if (!bitmap || (scale != oldScale) || (bitmapResolution != oldBitmapResolution)) {
         freeImage();
         bitmap = static_cast<Rgb **>(malloc(sizeof(Rgb *) * scaledHeight));
 
         for (unsigned int i = 0; i < scaledHeight; i++)
             bitmap[i] = static_cast<Rgb *>(malloc(sizeof(Rgb) * scaledWidth));
 
         oldScale = scale;
+        oldBitmapResolution = bitmapResolution;
         oldWidth = scaledWidth;
         oldHeight = scaledHeight;
     }
 
     for (unsigned int i = 0; i < scaledHeight; i++) {
         for (unsigned int j = 0; j < scaledWidth; j++) {
-            Rgb color = image->colorAt(mirrorHorizontally ? (scaledWidth - 1 - j) : j, i, scale);
+            Rgb color = image->colorAt(mirrorHorizontally ? (scaledWidth - 1 - j) : j, i, scale / bitmapResolution);
 
             // TODO: Apply graphics effects here
 

src/scratch/costume_p.h

@@ -19,6 +19,7 @@ struct CostumePrivate
         void updateImage();
         void freeImage();
 
+        double oldBitmapResolution = 1;
         double bitmapResolution = 1;
         int rotationCenterX = 0;
         int rotationCenterY = 0;