Use CPU texture in getFastBounds()

Author: adazem009

src/renderedtarget.cpp

@@ -410,14 +410,14 @@ QRectF RenderedTarget::getBoundsForBubble() const
 
 Rect RenderedTarget::getFastBounds() const
 {
-    if (!m_costume || !m_skin || !m_texture.isValid())
+    if (!m_costume || !m_skin || !m_texture.isValid() || !m_cpuTexture.isValid())
         return Rect(m_x, m_y, m_x, m_y);
 
-    const double scale = this->scale();
-    const double width = this->width() / m_stageScale;
-    const double height = this->height() / m_stageScale;
-    const double originX = m_costume->rotationCenterX() * m_size / scale / m_costume->bitmapResolution() - width / 2;
-    const double originY = -m_costume->rotationCenterY() * m_size / scale / m_costume->bitmapResolution() + height / 2;
+    const double textureScale = m_skin->getTextureScale(m_cpuTexture);
+    const double width = m_cpuTexture.width() * m_size / textureScale;
+    const double height = m_cpuTexture.height() * m_size / textureScale;
+    const double originX = m_costume->rotationCenterX() * m_size / textureScale / m_costume->bitmapResolution() - width / 2;
+    const double originY = -m_costume->rotationCenterY() * m_size / textureScale / m_costume->bitmapResolution() + height / 2;
     const double rot = -rotation() * pi / 180;
 
     QPointF topLeft = transformPoint(-width / 2, height / 2, originX, originY, rot);
@@ -438,7 +438,7 @@ Rect RenderedTarget::getFastBounds() const
     const double minY = std::min(yList);
     const double maxY = std::max(yList);
 
-    return Rect(minX * scale + m_x, maxY * scale + m_y, maxX * scale + m_x, minY * scale + m_y);
+    return Rect(minX + m_x, maxY + m_y, maxX + m_x, minY + m_y);
 }
 
 QPointF RenderedTarget::mapFromScene(const QPointF &point) const

test/renderedtarget/renderedtarget_test.cpp

@@ -758,40 +758,40 @@ TEST_F(RenderedTargetTest, GetFastBounds)
     target.beforeRedraw();
 
     Rect bounds = target.getFastBounds();
-    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 65.84);
-    ASSERT_EQ(std::round(bounds.top() * 100) / 100, -123.92);
-    ASSERT_EQ(std::round(bounds.right() * 100) / 100, 67.31);
+    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 64.47);
+    ASSERT_EQ(std::round(bounds.top() * 100) / 100, -120.57);
+    ASSERT_EQ(std::round(bounds.right() * 100) / 100, 69.26);
     ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -125.4);
 
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.updateRotationStyle(Sprite::RotationStyle::LeftRight);
 
     bounds = target.getFastBounds();
-    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 71.67);
+    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 69.78);
     ASSERT_EQ(std::round(bounds.top() * 100) / 100, -110.26);
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, 72.5);
-    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -111.51);
+    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -114.34);
 
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.setStageScale(20.75);
 
     bounds = target.getFastBounds();
-    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 71.67);
+    ASSERT_EQ(std::round(bounds.left() * 100) / 100, 69.78);
     ASSERT_EQ(std::round(bounds.top() * 100) / 100, -110.26);
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, 72.5);
-    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -111.51);
+    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -114.34);
 
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.updateSize(9780.6);
 
     bounds = target.getFastBounds();
-    ASSERT_EQ(std::round(bounds.left() * 100) / 100, -496.15);
+    ASSERT_EQ(std::round(bounds.left() * 100) / 100, -767);
     ASSERT_EQ(std::round(bounds.top() * 100) / 100, 1324.22);
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, -375.77);
-    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, 1143.65);
+    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, 737.38);
 
     context.doneCurrent();
 }