RenderedTarget: Use CpuTextureManager::getPointColor() to get color

Author: adazem009

src/renderedtarget.cpp

@@ -636,11 +636,7 @@ QRgb RenderedTarget::colorAtScratchPoint(double x, double y) const
     if ((x < 0 || x >= width) || (y < 0 || y >= height))
         return qRgba(0, 0, 0, 0);
 
-    GLubyte *data = textureManager()->getTextureData(m_cpuTexture);
-    const int index = (y * width + x) * 4; // RGBA channels
-    Q_ASSERT(index >= 0 && index < width * height * 4);
-    // TODO: Apply graphic effects (#117)
-    return qRgba(data[index], data[index + 1], data[index + 2], data[index + 3]);
+    return textureManager()->getPointColor(m_cpuTexture, x, y, m_graphicEffects);
 }
 
 bool RenderedTarget::touchingClones(const std::vector<libscratchcpp::Sprite *> &clones) const

test/renderedtarget/renderedtarget_test.cpp

@@ -459,6 +459,15 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_EQ(target.colorAtScratchPoint(-225, 162), 4286611456);     // [3, 3]
     ASSERT_EQ(target.colorAtScratchPoint(-224.7, 161.5), 4286611456); // [3.3, 3.5]
 
+    target.setGraphicEffect(ShaderManager::Effect::Color, 50);
+    ASSERT_EQ(target.colorAtScratchPoint(-227, 162), 4286595072);     // [1, 3]
+    ASSERT_EQ(target.colorAtScratchPoint(-226, 162), 4294934720);     // [2, 3]
+    ASSERT_EQ(target.colorAtScratchPoint(-225, 162), 4278222912);     // [3, 3]
+    ASSERT_EQ(target.colorAtScratchPoint(-224.7, 161.5), 4278222912); // [3.3, 3.5]
+    target.setGraphicEffect(ShaderManager::Effect::Color, 0);
+
+    // TODO: Test point transform (graphic effects that change shape)
+
     // Cleanup
     context.doneCurrent();
 }