Add costume width and height methods

Author: adazem009

src/irenderedtarget.h

@@ -78,6 +78,8 @@ class IRenderedTarget : public QNanoQuickItem
         virtual bool mirrorHorizontally() const = 0;
 
         virtual Texture texture() const = 0;
+        virtual int costumeWidth() const = 0;
+        virtual int costumeHeight() const = 0;
 
         virtual const std::unordered_map<ShaderManager::Effect, double> &graphicEffects() const = 0;
         virtual void setGraphicEffect(ShaderManager::Effect effect, double value) = 0;

src/renderedtarget.cpp

@@ -529,6 +529,22 @@ Texture RenderedTarget::texture() const
     return m_texture;
 }
 
+int RenderedTarget::costumeWidth() const
+{
+    if (!m_skin || !m_costume)
+        return 0;
+
+    return m_skin->getTexture(1).width() / m_costume->bitmapResolution();
+}
+
+int RenderedTarget::costumeHeight() const
+{
+    if (!m_skin || !m_costume)
+        return 0;
+
+    return m_skin->getTexture(1).height() / m_costume->bitmapResolution();
+}
+
 const std::unordered_map<ShaderManager::Effect, double> &RenderedTarget::graphicEffects() const
 {
     return m_graphicEffects;
@@ -591,7 +607,7 @@ bool RenderedTarget::contains(const QPointF &point) const
 
 bool RenderedTarget::containsScratchPoint(double x, double y) const
 {
-    if (!m_engine)
+    if (!m_engine || !m_skin || !m_costume)
         return false;
 
     return containsLocalPoint(mapFromScratchToLocal(QPointF(x, y)));

src/renderedtarget.h

@@ -86,6 +86,8 @@ class RenderedTarget : public IRenderedTarget
         bool mirrorHorizontally() const override;
 
         Texture texture() const override;
+        int costumeWidth() const override;
+        int costumeHeight() const override;
 
         const std::unordered_map<ShaderManager::Effect, double> &graphicEffects() const override;
         void setGraphicEffect(ShaderManager::Effect effect, double value) override;

test/mocks/renderedtargetmock.h

@@ -62,6 +62,8 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(bool, mirrorHorizontally, (), (const, override));
 
         MOCK_METHOD(Texture, texture, (), (const, override));
+        MOCK_METHOD(int, costumeWidth, (), (const, override));
+        MOCK_METHOD(int, costumeHeight, (), (const, override));
 
         MOCK_METHOD((const std::unordered_map<ShaderManager::Effect, double> &), graphicEffects, (), (const, override));
         MOCK_METHOD(void, setGraphicEffect, (ShaderManager::Effect effect, double value), (override));

test/renderedtarget/renderedtarget_test.cpp

@@ -87,6 +87,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     target.beforeRedraw();
     ASSERT_EQ(target.width(), 4);
     ASSERT_EQ(target.height(), 6);
+    ASSERT_EQ(target.costumeWidth(), 1);
+    ASSERT_EQ(target.costumeHeight(), 2);
     ASSERT_EQ(target.x(), 263);
     ASSERT_EQ(target.y(), 108);
     ASSERT_EQ(target.z(), 0);
@@ -125,6 +127,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
 
     ASSERT_EQ(target.width(), 4);
     ASSERT_EQ(target.height(), 6);
+    ASSERT_EQ(target.costumeWidth(), 1);
+    ASSERT_EQ(target.costumeHeight(), 2);
     ASSERT_EQ(target.x(), 263);
     ASSERT_EQ(target.y(), 108);
     ASSERT_EQ(target.z(), 3);
@@ -171,6 +175,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     target.beforeRedraw();
     ASSERT_EQ(target.width(), 4);
     ASSERT_EQ(target.height(), 6);
+    ASSERT_EQ(target.costumeWidth(), 1);
+    ASSERT_EQ(target.costumeHeight(), 2);
     ASSERT_EQ(target.x(), 276);
     ASSERT_EQ(target.y(), 184);
     ASSERT_EQ(target.transformOriginPoint().x(), -23);
@@ -241,6 +247,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     target.beforeRedraw();
     ASSERT_EQ(target.width(), 4);
     ASSERT_EQ(target.height(), 6);
+    ASSERT_EQ(target.costumeWidth(), 1);
+    ASSERT_EQ(target.costumeHeight(), 2);
     ASSERT_EQ(target.x(), 379.5);
     ASSERT_EQ(target.y(), 384);
     ASSERT_EQ(target.transformOriginPoint().x(), 0);
@@ -263,6 +271,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
 
     ASSERT_EQ(target.width(), 26);
     ASSERT_EQ(target.height(), 26);
+    ASSERT_EQ(target.costumeWidth(), 13);
+    ASSERT_EQ(target.costumeHeight(), 13);
     ASSERT_EQ(target.x(), 329.5);
     ASSERT_EQ(target.y(), 400);
     ASSERT_EQ(target.z(), 3);
@@ -277,13 +287,17 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     ASSERT_TRUE(texture.isValid());
     ASSERT_EQ(texture.width(), 26);
     ASSERT_EQ(texture.height(), 26);
+    ASSERT_EQ(target.costumeWidth(), 13);
+    ASSERT_EQ(target.costumeHeight(), 13);
 
     // Stage scale (SVG) - should update width and height
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.setStageScale(3.5);
     ASSERT_EQ(target.width(), 52);
     ASSERT_EQ(target.height(), 52);
+    ASSERT_EQ(target.costumeWidth(), 13);
+    ASSERT_EQ(target.costumeHeight(), 13);
 
     context.doneCurrent();
 }